From 11c2cfbb3bc295befe46e033e41d642f9ec3f7ff Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 29 May 2024 19:10:20 +0800
Subject: [PATCH] add

---
 src/views/oa_Initiate/detail.vue        | 11 +++++
 src/views/oa_Initiate/edit.vue          | 59 +++++++++++--------------
 src/views/oa_Initiate/form/cw/cg.vue    |  7 +++
 src/views/oa_Initiate/form/cw/fk.vue    |  7 +++
 src/views/oa_Initiate/form/cw/hdjf.vue  |  8 ++++
 src/views/oa_Initiate/form/cw/jk.vue    |  9 ++++
 src/views/oa_Initiate/form/cw/jl.vue    |  7 +++
 src/views/oa_Initiate/form/jq/cc.vue    |  7 +++
 src/views/oa_Initiate/form/jq/jb.vue    |  8 ++++
 src/views/oa_Initiate/form/jq/qj.vue    |  8 +++-
 src/views/oa_Initiate/form/jq/qja.js    |  5 +++
 src/views/oa_Initiate/form/jq/wc.vue    |  8 ++++
 src/views/oa_Initiate/form/qt/tysp.vue  |  7 +++
 src/views/oa_Initiate/form/rs/lz.vue    |  9 ++++
 src/views/oa_Initiate/form/rs/rz.vue    |  9 ++++
 src/views/oa_Initiate/form/rs/zg.vue    |  9 ++++
 src/views/oa_Initiate/form/rs/zpxq.vue  |  9 ++++
 src/views/oa_Initiate/form/rs/zz.vue    |  9 ++++
 src/views/oa_Initiate/form/xz/gwlz.vue  |  7 +++
 src/views/oa_Initiate/form/xz/hysyd.vue |  7 +++
 src/views/oa_Initiate/form/xz/wpwx.vue  |  8 ++++
 src/views/oa_Initiate/form/xz/yc.vue    |  7 +++
 src/views/oa_Initiate/form/xz/ycgh.vue  |  7 +++
 src/views/oa_Initiate/form/xz/yz.vue    |  7 +++
 src/views/oa_Initiate/form/xz/zzjy.vue  |  8 ++++
 src/views/oa_Initiate/index.vue         |  1 +
 26 files changed, 215 insertions(+), 33 deletions(-)
 create mode 100644 src/views/oa_Initiate/form/jq/qja.js

diff --git a/src/views/oa_Initiate/detail.vue b/src/views/oa_Initiate/detail.vue
index bd0aa16..b4a877e 100644
--- a/src/views/oa_Initiate/detail.vue
+++ b/src/views/oa_Initiate/detail.vue
@@ -3,12 +3,23 @@
         <popup ref="popupRef" :showFootBtn="false" title="审批详情" :async="true" width="60vw">
             <el-card>
                 <template #header>审批内容</template>
+
+
+
+
+
                 <el-descriptions :column="3" border>
                     <el-descriptions-item v-for="item in formData.extends" :label="item.label" label-align="left"
                         align="left">
                         {{ item.text || item.value }}
                     </el-descriptions-item>
                 </el-descriptions>
+
+
+
+
+
+
             </el-card>
             <el-card>
                 <template #header>审批流程</template>
diff --git a/src/views/oa_Initiate/edit.vue b/src/views/oa_Initiate/edit.vue
index d6bbd76..2586302 100644
--- a/src/views/oa_Initiate/edit.vue
+++ b/src/views/oa_Initiate/edit.vue
@@ -5,35 +5,28 @@
                 <template #header>
                     审批内容
                 </template>
