修改

src/views/personnel/relations/conversion/index.vue

@@ -9,9 +9,8 @@
         <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
       </el-form-item>
       <el-form-item label="职位" prop="position">
-        <el-select v-model="queryParams.position" placeholder="请选择"
-        style="width: 250px">
-          <el-option v-for="item in postOptions" :key="item.value" :label="item.label" :value="item.value">
+        <el-select v-model="queryParams.position" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name">
           </el-option>
         </el-select>
       </el-form-item>
@@ -36,7 +35,7 @@
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="审批状态" clearable style="width: 250px">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_TASK_AUDIT_STATUS)" :key="parseInt(dict.value)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="parseInt(dict.value)"
             :label="dict.label" :value="parseInt(dict.value)" />
         </el-select>
       </el-form-item>
@@ -73,10 +72,10 @@
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status" min-width="100">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.status" />
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['relations:conversion:update']">修改</el-button>
@@ -126,12 +125,12 @@
       </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="试用期结束日期">
+            <el-form-item label="试用期">
         <el-input v-model="form.probationEndDate" placeholder='试用期结束日期' disabled></el-input>
       </el-form-item>
           </el-col>
 
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="转正日期" prop="conversionDate">
         <el-date-picker value-format="yyyy-MM-dd" v-model="form.conversionDate" type="date" placeholder="请选择转正日期"
           style="width: 100%;">
@@ -139,14 +138,14 @@
       </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="转正申请理由" prop="conversionReason">
+          <el-col :span="24">
+            <el-form-item label="申请理由" prop="conversionReason">
         <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.conversionReason"
           placeholder='请填写转正申请理由'></el-input>
       </el-form-item>
           </el-col>
 
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="工作总结">
         <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.workSummary"
           placeholder='请填写工作总结'></el-input>
@@ -291,6 +290,8 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
+import { getEmployeeInfo } from "@/api/system/user";
 import { listConversion, getConversion, delConversion, addConversion, updateConversion, exportConversion } from "@/api/personnel/relations/conversion/index";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
 import Treeselect from "@riophae/vue-treeselect";
