Bladeren bron

修改 不bug 入职时间

zhuwei 2 jaren geleden
bovenliggende
commit
130ca05b85
2 gewijzigde bestanden met toevoegingen van 8 en 5 verwijderingen
  1. 4 4
      src/views/people/dimission.vue
  2. 4 1
      src/views/people/entry.vue

+ 4 - 4
src/views/people/dimission.vue

@@ -51,8 +51,8 @@
                 <el-form-item label="离职时间:" prop="endDate">
                     <el-date-picker v-model="formModel.endDate" type="date" class="block" format="YYYY-MM-DD" value-format="YYYY-MM-DD"/>
                 </el-form-item>
-                <el-form-item label="离职原因:" prop="desc">
-                    <el-input type="textarea" v-model="formModel.desc" :autosize="{ minRows: 4, maxRows: 6 }"/>
+                <el-form-item label="离职原因:" prop="leReasion">
+                    <el-input type="textarea" v-model="formModel.leReasion" :autosize="{ minRows: 4, maxRows: 6 }"/>
                 </el-form-item>
                 <el-form-item label="离职登记表:" v-if="formModel.fileUrl">
                     <HcFormUpload :src="formModel.fileUrl" @upload="formItemUpload"/>
@@ -116,7 +116,7 @@ const tableColumn = [
     {key: 'deptName', name: '部门'},
     {key: 'postName', name: '职位'},
     {key: 'endDate', name: '离职日期'},
-    {key: 'desc', name: '离职原因'},
+    {key: 'leReasion', name: '离职原因'},
     {key: 'conFileName', name: '离职登记表'},
     {key: 'action', name: '操作', width: '150'}
 ]
@@ -154,7 +154,7 @@ const formModel = ref({})
 const formRules = {
     userId: [{required: true, message: '请选择员工', trigger: 'change'}],
     endDate: [{required: true, message: '请选择离职日期', trigger: 'change'}],
-    desc: [{required: true, message: '请输入离职原因', trigger: 'blur'}],
+    leReasion: [{required: true, message: '请输入离职原因', trigger: 'blur'}],
 }
 
 //新增

+ 4 - 1
src/views/people/entry.vue

@@ -51,9 +51,12 @@
                 <el-form-item label="入职时间" prop="startDate">
                     <el-date-picker v-model="formModel.startDate" type="date" class="block" format="YYYY-MM-DD" value-format="YYYY-MM-DD"/>
                 </el-form-item>
-                <el-form-item label="入职登记表:" v-if="formModel.fileUrl">
+                <el-form-item label="入职登记表:" v-show="false" >
                     <HcFormUpload :src="formModel.fileUrl" @upload="formItemUpload"/>
                 </el-form-item>
+                <el-form-item label="入职登记表:" v-if="formModel.fileUrl" >
+                    <HcFormUpload :src="formModel.conFileName" @upload="formItemUpload"/>
+                </el-form-item>
                 <el-form-item label="入职登记表:" v-show="!formModel.fileUrl">
                     <HcUploadFile ref="uploadFileRef" drop :options="uploadOptions" @success="uploadFileSuccess" class="w-full"/>
                 </el-form-item>