sunlupeng 1 vuosi sitten
vanhempi
commit
8a1d205e3b

+ 5 - 5
src/views/oa/turnover/DataList.vue

@@ -20,8 +20,8 @@
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
     
-      <el-form-item label="离职日期" prop="dimissionDate">
-            <el-date-picker v-model="queryParams.dimissionDate" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+      <el-form-item label="离职日期" prop="turnoverDate">
+            <el-date-picker v-model="queryParams.turnoverDate" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
               type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
               :default-time="['00:00:00', '23:59:59']" />
           </el-form-item>
@@ -61,8 +61,8 @@
       <el-table-column label="职位" align="center" prop="position" min-width="100" />
       <el-table-column label="手机号" align="center" prop="employeePhone" min-width="100" />
       <el-table-column label="入职日期" align="center" prop="entryDate" min-width="100" />
-      <el-table-column label="离职日期" align="center" prop="dimissionDate" min-width="100" />
-      <el-table-column label="申请人" prop="creator" min-width="80" />
+      <el-table-column label="离职日期" align="center" prop="turnoverDate" min-width="100" />
+      <el-table-column label="申请人" align="center" prop="applyEmployeeName" min-width="80" />
       <el-table-column label="申请时间" align="center" prop="createTime" min-width="150">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -132,7 +132,7 @@ export default {
         deptId: undefined,
         position: undefined,
         employeePhone: undefined,
-        dimissionDate: [],
+        turnoverDate: [],
         creator: undefined,
         createTime: [],
         auditStatus: undefined,

+ 2 - 2
src/views/oa/turnover/detail.vue

@@ -49,7 +49,7 @@
           <div class="field-name">离职日期</div>
         </div>
         <div class="field-component">
-          <span :title="form.dimissionDate">{{ form.dimissionDate }}</span>
+          <span :title="form.turnoverDate">{{ form.turnoverDate }}</span>
         </div>
       </div>
   
@@ -60,7 +60,7 @@
           <div class="field-name">离职原因</div>
         </div>
         <div class="field-component">
-          <span :title="form.dimissionReason">{{ form.dimissionReason }}</span>
+          <span :title="form.turnoverReason">{{ form.turnoverReason }}</span>
         </div>
       </div>
 

+ 8 - 8
src/views/oa/turnover/edit.vue

@@ -20,13 +20,13 @@
         <el-input v-model="form.entryDate" placeholder='入职日期' disabled></el-input>
 
       </el-form-item>
-      <el-form-item label="离职日期" prop="dimissionDate">
-        <el-date-picker value-format="yyyy-MM-dd" v-model="form.dimissionDate" type="date" placeholder="请选择日期"
+      <el-form-item label="离职日期" prop="turnoverDate">
+        <el-date-picker value-format="yyyy-MM-dd" v-model="form.turnoverDate" type="date" placeholder="请选择日期"
           style="width: 100%;">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="离职原因" prop="dimissionReason">
-        <el-select v-model="form.dimissionReason" filterable allow-create default-first-option placeholder="请选择离职原因"
+      <el-form-item label="离职原因" prop="turnoverReason">
+        <el-select v-model="form.turnoverReason" filterable allow-create default-first-option placeholder="请选择离职原因"
           style="width: 100%;">
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TURNOVER_REASON)" :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
@@ -158,8 +158,8 @@ export default {
         employeePhone:undefined,
         entryDate: undefined,
 
-        dimissionDate: undefined,
-        dimissionReason: undefined,
+        turnoverDate: undefined,
+        turnoverReason: undefined,
         files: undefined,
         remarks: undefined,
         peopleList: '',
@@ -170,11 +170,11 @@ export default {
         employeeName: [
           { required: true, message: '请选择', trigger: 'change' },
         ],
-        dimissionDate: [
+        turnoverDate: [
           { required: true, message: '请选择日期', trigger: 'change' }
         ],
 
-        dimissionReason: [
+        turnoverReason: [
           { required: true, trigger: "blur", message: "请选择离职原因" }
         ],
         peopleList: [