diff --git a/src/components/generateForm/index.vue b/src/components/generateForm/index.vue index c4fc059..95449d5 100644 --- a/src/components/generateForm/index.vue +++ b/src/components/generateForm/index.vue @@ -57,10 +57,12 @@ const props = defineProps({ required: true }, type: { - type: Number, + type: Number || Object, + default: null }, extend: { type: Object, + default: {} } }) diff --git a/src/components/personnelselector/index.vue b/src/components/personnelselector/index.vue index 171aadc..42bcfc4 100644 --- a/src/components/personnelselector/index.vue +++ b/src/components/personnelselector/index.vue @@ -205,6 +205,10 @@ const props = defineProps({ type: { type: String || Number,//1:单选 2.多选 default: () => ({}) + }, + query: { + type: Object, + default: {} } }) const emits = defineEmits(['confirm']) @@ -223,7 +227,7 @@ const radionum = ref([]) // 获取全部人员 const getlist = () => { - getAdminsByAll().then((res) => { + getAdminsByAll({ ...props.query }).then((res) => { Object.assign(uesrlist, res) }) } diff --git a/src/components/personnelselector/index1.vue b/src/components/personnelselector/index1.vue deleted file mode 100644 index db9acf0..0000000 --- a/src/components/personnelselector/index1.vue +++ /dev/null @@ -1,366 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/oa_Initiate/edit.vue b/src/views/oa_Initiate/edit.vue index c1917ab..58ce003 100644 --- a/src/views/oa_Initiate/edit.vue +++ b/src/views/oa_Initiate/edit.vue @@ -5,8 +5,9 @@ - - + + + @@ -18,6 +19,8 @@ import generateForm from './../../components/generateForm/index.vue' import Popup from "@/components/popup/index.vue"; import { apiOaoaApproveAdd } from "@/api/oa_Initiate" +import zzjy from './form/xz/zzjy.vue' + defineProps({ diff --git a/src/views/oa_Initiate/form/jq/cc.vue b/src/views/oa_Initiate/form/jq/cc.vue new file mode 100644 index 0000000..bf40a86 --- /dev/null +++ b/src/views/oa_Initiate/form/jq/cc.vue @@ -0,0 +1,70 @@ + + + \ No newline at end of file diff --git a/src/views/oa_Initiate/form/jq/jb.vue b/src/views/oa_Initiate/form/jq/jb.vue new file mode 100644 index 0000000..e703185 --- /dev/null +++ b/src/views/oa_Initiate/form/jq/jb.vue @@ -0,0 +1,70 @@ + + + \ No newline at end of file diff --git a/src/views/oa_Initiate/form/jq/qj.vue b/src/views/oa_Initiate/form/jq/qj.vue new file mode 100644 index 0000000..cd42153 --- /dev/null +++ b/src/views/oa_Initiate/form/jq/qj.vue @@ -0,0 +1,78 @@ + + + \ No newline at end of file diff --git a/src/views/oa_Initiate/form/jq/wc.vue b/src/views/oa_Initiate/form/jq/wc.vue new file mode 100644 index 0000000..86d254e --- /dev/null +++ b/src/views/oa_Initiate/form/jq/wc.vue @@ -0,0 +1,75 @@ + + + \ No newline at end of file diff --git a/src/views/oa_Initiate/form/xz/gwlz.vue b/src/views/oa_Initiate/form/xz/gwlz.vue new file mode 100644 index 0000000..5455ef6 --- /dev/null +++ b/src/views/oa_Initiate/form/xz/gwlz.vue @@ -0,0 +1,92 @@ + + + \ No newline at end of file diff --git a/src/views/oa_Initiate/form/xz/hysyd.vue b/src/views/oa_Initiate/form/xz/hysyd.vue new file mode 100644 index 0000000..017269d --- /dev/null +++ b/src/views/oa_Initiate/form/xz/hysyd.vue @@ -0,0 +1,72 @@ + + + \ No newline at end of file diff --git a/src/views/oa_Initiate/form/xz/wpwx.vue b/src/views/oa_Initiate/form/xz/wpwx.vue new file mode 100644 index 0000000..a29b74e --- /dev/null +++ b/src/views/oa_Initiate/form/xz/wpwx.vue @@ -0,0 +1,115 @@ + + + \ No newline at end of file diff --git a/src/views/oa_Initiate/form/xz/yc.vue b/src/views/oa_Initiate/form/xz/yc.vue new file mode 100644 index 0000000..8507e24 --- /dev/null +++ b/src/views/oa_Initiate/form/xz/yc.vue @@ -0,0 +1,85 @@ + + + \ No newline at end of file diff --git a/src/views/oa_Initiate/form/xz/ycgh.vue b/src/views/oa_Initiate/form/xz/ycgh.vue new file mode 100644 index 0000000..6a2aca4 --- /dev/null +++ b/src/views/oa_Initiate/form/xz/ycgh.vue @@ -0,0 +1,70 @@ + + + \ No newline at end of file diff --git a/src/views/oa_Initiate/form/xz/yz.vue b/src/views/oa_Initiate/form/xz/yz.vue new file mode 100644 index 0000000..b9de7b0 --- /dev/null +++ b/src/views/oa_Initiate/form/xz/yz.vue @@ -0,0 +1,92 @@ + + + \ No newline at end of file diff --git a/src/views/oa_Initiate/form/xz/zzjy.vue b/src/views/oa_Initiate/form/xz/zzjy.vue new file mode 100644 index 0000000..195dcfe --- /dev/null +++ b/src/views/oa_Initiate/form/xz/zzjy.vue @@ -0,0 +1,162 @@ + + + \ No newline at end of file diff --git a/src/views/oa_flow_type/edit.vue b/src/views/oa_flow_type/edit.vue index 6de0f6d..30cf3a3 100644 --- a/src/views/oa_flow_type/edit.vue +++ b/src/views/oa_flow_type/edit.vue @@ -62,6 +62,7 @@ + @@ -75,6 +76,13 @@ 删除 + + + + + + + @@ -106,6 +114,7 @@ defineProps({ }); +const a = ref('') // console.log(Pinyin.getCamelChars("你干嘛")) const emit = defineEmits(["success", "close"]); const formRef = shallowRef(); @@ -214,6 +223,9 @@ const handAdd = () => { // 提交按钮 const handleSubmit = async () => { + + console.log(formData.data) + return await formRef.value?.validate(); const data = { ...formData }; data.department_ids = data.department_ids.join(","); diff --git a/src/views/organization/department/edit.vue b/src/views/organization/department/edit.vue index 4aa6781..00624db 100644 --- a/src/views/organization/department/edit.vue +++ b/src/views/organization/department/edit.vue @@ -27,7 +27,8 @@ - +