sunlupeng 1 år sedan
förälder
incheckning
0032d1f4d0

+ 8 - 3
src/views/oa/business/DataList.vue

@@ -11,8 +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 posOptions" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
+          <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -103,6 +102,7 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
 import { getListData, exportList } from "@/api/oa/business"
 import detail from "./detail.vue";
 import edit from "./edit.vue";
@@ -120,7 +120,7 @@ export default {
   data() {
     return {
       detailLoading: false,
-      posOptions: [],
+      postOptions: [],
       id: '',
       // 遮罩层
       loading: true,
@@ -165,6 +165,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) {

+ 1 - 1
src/views/oa/business/edit.vue

@@ -144,7 +144,7 @@ export default {
       fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
       // fileUrl: 'http://192.168.100.249:48080/admin-api/infra/file/uploaData',
       // 部门树选项
-      posOptions: [],
+      postOptions: [],
       deptOptions: [],
       nikeNamelist: [],
       form: {

+ 47 - 41
src/views/oa/conversion/DataList.vue

@@ -3,43 +3,43 @@
     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true" label-width="80px">
       <el-form-item label="转正人" prop="employeeName">
         <el-input v-model="queryParams.employeeName" placeholder="转正人" clearable style="width: 250px"
-                  @keyup.enter.native="handleQuery"/>
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="部门" prop="deptId">
-        <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
+        <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 posOptions" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
+        <el-select v-model="queryParams.position" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
         <el-input v-model="queryParams.employeePhone" placeholder="请输入手机号" clearable style="width: 250px"
-                  @keyup.enter.native="handleQuery"/>
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="转正日期" prop="conversionDate">
-            <el-date-picker v-model="queryParams.conversionDate" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
-              type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']" />
-          </el-form-item>
-          <el-form-item label="申请人"prop="creator">
+        <el-date-picker v-model="queryParams.conversionDate" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="申请人" prop="creator">
         <el-input v-model="queryParams.creator" placeholder="申请人" clearable style="width: 250px"
-                  @keyup.enter.native="handleQuery"/>
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
-    
+
       <el-form-item label="申请时间" prop="createTime">
-            <el-date-picker v-model="queryParams.createTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
-              type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']" />
-          </el-form-item>
+        <el-date-picker v-model="queryParams.createTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
       <el-form-item label="审批状态" prop="auditStatus">
         <el-select v-model="queryParams.auditStatus" placeholder="审批状态" clearable style="width: 250px">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_TASK_AUDIT_STATUS)" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_TASK_AUDIT_STATUS)" :key="parseInt(dict.value)"
+            :label="dict.label" :value="parseInt(dict.value)" />
         </el-select>
       </el-form-item>
-     
+
       <el-form-item label="">
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -49,7 +49,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="warning" icon="el-icon-download" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['system:role:export']">导出</el-button>
+          v-hasPermi="['system:role:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -69,13 +69,13 @@
       </el-table-column>
       <el-table-column label="审批状态" align="center" prop="auditStatus" min-width="100">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.auditStatus"/>
+          <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.auditStatus" />
         </template>
       </el-table-column>
       <el-table-column label="当前处理人" align="center" prop="currentAuditEmployeeName" min-width="120" />
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 修改 -->
     <el-dialog title="转正申请(修改)" :visible.sync="openEdit" width="800px" append-to-body v-loading="detailLoading">
@@ -89,7 +89,8 @@
 </template>
 
 <script>
-import { getListData,exportList }  from "@/api/oa/conversion"
+import { listSimplePosts } from "@/api/system/post";
+import { getListData, exportList } from "@/api/oa/conversion"
 import detail from "./detail.vue";
 import edit from "./edit.vue";
 import Treeselect from "@riophae/vue-treeselect";
@@ -105,9 +106,9 @@ export default {
   },
   data() {
     return {
-      detailLoading:false,
-        posOptions: [],
-      id:'',
+      detailLoading: false,
+      postOptions: [],
+      id: '',
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -134,7 +135,7 @@ export default {
         creator: undefined,
         createTime: [],
         auditStatus: undefined,
-        
+
       },
     };
   },
@@ -143,11 +144,16 @@ export default {
     this.getListDept();
   },
   methods: {
-      /** 查询部门列表 */
-      getListDept() {
+    /** 查询部门列表 */
+    getListDept() {
       listDept().then(response => {
         this.deptOptions = this.handleTree(response.data, "id");
       });
+      listSimplePosts().then(response => {
+        // 处理 postOptions 参数
+        this.postOptions = [];
+        this.postOptions.push(...response.data);
+      });
     },
     /** 转换部门数据结构 */
     normalizer(node) {
@@ -162,9 +168,9 @@ export default {
     },
     handdle(row) {
       this.id = row.id;
-      if(row.auditStatus==0){
+      if (row.auditStatus == 0) {
         this.openEdit = true;
-      }else{
+      } else {
         this.openDetail = true;
       }
     },
@@ -197,20 +203,20 @@ export default {
 
 
 
- 
+
 
 
 
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有数据项?').then(function() {
-          this.exportLoading = true;
-          return exportList(queryParams);
-        }).then(response => {
-          this.$download.excel(response, '转正申请数据.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
+      this.$modal.confirm('是否确认导出所有数据项?').then(function () {
+        this.exportLoading = true;
+        return exportList(queryParams);
+      }).then(response => {
+        this.$download.excel(response, '转正申请数据.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
     }
   }
 };

+ 1 - 1
src/views/oa/conversion/edit.vue

@@ -143,7 +143,7 @@ export default {
       fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
       // fileUrl: 'http://192.168.100.249:48080/admin-api/infra/file/uploaData',
       // 部门树选项
-      posOptions: [],
+      postOptions: [],
       deptOptions: [],
       nikeNamelist: [],
       form: {

+ 9 - 5
src/views/oa/entry/DataList.vue

@@ -9,10 +9,8 @@
         <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
       </el-form-item>
       <el-form-item label="职位" prop="position">
-        <el-select v-model="queryParams.position" placeholder="请选择"
-        style="width: 250px">
-          <el-option v-for="item in posOptions" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
+        <el-select v-model="queryParams.position" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="员工类型" prop="employeeType">
@@ -100,6 +98,7 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
 import { getListData,exportList }  from "@/api/oa/entry"
 import detail from "./detail.vue";
 import edit from "./edit.vue";
@@ -117,7 +116,7 @@ export default {
   data() {
     return {
       detailLoading:false,
-        posOptions: [],
+        postOptions: [],
       id:'',
       // 遮罩层
       loading: true,
@@ -159,6 +158,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) {

+ 13 - 5
src/views/oa/entry/edit.vue

@@ -9,10 +9,9 @@
           placeholder="请选选择部门" />
       </el-form-item>
       <el-form-item label="职位">
-        <el-select v-model="form.position" filterable allow-create default-first-option placeholder="请选择"
-          style="width: 100%;">
-          <el-option v-for="item in posOptions" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
+        <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-option>
         </el-select>
       </el-form-item>
       <el-form-item label="员工类型" prop="employeeType">
@@ -118,6 +117,7 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
 import { getDetail, create,reCommit, save, deleteById,closeById } from "@/api/oa/entry"
 import {getDate} from "@/utils/dateUtils";
 import { getUserProfile } from "@/api/system/user";
@@ -155,7 +155,7 @@ export default {
       fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
       // fileUrl: 'http://192.168.100.249:48080/admin-api/infra/file/uploaData',
       // 部门树选项
-      posOptions: [],
+      postOptions: [],
       deptOptions: [],
       nikeNamelist: [],
       form: {
@@ -230,6 +230,7 @@ export default {
 
   created() {
     this.getDeptList();
+    this.getPostOptions();
   },
   watch: {
     id: {
@@ -244,6 +245,13 @@ export default {
     }
   },
   methods: {
+    getPostOptions(){
+      listSimplePosts().then(response => {
+        // 处理 postOptions 参数
+        this.postOptions = [];
+        this.postOptions.push(...response.data);
+      });
+    },
     getDateStar(ms) {
       return getDate(ms);
     },

+ 8 - 3
src/views/oa/expense/DataList.vue

@@ -11,8 +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 posOptions" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
+          <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -87,6 +86,7 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
 import { typeList,getListData, exportList } from "@/api/oa/expense"
 import detail from "./detail.vue";
 import edit from "./edit.vue";
@@ -105,7 +105,7 @@ export default {
     return {
       detailLoading: false,
       typeList:[],
-      posOptions: [],
+      postOptions: [],
       id: '',
       // 遮罩层
       loading: true,
@@ -154,6 +154,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) {

+ 9 - 5
src/views/oa/leave/DataList.vue

@@ -9,10 +9,8 @@
         <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
       </el-form-item>
       <el-form-item label="职位" prop="position">
-        <el-select v-model="queryParams.position" placeholder="请选择"
-        style="width: 250px">
-          <el-option v-for="item in posOptions" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
+        <el-select v-model="queryParams.position" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -97,6 +95,7 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
 import { getListData,exportList }  from "@/api/oa/leave"
 import detail from "./detail.vue";
 import edit from "./edit.vue";
@@ -114,7 +113,7 @@ export default {
   data() {
     return {
       detailLoading:false,
-        posOptions: [],
+        postOptions: [],
       id:'',
       // 遮罩层
       loading: true,
@@ -156,6 +155,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) {

+ 1 - 1
src/views/oa/leave/edit.vue

@@ -160,7 +160,7 @@ export default {
       fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
       // fileUrl: 'http://192.168.100.249:48080/admin-api/infra/file/uploaData',
       // 部门树选项
-      posOptions: [],
+      postOptions: [],
       deptOptions: [],
       nikeNamelist: [],
       form: {

+ 9 - 5
src/views/oa/out/DataList.vue

@@ -9,10 +9,8 @@
         <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
       </el-form-item>
       <el-form-item label="职位" prop="position">
-        <el-select v-model="queryParams.position" placeholder="请选择"
-        style="width: 250px">
-          <el-option v-for="item in posOptions" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
+        <el-select v-model="queryParams.position" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -95,6 +93,7 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
 import { getListData,exportList }  from "@/api/oa/out"
 import detail from "./detail.vue";
 import edit from "./edit.vue";
@@ -112,7 +111,7 @@ export default {
   data() {
     return {
       detailLoading:false,
-        posOptions: [],
+        postOptions: [],
       id:'',
       // 遮罩层
       loading: true,
@@ -154,6 +153,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) {

+ 1 - 1
src/views/oa/out/edit.vue

@@ -136,7 +136,7 @@ export default {
       fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
       // fileUrl: 'http://192.168.100.249:48080/admin-api/infra/file/uploaData',
       // 部门树选项
-      posOptions: [],
+      postOptions: [],
       deptOptions: [],
       nikeNamelist: [],
       form: {

+ 9 - 5
src/views/oa/purchase/DataList.vue

@@ -9,10 +9,8 @@
         <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
       </el-form-item>
       <el-form-item label="职位" prop="position">
-        <el-select v-model="queryParams.position" placeholder="请选择"
-        style="width: 250px">
-          <el-option v-for="item in posOptions" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
+        <el-select v-model="queryParams.position" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -83,6 +81,7 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
 import { getListData,exportList }  from "@/api/oa/purchase"
 import detail from "./detail.vue";
 import edit from "./edit.vue";
@@ -100,7 +99,7 @@ export default {
   data() {
     return {
       detailLoading:false,
-        posOptions: [],
+        postOptions: [],
       id:'',
       // 遮罩层
       loading: true,
@@ -140,6 +139,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) {

+ 1 - 1
src/views/oa/purchase/edit.vue

@@ -172,7 +172,7 @@ export default {
       fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
       // fileUrl: 'http://192.168.100.249:48080/admin-api/infra/file/uploaData',
       // 部门树选项
-      posOptions: [],
+      postOptions: [],
       deptOptions: [],
       nikeNamelist: [],
       form: {

+ 9 - 5
src/views/oa/receive/DataList.vue

@@ -9,10 +9,8 @@
         <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
       </el-form-item>
       <el-form-item label="职位" prop="position">
-        <el-select v-model="queryParams.position" placeholder="请选择"
-        style="width: 250px">
-          <el-option v-for="item in posOptions" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
+        <el-select v-model="queryParams.position" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -83,6 +81,7 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
 import { getListData,exportList }  from "@/api/oa/receive"
 import detail from "./detail.vue";
 import edit from "./edit.vue";
@@ -100,7 +99,7 @@ export default {
   data() {
     return {
       detailLoading:false,
-        posOptions: [],
+        postOptions: [],
       id:'',
       // 遮罩层
       loading: true,
@@ -140,6 +139,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) {

+ 1 - 1
src/views/oa/receive/edit.vue

@@ -170,7 +170,7 @@ export default {
       fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
       // fileUrl: 'http://192.168.100.249:48080/admin-api/infra/file/uploaData',
       // 部门树选项
-      posOptions: [],
+      postOptions: [],
       deptOptions: [],
       nikeNamelist: [],
       form: {

+ 9 - 5
src/views/oa/renew/DataList.vue

@@ -9,10 +9,8 @@
         <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
       </el-form-item>
       <el-form-item label="职位" prop="position">
-        <el-select v-model="queryParams.position" placeholder="请选择"
-        style="width: 250px">
-          <el-option v-for="item in posOptions" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
+        <el-select v-model="queryParams.position" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -84,6 +82,7 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
 import { getListData,exportList }  from "@/api/oa/renew"
 import detail from "./detail.vue";
 import edit from "./edit.vue";
@@ -101,7 +100,7 @@ export default {
   data() {
     return {
       detailLoading:false,
-        posOptions: [],
+        postOptions: [],
       id:'',
       // 遮罩层
       loading: true,
@@ -142,6 +141,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) {

+ 1 - 1
src/views/oa/renew/edit.vue

@@ -153,7 +153,7 @@ export default {
       fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
       // fileUrl: 'http://192.168.100.249:48080/admin-api/infra/file/uploaData',
       // 部门树选项
-      posOptions: [],
+      postOptions: [],
       deptOptions: [],
       nikeNamelist: [],
       form: {

+ 9 - 5
src/views/oa/stamp/DataList.vue

@@ -9,10 +9,8 @@
         <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
       </el-form-item>
       <el-form-item label="职位" prop="position">
-        <el-select v-model="queryParams.position" placeholder="请选择"
-        style="width: 250px">
-          <el-option v-for="item in posOptions" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
+        <el-select v-model="queryParams.position" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -82,6 +80,7 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
 import { getListData,exportList }  from "@/api/oa/stamp"
 import detail from "./detail.vue";
 import edit from "./edit.vue";
@@ -99,7 +98,7 @@ export default {
   data() {
     return {
       detailLoading:false,
-        posOptions: [],
+        postOptions: [],
       id:'',
       // 遮罩层
       loading: true,
@@ -139,6 +138,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) {

+ 1 - 1
src/views/oa/stamp/edit.vue

@@ -129,7 +129,7 @@ export default {
       fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
       // fileUrl: 'http://192.168.100.249:48080/admin-api/infra/file/uploaData',
       // 部门树选项
-      posOptions: [],
+      postOptions: [],
       deptOptions: [],
       nikeNamelist: [],
       form: {

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

@@ -9,10 +9,8 @@
         <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
       </el-form-item>
       <el-form-item label="职位" prop="position">
-        <el-select v-model="queryParams.position" placeholder="请选择"
-        style="width: 250px">
-          <el-option v-for="item in posOptions" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
+        <el-select v-model="queryParams.position" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
@@ -91,6 +89,7 @@
 </template>
 
 <script>
+import { listSimplePosts } from "@/api/system/post";
 import { getListData,exportList }  from "@/api/oa/turnover"
 import detail from "./detail.vue";
 import edit from "./edit.vue";
@@ -108,7 +107,7 @@ export default {
   data() {
     return {
       detailLoading:false,
-        posOptions: [],
+        postOptions: [],
       id:'',
       // 遮罩层
       loading: true,
@@ -150,6 +149,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) {

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

@@ -137,7 +137,7 @@ export default {
       fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
       // fileUrl: 'http://192.168.100.249:48080/admin-api/infra/file/uploaData',
       // 部门树选项
-      posOptions: [],
+      postOptions: [],
       deptOptions: [],
       nikeNamelist: [],
       options: [{

+ 36 - 38
src/views/oa/universal/DataList.vue

@@ -3,31 +3,32 @@
     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true" label-width="80px">
       <el-form-item label="申请人" prop="employeeName">
         <el-input v-model="queryParams.employeeName" placeholder="请输入申请人" clearable style="width: 250px"
-                  @keyup.enter.native="handleQuery"/>
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="部门" prop="deptId">
-        <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
+        <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.id" :label="item.name" :value="item.id"></el-option>
+        <el-select v-model="queryParams.position" placeholder="请选择" style="width: 250px">
+          <el-option v-for="item in postOptions" :key="item.name" :label="item.name" :value="item.name"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="手机号" prop="employeePhone">
         <el-input v-model="queryParams.employeePhone" placeholder="请输入手机号" clearable style="width: 250px"
-                  @keyup.enter.native="handleQuery"/>
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="审批状态" prop="auditStatus">
         <el-select v-model="queryParams.auditStatus" placeholder="审批状态" clearable style="width: 250px">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_TASK_AUDIT_STATUS)" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_TASK_AUDIT_STATUS)" :key="parseInt(dict.value)"
+            :label="dict.label" :value="parseInt(dict.value)" />
         </el-select>
       </el-form-item>
       <el-form-item label="申请时间" prop="createTime">
-            <el-date-picker v-model="queryParams.createTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
-              type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']" />
-          </el-form-item>
+        <el-date-picker v-model="queryParams.createTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
       <el-form-item label="">
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -37,7 +38,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="warning" icon="el-icon-download" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['system:role:export']">导出</el-button>
+          v-hasPermi="['system:role:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -48,21 +49,21 @@
       <el-table-column label="职位" align="center" prop="position" min-width="150" />
       <el-table-column label="手机号" align="center" prop="employeePhone" min-width="150" />
       <el-table-column label="申请事项标题" align="center" prop="title" min-width="150" />
-      <el-table-column label="申请时间"  align="center" prop="createTime" min-width="180">
+      <el-table-column label="申请时间" align="center" prop="createTime" min-width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="审批状态" align="center" prop="auditStatus" min-width="100">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.auditStatus"/>
+          <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.auditStatus" />
         </template>
       </el-table-column>
       <el-table-column label="当前处理人" align="center" prop="currentAuditEmployeeName" min-width="100" />
     </el-table>
 
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 修改 -->
     <el-dialog title="通用审批(修改)" :visible.sync="openEdit" width="800px" v-loading="detailLoading">
@@ -77,7 +78,7 @@
 
 <script>
 import { listSimplePosts } from "@/api/system/post";
-import { getListData,exportList }  from "@/api/oa/universal"
+import { getListData, exportList } from "@/api/oa/universal"
 import detail from "./detail.vue";
 import edit from "./edit.vue";
 import Treeselect from "@riophae/vue-treeselect";
@@ -93,9 +94,9 @@ export default {
   },
   data() {
     return {
-      detailLoading:false,
-        postOptions: [],
-      id:'',
+      detailLoading: false,
+      postOptions: [],
+      id: '',
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -126,21 +127,18 @@ export default {
   created() {
     this.getList();
     this.getListDept();
-    this.getPostOptions();
   },
   methods: {
-    getPostOptions(){
+    /** 查询部门列表 */
+    getListDept() {
+      listDept().then(response => {
+        this.deptOptions = this.handleTree(response.data, "id");
+      });
       listSimplePosts().then(response => {
         // 处理 postOptions 参数
         this.postOptions = [];
         this.postOptions.push(...response.data);
       });
-    },
-      /** 查询部门列表 */
-      getListDept() {
-      listDept().then(response => {
-        this.deptOptions = this.handleTree(response.data, "id");
-      });
     },
     /** 转换部门数据结构 */
     normalizer(node) {
@@ -155,9 +153,9 @@ export default {
     },
     handdle(row) {
       this.id = row.id;
-      if(row.auditStatus==0){
+      if (row.auditStatus == 0) {
         this.openEdit = true;
-      }else{
+      } else {
         this.openDetail = true;
       }
     },
@@ -190,20 +188,20 @@ export default {
 
 
 
- 
+
 
 
 
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有数据项?').then(function() {
-          this.exportLoading = true;
-          return exportList(queryParams);
-        }).then(response => {
-          this.$download.excel(response, '通用审批数据.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
+      this.$modal.confirm('是否确认导出所有数据项?').then(function () {
+        this.exportLoading = true;
+        return exportList(queryParams);
+      }).then(response => {
+        this.$download.excel(response, '通用审批数据.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
     }
   }
 };

+ 1 - 1
src/views/oa/universal/edit.vue

@@ -123,7 +123,7 @@ export default {
       fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
       // fileUrl: 'http://192.168.100.249:48080/admin-api/infra/file/uploaData',
       // 部门树选项
-      posOptions: [],
+      postOptions: [],
       deptOptions: [],
       nikeNamelist: [],
       form: {