From 65d7a72b5046e8ff7aacdd2bd6c1df08c92803ec Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 31 May 2024 18:21:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E5=8D=95=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E8=A7=84=E5=88=99=EF=BC=8C=E6=8F=90=E9=AB=98=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=87=86=E7=A1=AE=E6=80=A7=EF=BC=8C=E6=8F=90=E5=8D=87?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oa_Initiate/form/cw/cg.vue   | 11 ++++++++++-
 src/views/oa_Initiate/form/cw/fk.vue   |  2 +-
 src/views/oa_Initiate/form/cw/hdjf.vue |  6 +++++-
 src/views/oa_Initiate/form/cw/jk.vue   |  2 +-
 src/views/oa_Initiate/form/cw/jl.vue   |  6 +++++-
 src/views/oa_Initiate/form/jq/wc.vue   |  9 ++++++++-
 src/views/oa_Initiate/form/rs/lz.vue   |  2 +-
 src/views/oa_Initiate/form/rs/zg.vue   |  2 +-
 src/views/oa_Initiate/form/rs/zz.vue   |  4 ++--
 src/views/oa_Initiate/form/xz/gwlz.vue |  8 +++++++-
 src/views/oa_Initiate/form/xz/wpwx.vue |  2 +-
 src/views/oa_Initiate/form/xz/ycgh.vue | 14 ++++++++++++--
 src/views/oa_Initiate/form/xz/yz.vue   | 11 +++++++++++
 src/views/oa_Initiate/form/xz/zzjy.vue | 18 ++++++++++++++++--
 14 files changed, 81 insertions(+), 16 deletions(-)

diff --git a/src/views/oa_Initiate/form/cw/cg.vue b/src/views/oa_Initiate/form/cw/cg.vue
index e7883d2..c6a7372 100644
--- a/src/views/oa_Initiate/form/cw/cg.vue
+++ b/src/views/oa_Initiate/form/cw/cg.vue
@@ -70,12 +70,21 @@ const formRules = reactive({
     }],
 
 
+    jlsy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
     chje: [{
         required: true,
         message: '不可为空',
         trigger: ['blur']
     }],
-
+    kssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
 
 
 
diff --git a/src/views/oa_Initiate/form/cw/fk.vue b/src/views/oa_Initiate/form/cw/fk.vue
index 477fbac..2146300 100644
--- a/src/views/oa_Initiate/form/cw/fk.vue
+++ b/src/views/oa_Initiate/form/cw/fk.vue
@@ -63,7 +63,7 @@
 </template>
 
 <script setup>
