Merge remote-tracking branch 'origin/master'

.env.dev

@@ -6,11 +6,11 @@ VUE_APP_TITLE = 爱思系统
 
 # 爱思系统/开发环境
 # 赵培清
-VUE_APP_BASE_API = 'http://192.168.100.213:48080'
+# VUE_APP_BASE_API = 'http://192.168.100.213:48080'
 # 王东坡
 # VUE_APP_BASE_API = 'http://192.168.100.64:48081'
 # 测试
-# VUE_APP_BASE_API = 'http://47.103.79.143:48081'
+VUE_APP_BASE_API = 'http://47.103.79.143:48081'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/api/system/role.js

@@ -67,7 +67,7 @@ export function delRole(roleId) {
 // 导出角色
 export function exportRole(query) {
   return request({
-    url: '/system/role/export',
+    url: '/system/role/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'

src/views/login.vue

@@ -210,7 +210,7 @@ export default {
             removePassword()
             removeRememberMe()
           }
-          // setTenantId(1)
+          setTenantId(1)
           this.$store.dispatch(this.loginForm.loginType === "sms" ? "SmsLogin" : "Login", this.loginForm).then(() => {
             this.$router.push({path: "/"}).catch(() => {
             });

src/views/oa/business/DataList.vue

@@ -9,9 +9,9 @@
         <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.name" :label="item.name" :value="item.name"></el-option>
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -142,7 +142,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         destination: undefined,
 

src/views/oa/conversion/DataList.vue

@@ -9,9 +9,9 @@
         <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.name" :label="item.name" :value="item.name"></el-option>
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -129,7 +129,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         conversionDate: [],
         creator: undefined,

src/views/oa/entry/DataList.vue

@@ -8,9 +8,9 @@
       <el-form-item label="部门" prop="deptId">
         <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.name" :label="item.name" :value="item.name"></el-option>
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="员工类型" prop="employeeType">
@@ -138,7 +138,7 @@ export default {
         pageSize: 10,
         entryName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeeType: undefined,
         gender: undefined,
         contactNumber: undefined,

src/views/oa/entry/edit.vue

@@ -4,14 +4,14 @@
       <el-form-item label="入职人" prop="entryName">
         <el-input v-model="form.entryName" placeholder='请输入入职人'></el-input>
       </el-form-item>
-      <el-form-item label="部门">
+      <el-form-item label="部门" prop="deptId">
         <treeselect :default-expand-level="1" v-model="form.deptId" :options="deptOptions" :normalizer="normalizer"
           placeholder="请选选择部门" />
       </el-form-item>
-      <el-form-item label="职位">
-        <el-select v-model="form.position" placeholder="请选择"
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="form.postId" placeholder="请选择"
         style="width: 100%;">
-        <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name"></el-option>
+        <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="员工类型" prop="employeeType">
@@ -161,7 +161,7 @@ export default {
       form: {
         entryName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeeType: undefined,
         gender: undefined,
         birthday: undefined,
@@ -180,6 +180,12 @@ export default {
           { required: true, message: '请输入入职人姓名', trigger: 'blur' },
           // { min: 3, max: 5, message: '长度在 2 到 5 个字符', trigger: 'blur' }
         ],
+        deptId: [
+          { required: true, message: '请选择', trigger: 'change' }
+        ],
+        postId: [
+          { required: true, message: '请选择', trigger: 'change' }
+        ],
         employeeType: [
           { required: true, message: '请选择', trigger: 'change' }
         ],
@@ -376,6 +382,8 @@ export default {
             }else{
               this.$parent.$parent.setStatus(2);
             }
+          }).catch(() => {
+            this.fullscreenLoading = false;
           });
         } else {
           console.log('error submit!!');

src/views/oa/expense/DataList.vue

@@ -9,9 +9,9 @@
         <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.name" :label="item.name" :value="item.name"></el-option>
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -127,7 +127,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         expenseTypeId: undefined,
         auditStatus: undefined,

src/views/oa/leave/DataList.vue

@@ -8,9 +8,9 @@
       <el-form-item label="部门" prop="deptId">
         <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.name" :label="item.name" :value="item.name"></el-option>
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -135,7 +135,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         leaveType: undefined,
         startDate: [],

src/views/oa/out/DataList.vue

@@ -8,9 +8,9 @@
       <el-form-item label="部门" prop="deptId">
         <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.name" :label="item.name" :value="item.name"></el-option>
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -133,7 +133,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         destination: undefined,
         startDate: [],

src/views/oa/purchase/DataList.vue

@@ -8,9 +8,9 @@
       <el-form-item label="部门" prop="deptId">
         <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.name" :label="item.name" :value="item.name"></el-option>
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -121,7 +121,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         supplierName: undefined,
         auditStatus: undefined,

src/views/oa/receive/DataList.vue

@@ -8,9 +8,9 @@
       <el-form-item label="部门" prop="deptId">
         <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.name" :label="item.name" :value="item.name"></el-option>
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -121,7 +121,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         receiveDate: [],
         auditStatus: undefined,

src/views/oa/renew/DataList.vue

@@ -8,9 +8,9 @@
       <el-form-item label="部门" prop="deptId">
         <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.name" :label="item.name" :value="item.name"></el-option>
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -122,7 +122,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         creator: undefined,
         createTime: [],

src/views/oa/renew/detail.vue

@@ -85,7 +85,7 @@
       <div class="fx-field x-grid-col-12">
         <div class="field-label">
           <span class="field-required">*</span>
-          <div class="field-name">转正申请理由</div>
+          <div class="field-name">续签申请理由</div>
         </div>
         <div class="field-component">
           <span :title="form.renewReason">{{ form.renewReason }}</span>

src/views/oa/renew/edit.vue

@@ -37,7 +37,7 @@
           style="width: 100%;">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="转正申请理由" prop="renewReason">
+      <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>

src/views/oa/stamp/DataList.vue

@@ -8,9 +8,9 @@
       <el-form-item label="部门" prop="deptId">
         <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.name" :label="item.name" :value="item.name"></el-option>
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -120,7 +120,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         stampTitle: undefined,
         auditStatus: undefined,

src/views/oa/turnover/DataList.vue

@@ -8,9 +8,9 @@
       <el-form-item label="部门" prop="deptId">
         <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.name" :label="item.name" :value="item.name"></el-option>
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -129,7 +129,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         turnoverDate: [],
         creator: undefined,

src/views/oa/universal/DataList.vue

@@ -9,9 +9,9 @@
         <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.name" :label="item.name" :value="item.name"></el-option>
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -117,7 +117,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         auditStatus: undefined,
         createTime: []

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

@@ -9,9 +9,9 @@
         <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.name" :label="item.name" :value="item.name">
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
@@ -358,7 +358,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         destination: undefined,
 

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

@@ -96,7 +96,6 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
         employeePhone: undefined,
         attendanceStartDate: this.getNowDate(),
         attendanceEndDate: this.getNowDate(),

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

@@ -9,9 +9,9 @@
         <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.name" :label="item.name" :value="item.name">
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
@@ -244,7 +244,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeeMobile: undefined,
         attendanceDate: [],
       },

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

@@ -84,7 +84,6 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
         employeePhone: undefined,
         attendanceMonth: this.getNowDate(),
       },

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

@@ -9,9 +9,9 @@
         <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.name" :label="item.name" :value="item.name">
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
@@ -364,7 +364,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         leaveType: undefined,
         startDate: [],

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

@@ -9,9 +9,9 @@
         <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.name" :label="item.name" :value="item.name">
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
@@ -349,7 +349,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         destination: undefined,
         startDate: [],

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

@@ -205,7 +205,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.postId)
+      this.ids = selection.map(item => item.id)
       this.single = selection.length != 1
       this.multiple = !selection.length
     },

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

@@ -331,7 +331,7 @@ export default {
       return null; // 如果格式不匹配，返回null
     },
     handleDateClick(dateClickInfo) {
-      let thisDate = dateClickInfo.dateStr;
+      let thisDate = dateClickInfo.dateStr || dateClickInfo.event.startStr;
       let strArray = [];
       this.calendarOptions.events.forEach(item => {
         strArray.push(item.start) 

src/views/personnel/holiday/index.vue

@@ -9,9 +9,9 @@
         <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.name" :label="item.name" :value="item.name">
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
@@ -156,7 +156,7 @@ export default {
         pageSize: 10,
         name: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
       },
       // 表单参数
       form: {},

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

@@ -9,9 +9,9 @@
         <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.name" :label="item.name" :value="item.name">
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
@@ -299,7 +299,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         creatorEmployeeName: undefined,
         createTime: [],

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

@@ -8,9 +8,9 @@
       <el-form-item label="部门" prop="deptId">
         <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.name" :label="item.name" :value="item.name">
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
@@ -337,7 +337,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         conversionDate: [],
         creatorEmployeeName: undefined,

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

@@ -9,9 +9,9 @@
         <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.name" :label="item.name" :value="item.name">
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
@@ -129,12 +129,12 @@
 
           <el-col :span="12">
             <el-form-item label="职位">
-              <!-- <el-select v-model="form.position" filterable allow-create default-first-option placeholder="请选择" style="width: 100%;">
+              <!-- <el-select v-model="form.postId" filterable allow-create default-first-option placeholder="请选择" style="width: 100%;">
                 <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
               </el-select> -->
-              <el-select v-model="form.position" placeholder="请选择" style="width: 100%;">
-                <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name">
+              <el-select v-model="form.postId" placeholder="请选择" style="width: 100%;">
+                <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -400,7 +400,7 @@ export default {
         pageSize: 10,
         entryName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeeType: undefined,
         gender: undefined,
         contactNumber: undefined,
@@ -536,7 +536,7 @@ export default {
       this.form = {
         entryName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeeType: undefined,
         gender: undefined,
         birthday: undefined,

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

@@ -9,9 +9,9 @@
         <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.name" :label="item.name" :value="item.name">
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
@@ -363,7 +363,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         creatorEmployeeName: undefined,
         createTime: [],

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

@@ -9,9 +9,9 @@
         <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.name" :label="item.name" :value="item.name">
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.id" :label="item.name" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
@@ -304,7 +304,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         turnoverDate: [],
         creatorEmployeeName: undefined,

src/views/stamp/list/index.vue

@@ -8,10 +8,10 @@
       <el-form-item label="部门" prop="deptId">
         <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="请选择"
+      <el-form-item label="职位" prop="postId">
+        <el-select v-model="queryParams.postId" 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.id" :label="item.name" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
@@ -218,6 +218,7 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
 import { getEmployeeInfo } from "@/api/system/user";
 import { listStamp, getStamp, delStamp, addStamp, updateStamp, exportStamp } from "@/api/stamp/list";
 import { typeList } from "@/api/oa/stamp"
@@ -248,7 +249,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 岗位表格数据
+      // 表格数据
       StampList: [],
       // 弹出层标题
       title: "",
@@ -261,7 +262,7 @@ export default {
         pageSize: 10,
         employeeName: undefined,
         deptId: undefined,
-        position: undefined,
+        postId: undefined,
         employeePhone: undefined,
         stampTitle: undefined,
         status: undefined,
@@ -320,6 +321,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) {
@@ -343,7 +349,7 @@ export default {
       this.getEmployee();
       this.singlePeopleOpen = false;
     },
-    /** 查询岗位列表 */
+    /** 查询列表 */
     getList() {
       this.loading = true;
       listStamp(this.queryParams).then(response => {
@@ -386,7 +392,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加岗位";
+      this.title = "添加";
     },
     handleRemove(file, fileList) {
       console.log(file, fileList);
@@ -447,7 +453,7 @@ export default {
           }
         }
         this.open = true;
-        this.title = "修改岗位";
+        this.title = "修改";
       });
     },
     /** 详情按钮操作 */
@@ -485,7 +491,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id;
-      this.$modal.confirm('是否确认删除岗位编号为"' + ids + '"的数据项?').then(function () {
+      this.$modal.confirm('是否确认删除数据项?').then(function () {
         return delStamp(ids);
       }).then(() => {
         this.getList();
@@ -495,11 +501,11 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有岗位数据项?').then(() => {
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
         this.exportLoading = true;
         return exportStamp(queryParams);
       }).then(response => {
-        this.$download.excel(response, '岗位数据.xls');
+        this.$download.excel(response, '用印数据.xls');
         this.exportLoading = false;
       }).catch(() => { });
     }

src/views/system/companyInfo/index.vue

@@ -77,7 +77,7 @@ export default {
     this.getTenantInfo();
   },
   mounted() {
-    const clipboard = new ClipboardJS('.copy-btn', {
+    this.clipboard = new ClipboardJS('.copy-btn', {
       text: trigger => {
         this.$message({
           message: '复制成功',
@@ -86,7 +86,7 @@ export default {
         return this.tenantData.corpId;
       }
     })
-    clipboard.on('error', e => {
+    this.clipboard.on('error', e => {
       this.$message.error('复制失败')
     })
   },
@@ -109,6 +109,9 @@ export default {
         console.log(this.tenantData);
       })
     },
+  },
+  destroyed() {
+    this.clipboard.destroy()
   }
 };
 </script>

src/views/system/role/index.vue

@@ -481,7 +481,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有角色数据项?').then(function() {
+      this.$modal.confirm('是否确认导出所有角色数据项?').then(() => {
           this.exportLoading = true;
           return exportRole(queryParams);
         }).then(response => {

src/views/system/user/index.vue

@@ -188,7 +188,7 @@ export default {
     this.getTreeselect();
   },
   mounted() {
-    const clipboard = new ClipboardJS('.copy-btn', {
+    this.clipboard = new ClipboardJS('.copy-btn', {
       text: trigger => {
         this.$message({
           message: '复制成功',
@@ -197,7 +197,7 @@ export default {
         return this.corpId;
       }
     })
-    clipboard.on('error', e => {
+    this.clipboard.on('error', e => {
       this.$message.error('复制失败')
     })
   },
@@ -307,6 +307,9 @@ export default {
           this.exportLoading = false;
       }).catch(() => {});
     }
+  },
+  destroyed() {
+    this.clipboard.destroy()
   }
 };
 </script>