@@ -364,6 +365,16 @@ export default {
     this.getListDept();
   },
   methods: {
+    getEmployee() {
+      getEmployeeInfo(this.form.employeeId).then(response => {
+        let employeeInfo = response.data;
+        this.form.deptName = employeeInfo.deptName;
+        this.form.position = employeeInfo.position;
+        this.form.employeePhone = employeeInfo.phone;
+        this.form.entryDate = employeeInfo.entryDate;
+        this.form.probationEndDate = employeeInfo.probationEndDate;
+      });
+    },
     //打开选人弹窗
     openSingle() {
       this.singlePeopleOpen = true;
@@ -372,6 +383,7 @@ export default {
       console.log(userNamelist);
       this.form.employeeName = nikeNamelist.join();
       this.form.employeeId = userIdList.join();
+      this.getEmployee();
       this.singlePeopleOpen = false;
     },
     handleRemove(file, fileList) {
@@ -416,6 +428,11 @@ export default {
       listDept().then(response => {
         this.deptOptions = this.handleTree(response.data, "id");
       });
+      listSimplePosts().then(response => {
+        // 处理 postOptions 参数
+        this.postOptions = [];
+        this.postOptions.push(...response.data);
+      });
     },
     /** 转换部门数据结构 */
     normalizer(node) {
@@ -537,7 +554,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除"' + ids + '"的数据项?').then(function () {
+      this.$modal.confirm('是否确认删除数据项?').then(function () {
         return delConversion(ids);
       }).then(() => {
         this.getList();
@@ -555,7 +572,7 @@ export default {
         this.exportLoading = true;
         return exportConversion(params);
       }).then(response => {
-        this.$download.excel(response, '.xls');
+        this.$download.excel(response, '转正信息.xls');
         this.exportLoading = false;
       }).catch(() => { });
     }

src/views/personnel/relations/entry/index.vue

@@ -176,7 +176,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="入职日期" prop="entryDate">
               <el-date-picker value-format="yyyy-MM-dd" v-model="form.entryDate" type="date" placeholder="选择日期"
                 style="width: 100%;">

src/views/personnel/relations/renew/index.vue

@@ -11,7 +11,7 @@
       </el-form-item>
       <el-form-item label="职位" prop="position">
         <el-select v-model="queryParams.position" placeholder="请选择" style="width: 250px">
-          <el-option v-for="item in postOptions" :key="item.value" :label="item.label" :value="item.value">
+          <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name">
           </el-option>
         </el-select>
       </el-form-item>
@@ -31,7 +31,7 @@
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="审批状态" clearable style="width: 250px">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_TASK_AUDIT_STATUS)" :key="parseInt(dict.value)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="parseInt(dict.value)"
             :label="dict.label" :value="parseInt(dict.value)" />
         </el-select>
       </el-form-item>
@@ -68,10 +68,10 @@
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status" min-width="100">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.status" />
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['relations:renew:update']">修改</el-button>
@@ -116,46 +116,46 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="原合同开始日期">
+            <el-form-item label="原合同始">
               <el-input v-model="form.oldContractStartDate" placeholder='原合同开始日期' disabled></el-input>
 
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="原合同结束日期">
+            <el-form-item label="原合同终">
               <el-input v-model="form.oldContractEndDate" placeholder='原合同结束日期' disabled></el-input>
 
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="续签开始日期" prop="renewContractStartDate">
+            <el-form-item label="续签始" prop="renewContractStartDate">
               <el-date-picker value-format="yyyy-MM-dd" v-model="form.renewContractStartDate" type="date"
                 placeholder="选择日期" style="width: 100%;">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="续签结束日期" prop="renewContractEndDate">
+            <el-form-item label="续签终" prop="renewContractEndDate">
               <el-date-picker value-format="yyyy-MM-dd" v-model="form.renewContractEndDate" type="date"
                 placeholder="选择日期" style="width: 100%;">
               </el-date-picker>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="续签合同期限(月)" prop="renewPeriod">
+          <el-col :span="24">
+            <el-form-item label="合同期限" prop="renewPeriod">
               <el-input v-model="form.renewPeriod" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"
-                placeholder='续签合同期限'></el-input>
+                placeholder='续签合同期限(月)'></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="转正申请理由" prop="renewReason">
+          <el-col :span="24">
+            <el-form-item label="申请理由" prop="renewReason">
               <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.renewReason"
                 placeholder='申请理由'></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="工作总结">
               <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.workPerformance"
                 placeholder='请输入'></el-input>
@@ -316,6 +316,8 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
+import { getEmployeeInfo } from "@/api/system/user";
 import { listRenew, getRenew, delRenew, addRenew, updateRenew, exportRenew } from "@/api/personnel/relations/renew/index";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
 import Treeselect from "@riophae/vue-treeselect";
@@ -394,6 +396,17 @@ export default {
     this.getListDept();
   },
   methods: {
+    getEmployee() {
+      getEmployeeInfo(this.form.employeeId).then(response => {
+        let employeeInfo = response.data;
+        this.form.deptName = employeeInfo.deptName;
+        this.form.position = employeeInfo.position;
+        this.form.employeePhone = employeeInfo.phone;
+        this.form.entryDate = employeeInfo.entryDate;
+        this.form.oldContractStartDate = employeeInfo.contractStartDate;
+        this.form.oldContractEndDate = employeeInfo.contractEndDate;
+      });
+    },
     //打开选人弹窗
     openSingle() {
       this.singlePeopleOpen = true;
@@ -402,6 +415,7 @@ export default {
       console.log(userNamelist);
       this.form.employeeName = nikeNamelist.join();
       this.form.employeeId = userIdList.join();
+      this.getEmployee();
       this.singlePeopleOpen = false;
     },
     handleRemove(file, fileList) {
@@ -446,6 +460,11 @@ export default {
       listDept().then(response => {
         this.deptOptions = this.handleTree(response.data, "id");
       });
+      listSimplePosts().then(response => {
+        // 处理 postOptions 参数
+        this.postOptions = [];
+        this.postOptions.push(...response.data);
+      });
     },
     /** 转换部门数据结构 */
     normalizer(node) {
@@ -570,7 +589,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除字典编号为"' + ids + '"的数据项?').then(function () {
+      this.$modal.confirm('是否确认删除数据项?').then(function () {
         return delRenew(ids);
       }).then(() => {
         this.getList();
@@ -588,7 +607,7 @@ export default {
         this.exportLoading = true;
         return exportRenew(params);
       }).then(response => {
-        this.$download.excel(response, '.xls');
+        this.$download.excel(response, '续签信息.xls');
         this.exportLoading = false;
       }).catch(() => { });
     }

src/views/personnel/relations/turnover/index.vue

@@ -11,7 +11,7 @@
       </el-form-item>
       <el-form-item label="职位" prop="position">
         <el-select v-model="queryParams.position" placeholder="请选择" style="width: 250px">
-          <el-option v-for="item in postOptions" :key="item.value" :label="item.label" :value="item.value">
+          <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name">
           </el-option>
         </el-select>
       </el-form-item>
@@ -37,7 +37,7 @@
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="审批状态" clearable style="width: 250px">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_TASK_AUDIT_STATUS)" :key="parseInt(dict.value)"
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="parseInt(dict.value)"
             :label="dict.label" :value="parseInt(dict.value)" />
         </el-select>
       </el-form-item>
@@ -74,10 +74,10 @@
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status" min-width="100">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.status" />
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="120">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['relations:turnover:update']">修改</el-button>
@@ -257,6 +257,8 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
+import { getEmployeeInfo } from "@/api/system/user";
 import { listTurnover, getTurnover, delTurnover, addTurnover, updateTurnover, exportTurnover } from "@/api/personnel/relations/turnover/index";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
 import Treeselect from "@riophae/vue-treeselect";
@@ -331,6 +333,16 @@ export default {
     this.getListDept();
   },
   methods: {
+    getEmployee() {
+      getEmployeeInfo(this.form.employeeId).then(response => {
+        let employeeInfo = response.data;
+        this.form.deptName = employeeInfo.deptName;
+        this.form.position = employeeInfo.position;
+        this.form.employeePhone = employeeInfo.phone;
+        this.form.entryDate = employeeInfo.entryDate;
+        // this.form.probationEndDate = employeeInfo.probationEndDate;
+      });
+    },
     //打开选人弹窗
     openSingle() {
       this.singlePeopleOpen = true;
@@ -339,6 +351,7 @@ export default {
       console.log(userNamelist);
       this.form.employeeName = nikeNamelist.join();
       this.form.employeeId = userIdList.join();
+      this.getEmployee();
       this.singlePeopleOpen = false;
     },
     handleRemove(file, fileList) {
@@ -383,6 +396,11 @@ export default {
       listDept().then(response => {
         this.deptOptions = this.handleTree(response.data, "id");
       });
+      listSimplePosts().then(response => {
+        // 处理 postOptions 参数
+        this.postOptions = [];
+        this.postOptions.push(...response.data);
+      });
     },
     /** 转换部门数据结构 */
     normalizer(node) {
@@ -502,7 +520,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除"' + ids + '"的数据项?').then(function () {
+      this.$modal.confirm('是否确认删除数据项?').then(function () {
         return delTurnover(ids);
       }).then(() => {
         this.getList();
@@ -520,7 +538,7 @@ export default {
         this.exportLoading = true;
         return exportTurnover(params);
       }).then(response => {
-        this.$download.excel(response, '.xls');
+        this.$download.excel(response, '离职信息.xls');
         this.exportLoading = false;
       }).catch(() => { });
     }