-let list = ['jkje', 'jjlx', 'jyr', 'yhzh', 'khh', "bz"]
+let list = ['jkje', 'jjlx', 'jyr', 'yhzh', 'khh', "bz", 'lwrq']
 
 const qjlxList = reactive(['银行卡', '现金', '汇票', '电汇', '贷记', '支票', '其他'])
 let props = defineProps({
diff --git a/src/views/oa_Initiate/form/cw/hdjf.vue b/src/views/oa_Initiate/form/cw/hdjf.vue
index c324b34..85eb9a7 100644
--- a/src/views/oa_Initiate/form/cw/hdjf.vue
+++ b/src/views/oa_Initiate/form/cw/hdjf.vue
@@ -77,7 +77,11 @@ const formRules = reactive({
         message: '不可为空',
         trigger: ['blur']
     }],
-
+    hdsm: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
 
     kssj: [{
         required: true,
diff --git a/src/views/oa_Initiate/form/cw/jk.vue b/src/views/oa_Initiate/form/cw/jk.vue
index 87d6a68..cc5b1c2 100644
--- a/src/views/oa_Initiate/form/cw/jk.vue
+++ b/src/views/oa_Initiate/form/cw/jk.vue
@@ -58,7 +58,7 @@
 </template>
 
 <script setup>
-let list = ['wjmc', 'jkje', 'jjlx', 'jyr', 'yhzh', 'khh', "bz"]
+let list = ['wjmc', 'jkje', 'jjlx', 'jyr', 'yhzh', 'khh', "bz", 'lwrq']
 
 const qjlxList = reactive(['差旅费', '办公费', '招待费', '交通费', '通讯费', '采购付款', '其他'])
 let props = defineProps({
diff --git a/src/views/oa_Initiate/form/cw/jl.vue b/src/views/oa_Initiate/form/cw/jl.vue
index 044c490..3c4c0da 100644
--- a/src/views/oa_Initiate/form/cw/jl.vue
+++ b/src/views/oa_Initiate/form/cw/jl.vue
@@ -51,7 +51,11 @@ const formRules = reactive({
         message: '不可为空',
         trigger: ['blur']
     }],
-
+    jlsy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
 
 
     kssj: [{
diff --git a/src/views/oa_Initiate/form/jq/wc.vue b/src/views/oa_Initiate/form/jq/wc.vue
index 1641c0d..5231cd5 100644
--- a/src/views/oa_Initiate/form/jq/wc.vue
+++ b/src/views/oa_Initiate/form/jq/wc.vue
@@ -2,7 +2,7 @@
     <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
         <el-row>
             <el-col :span="8">
-                <el-form-item label="外出地点">
+                <el-form-item label="外出地点" prop="wcdd">
                     <el-input v-model="formData.wcdd" clearable placeholder="请输入外出地点" />
                 </el-form-item>
             </el-col>
@@ -85,6 +85,13 @@ const formRules = reactive({
         message: '不可为空',
         trigger: ['blur']
     }],
+
+    wcdd: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
 })
 
 const calcDay = () => {
diff --git a/src/views/oa_Initiate/form/rs/lz.vue b/src/views/oa_Initiate/form/rs/lz.vue
index 1562bad..b89a73d 100644
--- a/src/views/oa_Initiate/form/rs/lz.vue
+++ b/src/views/oa_Initiate/form/rs/lz.vue
@@ -15,7 +15,7 @@
             </el-col>
             <el-col :span="8">
                 <el-form-item label="所在部门" prop="rzbm">
-                    <el-select v-model="formData.rzbm" placeholder="请选择入职部门" class="flex-1">
+                    <el-select v-model="formData.rzbm" placeholder="请选择所在部门" class="flex-1">
                         <el-option :label="item.name" :value="item.name" v-for="item in deptList">
                         </el-option>
                     </el-select>
diff --git a/src/views/oa_Initiate/form/rs/zg.vue b/src/views/oa_Initiate/form/rs/zg.vue
index 8ddabe2..d21d68b 100644
--- a/src/views/oa_Initiate/form/rs/zg.vue
+++ b/src/views/oa_Initiate/form/rs/zg.vue
@@ -15,7 +15,7 @@
             </el-col>
             <el-col :span="8">
                 <el-form-item label="当前所在部门" prop="rzbm">
-                    <el-select v-model="formData.rzbm" placeholder="请选择入职部门" class="flex-1">
+                    <el-select v-model="formData.rzbm" placeholder="请选择当前所在部门" class="flex-1">
                         <el-option :label="item.name" :value="item.name" v-for="item in deptList">
                         </el-option>
                     </el-select>
diff --git a/src/views/oa_Initiate/form/rs/zz.vue b/src/views/oa_Initiate/form/rs/zz.vue
index ba632cd..589a288 100644
--- a/src/views/oa_Initiate/form/rs/zz.vue
+++ b/src/views/oa_Initiate/form/rs/zz.vue
@@ -30,7 +30,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="8">
-                <el-form-item label="试用期评价">
+                <el-form-item label="试用期评价" prop="bz1">
                     <el-input v-model="formData.bz1" clearable placeholder="请输入试用期评价" type="textarea" />
                 </el-form-item>
             </el-col>
@@ -51,7 +51,7 @@
 import { deptLists } from "@/api/org/department";
 import { jobsLists } from '@/api/org/post'
 
-let list = ['jyr', 'lwrq', 'wjmc', 'sex', 'rzbm', "drzw"]
+let list = ['jyr', 'lwrq', 'wjmc', 'sex', 'rzbm', "drzw", 'bz1']
 
 const qjlxList = reactive(['差旅费', '办公费', '招待费', '交通费', '通讯费', '采购付款', '其他'])
 let props = defineProps({
diff --git a/src/views/oa_Initiate/form/xz/gwlz.vue b/src/views/oa_Initiate/form/xz/gwlz.vue
index daf4f7d..7e52345 100644
--- a/src/views/oa_Initiate/form/xz/gwlz.vue
+++ b/src/views/oa_Initiate/form/xz/gwlz.vue
@@ -15,7 +15,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="8">
-                <el-form-item label="来文单位">
+                <el-form-item label="来文单位" prop="lwdw">
                     <el-input v-model="formData.lwdw" clearable placeholder="请输入来文单位" />
                 </el-form-item>
             </el-col>
@@ -85,6 +85,12 @@ const formRules = reactive({
         message: '不可为空',
         trigger: ['blur']
     }],
+    lwdw: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
 })
 const check = async () => {
     await formRef.value?.validate();
diff --git a/src/views/oa_Initiate/form/xz/wpwx.vue b/src/views/oa_Initiate/form/xz/wpwx.vue
index f000cfc..1fa3fb1 100644
--- a/src/views/oa_Initiate/form/xz/wpwx.vue
+++ b/src/views/oa_Initiate/form/xz/wpwx.vue
@@ -78,7 +78,7 @@ const formRules = reactive({
 
 
 
-    lwdw: [{
+    jjcd: [{
         required: true,
         message: '不可为空',
         trigger: ['blur']
diff --git a/src/views/oa_Initiate/form/xz/ycgh.vue b/src/views/oa_Initiate/form/xz/ycgh.vue
index 3b699aa..2104dae 100644
--- a/src/views/oa_Initiate/form/xz/ycgh.vue
+++ b/src/views/oa_Initiate/form/xz/ycgh.vue
@@ -17,12 +17,12 @@
                 </el-form-item>
             </el-col>
             <el-col :span="8">
-                <el-form-item label="用车公里数">
+                <el-form-item label="用车公里数" prop='qjts'>
                     <el-input v-model="formData.qjts" clearable placeholder="请输入用车公里数" />
                 </el-form-item>
             </el-col>
             <el-col :span="8">
-                <el-form-item label="用车后公里数">
+                <el-form-item label="用车后公里数" prop='qjts1'>
                     <el-input v-model="formData.qjts1" clearable placeholder="请输入用车后公里数" />
                 </el-form-item>
             </el-col>
@@ -70,6 +70,16 @@ const formRules = reactive({
         message: '不可为空',
         trigger: ['blur']
     }],
+    qjts: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    qjts1: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
 })
 
 const check = async () => {
diff --git a/src/views/oa_Initiate/form/xz/yz.vue b/src/views/oa_Initiate/form/xz/yz.vue
index 8dd9bbe..da2846d 100644
--- a/src/views/oa_Initiate/form/xz/yz.vue
+++ b/src/views/oa_Initiate/form/xz/yz.vue
@@ -86,6 +86,17 @@ const formRules = reactive({
         message: '不可为空',
         trigger: ['blur']
     }],
+    ycmdd: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
+    wjfs: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
 
 
 
diff --git a/src/views/oa_Initiate/form/xz/zzjy.vue b/src/views/oa_Initiate/form/xz/zzjy.vue
index c712d8c..54aa4ab 100644
--- a/src/views/oa_Initiate/form/xz/zzjy.vue
+++ b/src/views/oa_Initiate/form/xz/zzjy.vue
@@ -12,7 +12,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="8">
-                <el-form-item label="借用部门">
+                <el-form-item label="借用部门" prop="jybm">
                     <el-select v-model="formData.jybm" placeholder="请选择" class="flex-1">
                         <el-option :label="item.name" :value="item.name" v-for="item in deptList">
                         </el-option>
@@ -20,7 +20,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="8">
-                <el-form-item label="借用类型" prop="jjcd">
+                <el-form-item label="借用类型" prop="jylx">
                     <el-select v-model="formData.jylx" placeholder="请选择借用类型" class="flex-1">
                         <el-option :label="item" :value="item" v-for="(item, index) in qjlxList" :key="index">
                         </el-option>
@@ -153,6 +153,20 @@ const formRules = reactive({
         message: '不可为空',
         trigger: ['blur']
     }],
+    jybm: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jylx: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }], dalx: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
     jssj: [
         {
             required: true,