sunlupeng 1 rok pred
rodič
commit
51c103fe7d

+ 2 - 2
.env.dev

@@ -6,9 +6,9 @@ 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://192.168.100.64:48081'
 # 测试
 # VUE_APP_BASE_API = 'http://47.103.79.143:48081'
 

+ 4 - 4
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,
 

+ 4 - 4
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,

+ 4 - 4
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,

+ 13 - 5
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!!');

+ 4 - 4
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,

+ 4 - 4
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: [],

+ 4 - 4
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: [],

+ 4 - 4
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,

+ 4 - 4
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,

+ 4 - 4
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: [],

+ 4 - 4
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,

+ 4 - 4
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,

+ 4 - 4
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: []

+ 4 - 4
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,
 

+ 0 - 1
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(),

+ 4 - 4
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: [],
       },

+ 0 - 1
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(),
       },

+ 4 - 4
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: [],

+ 4 - 4
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: [],

+ 4 - 4
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: {},

+ 4 - 4
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: [],

+ 4 - 4
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,

+ 8 - 8
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,

+ 4 - 4
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: [],

+ 4 - 4
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,

+ 10 - 4
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"
@@ -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) {