-                <qj v-if="type == '请假'"></qj>
-                <cc v-if="type == '出差'"></cc>
-                <wc v-if="type == '外出'"></wc>
-                <jb v-if="type == '加班'"></jb>
-                <hysyd v-if="type == '会议室预定'"></hysyd>
-                <gwlz v-if="type == '公文流转'"></gwlz>
-                <wpwx v-if="type == '物品维修'"></wpwx>
-                <zzjy v-if="type == '资质借用'"></zzjy>
-                <yz v-if="type == '用章'"></yz>
-                <yc v-if="type == '用车'"></yc>
-                <ycgh v-if="type == '用车归还'"></ycgh>
-                <jk v-if="type == '借款'"></jk>
-                <fk v-if="type == '付款'"></fk>
-                <jl v-if="type == '奖励'"></jl>
-                <cg v-if="type == '采购'"></cg>
-                <hdjf v-if="type == '活动经费'"></hdjf>
-                <rz v-if="type == '入职'"></rz>
-                <zz v-if="type == '转正'"></zz>
-                <lz v-if="type == '离职'"></lz>
-                <zg v-if="type == '转岗'"></zg>
-                <zpxq v-if="type == '招聘需求'"></zpxq>
-                <tysp v-if="type == '通用审批'"></tysp>
-
-
-
-
-
-
-
+                <qj ref="forms" v-if="type == '请假'"></qj>
+                <cc ref="forms" v-if="type == '出差'"></cc>
+                <wc ref="forms" v-if="type == '外出'"></wc>
+                <jb ref="forms" v-if="type == '加班'"></jb>
+                <hysyd ref="forms" v-if="type == '会议室预定'"></hysyd>
+                <gwlz ref="forms" v-if="type == '公文流转'"></gwlz>
+                <wpwx ref="forms" v-if="type == '物品维修'"></wpwx>
+                <zzjy ref="forms" v-if="type == '资质借用'"></zzjy>
+                <yz ref="forms" v-if="type == '用章'"></yz>
+                <yc ref="forms" v-if="type == '用车'"></yc>
+                <ycgh ref="forms" v-if="type == '用车归还'"></ycgh>
+                <jk ref="forms" v-if="type == '借款'"></jk>
+                <fk ref="forms" v-if="type == '付款'"></fk>
+                <jl ref="forms" v-if="type == '奖励'"></jl>
+                <cg ref="forms" v-if="type == '采购'"></cg>
+                <hdjf ref="forms" v-if="type == '活动经费'"></hdjf>
+                <rz ref="forms" v-if="type == '入职'"></rz>
+                <zz ref="forms" v-if="type == '转正'"></zz>
+                <lz ref="forms" v-if="type == '离职'"></lz>
+                <zg ref="forms" v-if="type == '转岗'"></zg>
+                <zpxq ref="forms" v-if="type == '招聘需求'"></zpxq>
+                <tysp ref="forms" v-if="type == '通用审批'"></tysp>
 
 
             </el-card>
@@ -60,7 +53,6 @@ import ycgh from './form/xz/ycgh.vue'
 import jk from './form/cw/jk.vue'
 import fk from './form/cw/fk.vue'
 import jl from './form/cw/jl.vue'
-
 import cg from './form/cw/cg.vue'
 import hdjf from './form/cw/hdjf.vue'
 import rz from './form/rs/rz.vue'
@@ -79,9 +71,10 @@ let props = defineProps({
 })
 
 
+console.log(qja, 'qja')
 
 
-
+const forms = ref('')
 const emit = defineEmits(["success", "close"]);
 const formRef = shallowRef<FormInstance>();
 const popupRef = shallowRef<InstanceType<typeof Popup>>();
@@ -128,11 +121,13 @@ const setExtend = async (data: Record<any, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
-    await formRef.value?.validate();
+    await forms.value?.check();
     const data = { ...formData };
     await apiOaoaApproveAdd(data)
     popupRef.value?.close();
     emit("success");
+
+
 };
 
 //打开弹窗
diff --git a/src/views/oa_Initiate/form/cw/cg.vue b/src/views/oa_Initiate/form/cw/cg.vue
index 79e9e9c..ce8c822 100644
--- a/src/views/oa_Initiate/form/cw/cg.vue
+++ b/src/views/oa_Initiate/form/cw/cg.vue
@@ -88,5 +88,12 @@ const formRules = reactive({
     }],
 })
 
+const check = async () => {
+    await formRef.value?.validate();
+}
 
+
+defineExpose({
+    check
+});
 </script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/cw/fk.vue b/src/views/oa_Initiate/form/cw/fk.vue
index b381227..e6bbee4 100644
--- a/src/views/oa_Initiate/form/cw/fk.vue
+++ b/src/views/oa_Initiate/form/cw/fk.vue
@@ -89,6 +89,13 @@ setRules()
 
 const showPerDialog = ref(false)
 const personnel = ref(null)
+const check = async () => {
+    await formRef.value?.validate();
+}
 
 
+defineExpose({
+    check
+});
+
 </script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/cw/hdjf.vue b/src/views/oa_Initiate/form/cw/hdjf.vue
index 05bb0f9..c301ae4 100644
--- a/src/views/oa_Initiate/form/cw/hdjf.vue
+++ b/src/views/oa_Initiate/form/cw/hdjf.vue
@@ -100,4 +100,12 @@ const formRules = reactive({
 })
 
 
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
 </script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/cw/jk.vue b/src/views/oa_Initiate/form/cw/jk.vue
