修改

src/api/personnel/attendance/business/index.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询列表
 export function listBusiness(query) {
   return request({
-    url: '/personnel/relations/business/page',
+    url: '/personnel/attendance/business/page',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listBusiness(query) {
 // 查询详细
 export function getBusiness(id) {
   return request({
-    url: '/personnel/relations/business/get?id=' + id,
+    url: '/personnel/attendance/business/get?id=' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getBusiness(id) {
 // 新增
 export function addBusiness(data) {
   return request({
-    url: '/personnel/relations/business/create',
+    url: '/personnel/attendance/business/create',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addBusiness(data) {
 // 修改
 export function updateBusiness(data) {
   return request({
-    url: '/personnel/relations/business/update',
+    url: '/personnel/attendance/business/update',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateBusiness(data) {
 // 删除
 export function delBusiness(id) {
   return request({
-    url: '/personnel/relations/business/delete?id=' + id,
+    url: '/personnel/attendance/business/delete?id=' + id,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delBusiness(id) {
 // 导出
 export function exportBusiness(query) {
   return request({
-    url: '/personnel/relations/business/export-excel',
+    url: '/personnel/attendance/business/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'

src/api/personnel/attendance/info/index.js

@@ -22,7 +22,7 @@ export function listInfoMonthly(query) {
 // 查询列表
 export function listInfo(query) {
   return request({
-    url: '/personnel/relations/info/page',
+    url: '/personnel/attendance/info/page',
     method: 'get',
     params: query
   })
@@ -31,7 +31,7 @@ export function listInfo(query) {
 // 查询详细
 export function getInfo(dictId) {
   return request({
-    url: '/personnel/relations/info/get?id=' + dictId,
+    url: '/personnel/attendance/info/get?id=' + dictId,
     method: 'get'
   })
 }
@@ -39,7 +39,7 @@ export function getInfo(dictId) {
 // 新增
 export function addInfo(data) {
   return request({
-    url: '/personnel/relations/info/create',
+    url: '/personnel/attendance/info/create',
     method: 'post',
     data: data
   })
@@ -48,7 +48,7 @@ export function addInfo(data) {
 // 修改
 export function updateInfo(data) {
   return request({
-    url: '/personnel/relations/info/update',
+    url: '/personnel/attendance/info/update',
     method: 'put',
     data: data
   })
@@ -57,7 +57,7 @@ export function updateInfo(data) {
 // 删除
 export function delInfo(dictId) {
   return request({
-    url: '/personnel/relations/info/delete?id=' + dictId,
+    url: '/personnel/attendance/info/delete?id=' + dictId,
     method: 'delete'
   })
 }
@@ -65,7 +65,7 @@ export function delInfo(dictId) {
 // 导出
 export function exportInfo(query) {
   return request({
-    url: '/personnel/relations/info/export-excel',
+    url: '/personnel/attendance/info/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'

src/api/personnel/attendance/out/index.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询列表
 export function listOut(query) {
   return request({
-    url: '/personnel/relations/out/page',
+    url: '/personnel/attendance/out/page',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listOut(query) {
 // 查询详细
 export function getOut(id) {
   return request({
-    url: '/personnel/relations/out/get?id=' + id,
+    url: '/personnel/attendance/out/get?id=' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getOut(id) {
 // 新增
 export function addOut(data) {
   return request({
-    url: '/personnel/relations/out/create',
+    url: '/personnel/attendance/out/create',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addOut(data) {
 // 修改
 export function updateOut(data) {
   return request({
-    url: '/personnel/relations/out/update',
+    url: '/personnel/attendance/out/update',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateOut(data) {
 // 删除
 export function delOut(id) {
   return request({
-    url: '/personnel/relations/out/delete?id=' + id,
+    url: '/personnel/attendance/out/delete?id=' + id,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delOut(id) {
 // 导出
 export function exportOut(query) {
   return request({
-    url: '/personnel/relations/out/export-excel',
+    url: '/personnel/attendance/out/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'

src/api/personnel/attendance/scheduling/index.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询岗位列表
+// 查询列表
 export function listScheduling(query) {
   return request({
     url: '/personnel/attendance/scheduling-manage/page',
@@ -9,7 +9,7 @@ export function listScheduling(query) {
   })
 }
 
-// 获取岗位精简信息列表
+// 获取精简信息列表
 export function listSimpleSchedulings() {
   return request({
     url: '/system/post/list-all-simple',
@@ -17,7 +17,7 @@ export function listSimpleSchedulings() {
   })
 }
 
-// 查询岗位详细
+// 查询详细
 export function getScheduling(postId) {
   return request({
     url: '/personnel/attendance/scheduling-manage/get?id=' + postId,
@@ -25,7 +25,7 @@ export function getScheduling(postId) {
   })
 }
 
-// 新增岗位
+// 新增
 export function addScheduling(data) {
   return request({
     url: '/personnel/attendance/scheduling-manage/create',
@@ -34,7 +34,7 @@ export function addScheduling(data) {
   })
 }
 
-// 修改岗位
+// 修改
 export function updateScheduling(data) {
   return request({
     url: '/personnel/attendance/scheduling-manage/update',
@@ -43,7 +43,7 @@ export function updateScheduling(data) {
   })
 }
 
-// 删除岗位
+// 删除
 export function delScheduling(postId) {
   return request({
     url: '/personnel/attendance/scheduling-manage/delete?id=' + postId,
@@ -51,7 +51,7 @@ export function delScheduling(postId) {
   })
 }
 
-// 导出岗位
+// 导出
 export function exportScheduling(query) {
   return request({
     url: '/personnel/attendance/scheduling-manage/export-excel',

src/views/personnel/attendance/business/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>
@@ -33,8 +33,8 @@
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
-      <el-form-item label="创建人" prop="creator">
-        <el-input v-model="queryParams.creator" placeholder="创建人" clearable style="width: 250px"
+      <el-form-item label="创建人" prop="creatorEmployeeName">
+        <el-input v-model="queryParams.creatorEmployeeName" placeholder="创建人" clearable style="width: 250px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
 
@@ -44,8 +44,8 @@
           :default-time="['00:00:00', '23:59:59']" />
       </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-select v-model="queryParams.status" placeholder="状态" clearable style="width: 250px">
+          <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>
@@ -77,7 +77,7 @@
       <el-table-column label="结束日期" align="center" prop="endDate" min-width="100" />
       <el-table-column label="出差天数" align="center" prop="day" min-width="100" />
       <el-table-column label="预估费用" align="center" prop="estimatedCost" min-width="100" />
-      <el-table-column label="创建人" align="center" prop="creator" min-width="80" />
+      <el-table-column label="创建人" align="center" prop="creatorEmployeeName" min-width="80" />
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -85,7 +85,7 @@
       </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">
@@ -311,7 +311,9 @@
 </template>
 
 <script>
-import { listTurnover, getTurnover, delTurnover, addTurnover, updateTurnover, exportTurnover } from "@/api/personnel/attendance/business/index";
+import { listSimplePosts } from "@/api/system/post";
+import { getEmployeeInfo } from "@/api/system/user";
+import { listTurnover, getTurnover, delTurnover, addTurnover, updateTurnover, exportTurnover } from "@/api/personnel/attendance/turnover/index";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -362,7 +364,7 @@ export default {
 
         startDate: [],
         endDate: [],
-        creator: undefined,
+        creatorEmployeeName: undefined,
         createTime: [],
         status: undefined,
       },
@@ -396,6 +398,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;
+      });
+    },
     upDay() {
       if (this.form.startDate && this.form.endDate) {
         let Days = this.calLeaveDays();
@@ -433,6 +445,7 @@ export default {
       console.log(userNamelist);
       this.form.employeeName = nikeNamelist.join();
       this.form.employeeId = userIdList.join();
+      this.getEmployee();
       this.singlePeopleOpen = false;
     },
     handleRemove(file, fileList) {
@@ -477,6 +490,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) {
@@ -599,7 +617,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();
@@ -617,7 +635,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(() => { });
     }

src/views/personnel/attendance/info/daily.vue

@@ -141,7 +141,7 @@ export default {
         this.exportLoading = true;
         return exportInfo(params);
       }).then(response => {
-        this.$download.excel(response, '.xls');
+        this.$download.excel(response, '每日考勤信息.xls');
         this.exportLoading = false;
       }).catch(() => { });
     }

src/views/personnel/attendance/info/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>
@@ -202,6 +202,8 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
+import { getEmployeeInfo } from "@/api/system/user";
 import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo } from "@/api/personnel/attendance/info/index";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
 import Treeselect from "@riophae/vue-treeselect";
@@ -268,6 +270,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;
@@ -276,6 +288,7 @@ export default {
       console.log(userNamelist);
       this.form.employeeName = nikeNamelist.join();
       this.form.employeeId = userIdList.join();
+      this.getEmployee();
       this.singlePeopleOpen = false;
     },
     /** 查询部门列表 */
@@ -283,6 +296,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) {
@@ -385,7 +403,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除字典编号为"' + ids + '"的数据项?').then(function () {
+      this.$modal.confirm('是否确认删除数据项?').then(function () {
         return delInfo(ids);
       }).then(() => {
         this.getList();
@@ -403,7 +421,7 @@ export default {
         this.exportLoading = true;
         return exportInfo(params);
       }).then(response => {
-        this.$download.excel(response, '.xls');
+        this.$download.excel(response, '员工考勤信息.xls');
         this.exportLoading = false;
       }).catch(() => { });
     }

src/views/personnel/attendance/info/monthly.vue

@@ -142,7 +142,7 @@ export default {
         this.exportLoading = true;
         return exportInfo(params);
       }).then(response => {
-        this.$download.excel(response, '.xls');
+        this.$download.excel(response, '月度考勤信息.xls');
         this.exportLoading = false;
       }).catch(() => { });
     }

src/views/personnel/attendance/leave/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>
@@ -35,8 +35,8 @@
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
-      <el-form-item label="创建人" prop="creator">
-        <el-input v-model="queryParams.creator" placeholder="创建人" clearable style="width: 250px"
+      <el-form-item label="创建人" prop="creatorEmployeeName">
+        <el-input v-model="queryParams.creatorEmployeeName" placeholder="创建人" clearable style="width: 250px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
 
@@ -47,7 +47,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>
@@ -78,7 +78,7 @@
       <el-table-column label="开始日期" align="center" prop="startDate" min-width="120" />
       <el-table-column label="结束日期" align="center" prop="endDate" min-width="120" />
       <el-table-column label="请假天数" align="center" prop="day" min-width="100" />
-      <el-table-column label="创建人" align="center" prop="creator" min-width="80" />
+      <el-table-column label="创建人" align="center" prop="creatorEmployeeName" min-width="80" />
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -86,7 +86,7 @@
       </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">
@@ -317,6 +317,8 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
+import { getEmployeeInfo } from "@/api/system/user";
 import { listLeave, getLeave, delLeave, addLeave, updateLeave, exportLeave } from "@/api/personnel/attendance/leave/index";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
 import Treeselect from "@riophae/vue-treeselect";
@@ -367,7 +369,7 @@ export default {
         leaveType: undefined,
         startDate: [],
         endDate: [],
-        creator: undefined,
+        creatorEmployeeName: undefined,
         createTime: [],
         status: undefined,
       },
@@ -395,6 +397,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;
+      });
+    },
     upDay() {
       if (this.form.startDate && this.form.endDate) {
         let leaveDays = this.calLeaveDays();
@@ -447,6 +459,7 @@ export default {
       console.log(userNamelist);
       this.form.employeeName = nikeNamelist.join();
       this.form.employeeId = userIdList.join();
+      this.getEmployee();
       this.singlePeopleOpen = false;
     },
     handleRemove(file, fileList) {
@@ -491,6 +504,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) {
@@ -614,7 +632,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除"' + ids + '"的数据项?').then(function () {
+      this.$modal.confirm('是否确认数据项?').then(function () {
         return delLeave(ids);
       }).then(() => {
         this.getList();
@@ -632,7 +650,7 @@ export default {
         this.exportLoading = true;
         return exportLeave(params);
       }).then(response => {
-        this.$download.excel(response, '.xls');
+        this.$download.excel(response, '请假信息.xls');
         this.exportLoading = false;
       }).catch(() => { });
     }

src/views/personnel/attendance/out/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>
@@ -33,8 +33,8 @@
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
-      <el-form-item label="创建人" prop="creator">
-        <el-input v-model="queryParams.creator" placeholder="创建人" clearable style="width: 250px"
+      <el-form-item label="创建人" prop="creatorEmployeeName">
+        <el-input v-model="queryParams.creatorEmployeeName" placeholder="创建人" clearable style="width: 250px"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
 
@@ -45,7 +45,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>
@@ -76,7 +76,7 @@
       <el-table-column label="外出开始时间" align="center" prop="startDate" min-width="150" />
       <el-table-column label="外出结束时间" align="center" prop="endDate" min-width="150" />
       <el-table-column label="外出时长" align="center" prop="hour" min-width="100" />
-      <el-table-column label="创建人" align="center" prop="creator" min-width="80" />
+      <el-table-column label="创建人" align="center" prop="creatorEmployeeName" min-width="80" />
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -84,7 +84,7 @@
       </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">
@@ -302,7 +302,9 @@
 </template>
 
 <script>
-import { listTurnover, getTurnover, delTurnover, addTurnover, updateTurnover, exportTurnover } from "@/api/personnel/attendance/out/index";
+import { listSimplePosts } from "@/api/system/post";
+import { getEmployeeInfo } from "@/api/system/user";
+import { listOut, getOut, delOut, addOut, updateOut, exportOut } from "@/api/personnel/attendance/out/index";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -352,7 +354,7 @@ export default {
         destination: undefined,
         startDate: [],
         endDate: [],
-        creator: undefined,
+        creatorEmployeeName: undefined,
         createTime: [],
         status: undefined,
       },
@@ -380,6 +382,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;
@@ -388,6 +400,7 @@ export default {
       console.log(userNamelist);
       this.form.employeeName = nikeNamelist.join();
       this.form.employeeId = userIdList.join();
+      this.getEmployee();
       this.singlePeopleOpen = false;
     },
     handleRemove(file, fileList) {
@@ -432,6 +445,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) {
@@ -448,7 +466,7 @@ export default {
     getList() {
       this.loading = true;
       // 执行查询
-      listTurnover(this.queryParams).then(response => {
+      listOut(this.queryParams).then(response => {
         this.typeList = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -499,7 +517,7 @@ export default {
     handleDetail(row) {
       this.reset();
       const id = row.id;
-      getTurnover(id).then(response => {
+      getOut(id).then(response => {
         this.form = response.data;
         this.openDetail = true;
         this.title = "详情";
@@ -509,7 +527,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id;
-      getTurnover(id).then(response => {
+      getOut(id).then(response => {
         let files = response.data.fileList;
         if (files) {
           this.files = [];
@@ -535,13 +553,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id !== undefined) {
-            updateTurnover(this.form).then(response => {
+            updateOut(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addTurnover(this.form).then(response => {
+            addOut(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -553,8 +571,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除"' + ids + '"的数据项?').then(function () {
-        return delTurnover(ids);
+      this.$modal.confirm('是否确认删除数据项?').then(function () {
+        return delOut(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
@@ -569,9 +587,9 @@ export default {
       // 执行导出
       this.$modal.confirm('是否确认导出所有数据项?').then(() => {
         this.exportLoading = true;
-        return exportTurnover(params);
+        return exportOut(params);
       }).then(response => {
-        this.$download.excel(response, '.xls');
+        this.$download.excel(response, '公务外出信息.xls');
         this.exportLoading = false;
       }).catch(() => { });
     }

src/views/personnel/attendance/scheduling/index.vue

@@ -250,7 +250,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除排班编号为"' + ids + '"的数据项?').then(function () {
+      this.$modal.confirm('是否确认删除数据项?').then(function () {
         return delScheduling(ids);
       }).then(() => {
         this.getList();
@@ -260,11 +260,11 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有排班数据项?').then(() => {
+      this.$modal.confirm('是否确认导出所有据项?').then(() => {
         this.exportLoading = true;
         return exportScheduling(queryParams);
       }).then(response => {
-        this.$download.excel(response, '排班数据.xls');
+        this.$download.excel(response, '排班信息.xls');
         this.exportLoading = false;
       }).catch(() => { });
     }