From 24882f914a84203d77303b828fd95426a75163b6 Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Thu, 20 Feb 2025 16:59:25 +0800
Subject: [PATCH] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F=E4=BC=98=E5=8C=96](dev):=20?=
 =?UTF-8?q?-=20=E5=B7=A5=E4=BC=A4=E4=BF=9D=E9=99=A9=E6=9C=89=E6=95=88?=
 =?UTF-8?q?=E6=9C=9F=E6=9B=B4=E6=96=B0=E4=B8=BA=E5=BC=80=E5=A7=8B=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4-=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=20-=20=E4=B8=89?=
 =?UTF-8?q?=E7=BA=A7=E5=AE=89=E5=85=A8=E6=95=99=E8=82=B2=E7=85=A7=E7=89=87?=
 =?UTF-8?q?=E9=9D=9E=E5=BF=85=E5=A1=AB=20-=20=E6=8E=A8=E9=80=81=E5=B7=A5?=
 =?UTF-8?q?=E5=8C=A0=E5=AD=A6=E9=99=A2=E5=A4=B4=E5=83=8F=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PersonManager/user/components/add.vue     | 33 +++++++++++--------
 .../PersonManager/user/components/edit.vue    | 20 ++++++++---
 .../PersonManager/user/components/view.vue    |  2 +-
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/views/PersonManager/user/components/add.vue b/src/views/PersonManager/user/components/add.vue
index 2124c47..fa4df89 100644
--- a/src/views/PersonManager/user/components/add.vue
+++ b/src/views/PersonManager/user/components/add.vue
@@ -302,11 +302,18 @@
                   <el-radio v-model="form.IS_INJURIES_PAY" label="0">否</el-radio>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item v-if="form.IS_INJURIES_PAY ==='1'" label="工伤保险有效期" prop="IS_INJURIES_PAY_TIME" style="float:left">
+              <el-form-item
+                v-if="form.IS_INJURIES_PAY ==='1'"
+                label="工伤保险有效期"
+                prop="IS_INJURIES_PAY_TIME"
+                style="float:left"
+              >
                 <el-date-picker
                   v-model="form.IS_INJURIES_PAY_TIME"
-                  type="date"
-                  placeholder="选择日期"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
                   value-format="yyyy-MM-dd"
                   format="yyyy-MM-dd"
                   style="width: 290px"
@@ -426,15 +433,15 @@ export default {
       callback()
     }
     // 三级培训