index b8e59aa..0d6a5f0 100644
--- a/src/views/oa_Initiate/form/cw/jk.vue
+++ b/src/views/oa_Initiate/form/cw/jk.vue
@@ -97,4 +97,13 @@ const submituser = (e) => {
     formData[value + "_id"] = e.id
     showPerDialog.value = false
 }
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
 </script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/cw/jl.vue b/src/views/oa_Initiate/form/cw/jl.vue
index 191931f..691ab39 100644
--- a/src/views/oa_Initiate/form/cw/jl.vue
+++ b/src/views/oa_Initiate/form/cw/jl.vue
@@ -67,6 +67,13 @@ const formRules = reactive({
         trigger: ['blur']
     }],
 })
+const check = async () => {
+    await formRef.value?.validate();
+}
 
 
+defineExpose({
+    check
+});
+
 </script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/jq/cc.vue b/src/views/oa_Initiate/form/jq/cc.vue
index 53305dd..dc407f3 100644
--- a/src/views/oa_Initiate/form/jq/cc.vue
+++ b/src/views/oa_Initiate/form/jq/cc.vue
@@ -89,5 +89,12 @@ const calcDay = () => {
         formData.qjts = daysDiff || 0
     }
 }
+const check = async () => {
+    await formRef.value?.validate();
+}
 
+
+defineExpose({
+    check
+});
 </script>
\ 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
index ab51bf6..9bb7031 100644
--- a/src/views/oa_Initiate/form/jq/jb.vue
+++ b/src/views/oa_Initiate/form/jq/jb.vue
@@ -91,4 +91,12 @@ const calcDay = () => {
     }
 }
 
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
 </script>
\ 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
index 6dd6165..be7af7e 100644
--- a/src/views/oa_Initiate/form/jq/qj.vue
+++ b/src/views/oa_Initiate/form/jq/qj.vue
@@ -4,7 +4,7 @@
             <el-col :span="8">
                 <el-form-item label="请假类型" prop="qjlx">
                     <el-select v-model="formData.qjlx" placeholder="请选择请假类型" class="flex-1">
-                        <el-option :label="item" :value="index" v-for="(item, index) in qjlxList" :key="index">
+                        <el-option :label="item" :value="item" v-for="(item, index) in qjlxList" :key="index">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -97,8 +97,14 @@ const calcDay = () => {
     }
 }
 
+const check = async () => {
+    await formRef.value?.validate();
+}
 
 
+defineExpose({
+    check
+});
 
 
 </script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/jq/qja.js b/src/views/oa_Initiate/form/jq/qja.js
new file mode 100644
index 0000000..61b1a40
--- /dev/null
+++ b/src/views/oa_Initiate/form/jq/qja.js
@@ -0,0 +1,5 @@
+const qja = {
+    name: "sdasd"
+
+}
+export default qja
\ 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
index 3bcef34..237e283 100644
--- a/src/views/oa_Initiate/form/jq/wc.vue
+++ b/src/views/oa_Initiate/form/jq/wc.vue
@@ -93,5 +93,13 @@ const calcDay = () => {
         formData.qjts = daysDiff || 0
     }
 }
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
 
 </script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/qt/tysp.vue b/src/views/oa_Initiate/form/qt/tysp.vue
index a6891c2..557d474 100644
--- a/src/views/oa_Initiate/form/qt/tysp.vue
+++ b/src/views/oa_Initiate/form/qt/tysp.vue
@@ -62,5 +62,12 @@ setRules()
 const showPerDialog = ref(false)
 const personnel = ref(null)
 
+const check = async () => {
+    await formRef.value?.validate();
+}
 
+
+defineExpose({
+    check
+});
 </script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/rs/lz.vue b/src/views/oa_Initiate/form/rs/lz.vue
index cc46ded..60e5599 100644
--- a/src/views/oa_Initiate/form/rs/lz.vue
+++ b/src/views/oa_Initiate/form/rs/lz.vue
@@ -125,4 +125,13 @@ const submituser = (e) => {
     formData[value + "_id"] = e.id
     showPerDialog.value = false
 }
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
 </script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/rs/rz.vue b/src/views/oa_Initiate/form/rs/rz.vue
index 39e7a9e..ea4572b 100644
--- a/src/views/oa_Initiate/form/rs/rz.vue
+++ b/src/views/oa_Initiate/form/rs/rz.vue
@@ -118,4 +118,13 @@ const submituser = (e) => {
     formData[value + "_id"] = e.id
     showPerDialog.value = false
 }
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
 </script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/rs/zg.vue b/src/views/oa_Initiate/form/rs/zg.vue