-    var hasLevelThree = (rule, value, callback) => {
-      if (this.form.IS_LEVEL_THREE == '0') {
-        this.form.photosOfLevel = []
-        callback()
-      } else {
-        if (this.form.photosOfLevel.length == 0) callback(new Error('三级培训不为空'))
-      }
-      callback()
-    }
+    // var hasLevelThree = (rule, value, callback) => {
+    //   if (this.form.IS_LEVEL_THREE == '0') {
+    //     this.form.photosOfLevel = []
+    //     callback()
+    //   } else {
+    //     if (this.form.photosOfLevel.length == 0) callback(new Error('三级培训不为空'))
+    //   }
+    //   callback()
+    // }
     var hasCARD = (rule, value, callback) => {
       requestFN(
         '/user/goCheck?CARD_NO=' + value
@@ -606,7 +613,7 @@ export default {
         insuranceFileList: [{ required: false, message: '请上传合保险图片', trigger: 'blur' }],
         userCardFile: [{ type: 'array', required: true, message: '请上传身份证图片', trigger: 'blur' }],
         zhebaoZhaopian: [{ type: 'array', required: false, message: '请上传社保卡照片', trigger: 'blur' }],
-        photosOfLevel: [{ type: 'array', required: true, message: '请上传三级教育照片', trigger: 'blur', validator: hasLevelThree }],
+        // photosOfLevel: [{ type: 'array', required: true, message: '请上传三级教育照片', trigger: 'blur', validator: hasLevelThree }],
         gongshangbaoxianFile: [{ type: 'array', required: false, message: '请上传工伤保险凭证', trigger: 'blur' }],
         SOCIAL_NUMBER: [{ required: true, message: '社会保障号码不能为空', trigger: 'blur' },
           { validator: hasSOCIAL }],
diff --git a/src/views/PersonManager/user/components/edit.vue b/src/views/PersonManager/user/components/edit.vue
index e6ad350..41729c2 100644
--- a/src/views/PersonManager/user/components/edit.vue
+++ b/src/views/PersonManager/user/components/edit.vue
@@ -305,11 +305,18 @@
                 <el-radio v-model="form.IS_INJURIES_PAY" label="0">否</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item v-if="form.IS_INJURIES_PAY ==='1'" label="工伤保险有效期" prop="IS_INJURIES_PAY_TIME" style="float:left">
+            <el-form-item
+              v-if="form.IS_INJURIES_PAY ==='1'"
+              label="工伤保险有效期"
+              prop="IS_INJURIES_PAY_TIME"
+              style="float:left"
+            >
               <el-date-picker
                 v-model="form.IS_INJURIES_PAY_TIME"
-                type="date"
-                placeholder="选择日期"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
                 value-format="yyyy-MM-dd"
                 format="yyyy-MM-dd"
                 style="width: 290px"
@@ -615,7 +622,7 @@ export default {
         insuranceFileList: [{ required: false, message: '请上传合保险图片', trigger: 'blur' }],
         userCardFile: [{ type: 'array', required: true, message: '请上传身份证图片', trigger: 'blur' }],
         zhebaoZhaopian: [{ type: 'array', required: true, message: '请上传社保卡照片', trigger: 'blur' }, { validator: hasSOCIALPHTOT }],
-        photosOfLevel: [{ type: 'array', required: true, message: '请上传三级培训照片', trigger: 'blur' }, { validator: hasLevelThree }],
+        // photosOfLevel: [{ type: 'array', required: true, message: '请上传三级培训照片', trigger: 'blur' }, { validator: hasLevelThree }],
         gongshangbaoxianFile: [{ type: 'array', required: false, message: '请上传工伤保险凭证', trigger: 'blur' }],
         SOCIAL_NUMBER: [{ required: true, message: '社会保障号码不能为空', trigger: 'blur' }, { validator: hasSOCIAL }],
         ISPAY: [{ required: false, message: '请选择是否缴纳商业保险', trigger: 'blur' }],
@@ -717,6 +724,8 @@ export default {
         IS_SAFETY_TELL: '',
         ISPAY: '',
         IS_INJURIES_PAY_TIME: '',
+        IS_INJURIES_PAY_TIME_START: '',
+        IS_INJURIES_PAY_TIME_END: '',
         ISPAY_NUMBER: '',
         IS_SIGN_LABOR: '',
         IS_HAZARDCONFIRMER: 0,
@@ -1268,6 +1277,9 @@ export default {
       ).then((data) => {
         this.form = Object.assign(this.form, data.pd) // copy obj
         console.log(this.form)
+        if (this.form.IS_INJURIES_PAY_TIME_START && this.form.IS_INJURIES_PAY_TIME_END) {
+          this.form.IS_INJURIES_PAY_TIME = [this.form.IS_INJURIES_PAY_TIME_START, this.form.IS_INJURIES_PAY_TIME_END];
+        }
         if (data.userPhotoFile) {
           data.userPhotoFile.map(item => {
             const obj = { id: item.IMGFILES_ID, name: item.FILENAME, url: config.fileUrl + item.FILEPATH }
diff --git a/src/views/PersonManager/user/components/view.vue b/src/views/PersonManager/user/components/view.vue
index f341d35..e328aa9 100644
--- a/src/views/PersonManager/user/components/view.vue
+++ b/src/views/PersonManager/user/components/view.vue
@@ -105,7 +105,7 @@
             <th>是否按期缴纳工伤保险</th>
             <td :colspan="dataForm.IS_INJURIES_PAY === '1' ? '':5">{{ formatLabel(dataForm.IS_INJURIES_PAY) }}</td>
             <th v-if="dataForm.IS_INJURIES_PAY === '1'">工伤保险有效期</th>
-            <td v-if="dataForm.IS_INJURIES_PAY === '1'">{{ dataForm.IS_INJURIES_PAY_TIME }}</td>
+            <td v-if="dataForm.IS_INJURIES_PAY === '1'">{{ dataForm.IS_INJURIES_PAY_TIME_START + ' - ' +  dataForm.IS_INJURIES_PAY_TIME_END}}</td>
             <th v-if="dataForm.IS_INJURIES_PAY === '1'">工伤保险凭证</th>
             <td v-if="dataForm.IS_INJURIES_PAY === '1'">
               <span>