index 102bfb6..07de9d8 100644
--- a/src/views/oa_Initiate/form/rs/zg.vue
+++ b/src/views/oa_Initiate/form/rs/zg.vue
@@ -142,4 +142,13 @@ const submituser = (e) => {
     formData[value + "_id"] = e.id
     showPerDialog.value = false
 }
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
 </script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/rs/zpxq.vue b/src/views/oa_Initiate/form/rs/zpxq.vue
index 7691704..3f7b82f 100644
--- a/src/views/oa_Initiate/form/rs/zpxq.vue
+++ b/src/views/oa_Initiate/form/rs/zpxq.vue
@@ -122,4 +122,13 @@ const submituser = (e) => {
     formData[value + "_id"] = e.id
     showPerDialog.value = false
 }
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
 </script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/rs/zz.vue b/src/views/oa_Initiate/form/rs/zz.vue
index 8096ae7..0aa7d14 100644
--- a/src/views/oa_Initiate/form/rs/zz.vue
+++ b/src/views/oa_Initiate/form/rs/zz.vue
@@ -110,4 +110,13 @@ const submituser = (e) => {
     formData[value + "_id"] = e.id
     showPerDialog.value = false
 }
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
 </script>
\ 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
index 2b9aa82..e2f10ae 100644
--- a/src/views/oa_Initiate/form/xz/gwlz.vue
+++ b/src/views/oa_Initiate/form/xz/gwlz.vue
@@ -86,6 +86,13 @@ const formRules = reactive({
         trigger: ['blur']
     }],
 })
+const check = async () => {
+    await formRef.value?.validate();
+}
 
 
+defineExpose({
+    check
+});
+
 </script>
\ 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
index f6b73f4..a228fae 100644
--- a/src/views/oa_Initiate/form/xz/hysyd.vue
+++ b/src/views/oa_Initiate/form/xz/hysyd.vue
@@ -85,6 +85,13 @@ const formRules = reactive({
 })
 
 
+const check = async () => {
+    await formRef.value?.validate();
+}
 
 
+defineExpose({
+    check
+});
+
 </script>
\ 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
index 7aa1c1a..1d1e530 100644
--- a/src/views/oa_Initiate/form/xz/wpwx.vue
+++ b/src/views/oa_Initiate/form/xz/wpwx.vue
@@ -110,5 +110,13 @@ const formRules = reactive({
     }],
 })
 
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
 
 </script>
\ 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
index fe406c6..b2cffd5 100644
--- a/src/views/oa_Initiate/form/xz/yc.vue
+++ b/src/views/oa_Initiate/form/xz/yc.vue
@@ -100,6 +100,13 @@ const formRules = reactive({
     }],
 })
 
+const check = async () => {
+    await formRef.value?.validate();
+}
 
 
+defineExpose({
+    check
+});
+
 </script>
\ 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
index d8c42ef..f627f7e 100644
--- a/src/views/oa_Initiate/form/xz/ycgh.vue
+++ b/src/views/oa_Initiate/form/xz/ycgh.vue
@@ -70,5 +70,12 @@ const formRules = reactive({
     }],
 })
 
+const check = async () => {
+    await formRef.value?.validate();
+}
 
+
+defineExpose({
+    check
+});
 </script>
\ 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
index 65150cf..b5fd251 100644
--- a/src/views/oa_Initiate/form/xz/yz.vue
+++ b/src/views/oa_Initiate/form/xz/yz.vue
@@ -89,6 +89,13 @@ const formRules = reactive({
 
 })
 
+const check = async () => {
+    await formRef.value?.validate();
+}
 
 
+defineExpose({
+    check
+});
+
 </script>
\ 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
index 986d2e6..f9a4b87 100644
--- a/src/views/oa_Initiate/form/xz/zzjy.vue
+++ b/src/views/oa_Initiate/form/xz/zzjy.vue
@@ -185,4 +185,12 @@ const submituser = (e) => {
     showPerDialog.value = false
 }
 
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
 </script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/index.vue b/src/views/oa_Initiate/index.vue
index 472515a..dad5e12 100644
--- a/src/views/oa_Initiate/index.vue
+++ b/src/views/oa_Initiate/index.vue
@@ -68,6 +68,7 @@ import { apiOaFlowTypeLists, apiOaoaApproveLists, apiOaoaApproveDetail } from "@
 import EditPopup from './edit.vue'
 import detailPopup from './detail.vue'
 import { apiOaFlowTypeDetail } from '@/api/oa_flow_type'
+import qja from './form/jq/qja.js'
 
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()