Merge branch 'dev' of http://git.echepei.com/tire-platform/Smart_platform_ui into dev

src/api/iosBasicData/finstlbills.js

@@ -40,6 +40,14 @@ export const finstlbillsSubmit = (row) => {
   })
 }
 
+// 保存结算凭证模板
+export const finstlbillsSubmitVouchers = (row) => {
+  return request({
+    url: '/api/blade-los/finstlbills/submitVouchers',
+    method: 'post',
+    data: row
+  })
+}
 
 // 检索
 export const finstlbillsListAccBill = (params) => {
@@ -264,4 +272,4 @@ export const revokeInvoice  = (data) => {
     method: 'post',
     data: data
   })
-}
+}

src/components/iosbasic-data/searchquery.vue

@@ -246,7 +246,7 @@ export default {
             if (name == null || name === "") {
                 return false;
             }
-            this.$emit('remoteMethod', name)
+            this.$emit('remoteMethod', name, this)
         },
         // 获取最新数据
         refreshData() {

src/views/iosBasicData/ComputationCenter/components/fromtableDetails.vue

@@ -35,6 +35,7 @@
         <template slot-scope="{ row }">
           <div style="display: flex; align-items: center; justify-content: space-between">
             <search-query
+              v-if="!isARAPRow(row)"
               style="width: 100%"
               :datalist="accountData"
               :selectValue="row.accountCode"
@@ -50,8 +51,10 @@
               @corpChange="corpChange($event, 'accountId', row)"
             >
             </search-query>
+            <span v-if="isARAPRow(row)">{{row.accountCode}}</span>
+
             <el-tooltip
-              v-if="!disabled && (row.isEmpl === 1 || row.isCorp === 1 || row.isDept === 1 || row.isItem === 1)"
+              v-if="!disabled && (row.isEmpl === 1 || row.isCorp === 1 || row.isDept === 1 || row.isItem === 1) && !isARAPRow(row)"
               class="item"
               effect="dark"
               content="核算项目"
@@ -85,11 +88,12 @@
         <el-table-column prop="amountDr" label="借方" min-width="90px" align="center">
           <template slot-scope="{ row }">
             <el-input-number
+              v-if="!isARAPRow(row)"
               style="width: 100%"
               v-model="row.amountDr"
               size="small"
               autocomplete="off"
-              :disabled="!row.accountId || disabled"
+              :disabled="row.curCode !== 'CNY' || !row.accountId || disabled"
               placeholder="请输入借方"
               :precision="2"
               @change="amountBlur(row, 'D')"
@@ -97,16 +101,18 @@
               :controls="false"
             >
             </el-input-number>
+            <span v-else>{{ fmtAmt(row.amountDr, 2) }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="amountCr" label="货方" min-width="90px" align="center">
           <template slot-scope="{ row }">
             <el-input-number
+              v-if="!isARAPRow(row)"
               style="width: 100%"
               v-model="row.amountCr"
               size="small"
               autocomplete="off"
-              :disabled="!row.accountId || disabled"
+              :disabled="row.curCode !== 'CNY' || !row.accountId || disabled"
               placeholder="请输入货方"
               :precision="2"
               @change="amountBlur(row, 'C')"
@@ -114,6 +120,7 @@
               :controls="false"
             >
             </el-input-number>
+            <span v-else>{{ fmtAmt(row.amountCr, 2) }}</span>
           </template>
         </el-table-column>
       </el-table-column>
@@ -122,7 +129,7 @@
         <el-table-column prop="exrate" label="汇率" min-width="80px" align="center">
           <template slot-scope="{ row }">
             <el-input-number
-              v-if="row.curCode === 'USD'"
+              v-if="row.curCode === 'USD' && !isARAPRow(row)"
               style="width: 100%"
               v-model="row.exrate"
               size="small"
@@ -135,14 +142,14 @@
               :controls="false"
             >
             </el-input-number>
-            <!--            {{ row.exrate }}-->
+            <span v-else-if="row.curCode === 'USD'">{{ fmtAmt(row.exrate, 2) }}</span>
             <span v-else></span>
           </template>
         </el-table-column>
         <el-table-column prop="amountDrUsd" label="借方" min-width="90px" align="center">
           <template slot-scope="{ row }">
             <el-input-number
-              v-if="row.changeMode !== 'd'"
+              v-if="row.curCode === 'USD' && row.changeMode !== 'd' && !isARAPRow(row)"
               style="width: 100%; text-align: right"
               v-model="row.amountDrUsd"
               size="small"
@@ -155,12 +162,13 @@
               :controls="false"
             >
             </el-input-number>
+            <span v-else>{{ fmtAmt(row.amountDrUsd, 2) }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="amountCrUsd" label="货方" min-width="90px" align="center">
           <template slot-scope="{ row }">
             <el-input-number
-              v-if="row.changeMode !== 'd'"
+              v-if="row.curCode === 'USD' && row.changeMode !== 'd' && !isARAPRow(row)"
               style="width: 100%"
               v-model="row.amountCrUsd"
               size="small"
@@ -173,6 +181,7 @@
               :controls="false"
             >
             </el-input-number>
+            <span v-else>{{ fmtAmt(row.amountCrUsd, 2) }}</span>
           </template>
         </el-table-column>
       </el-table-column>
@@ -205,7 +214,7 @@
               :disabled="disabled"
             ></el-button>
           </el-tooltip>
-          <el-tooltip class="item" effect="dark" :content="scope.row.changeMode === 'd' ? '恢复' : '删除'" placement="top">
+          <el-tooltip v-if="!isARAPRow(scope.row)" class="item" effect="dark" :content="scope.row.changeMode === 'd' ? '恢复' : '删除'" placement="top">
             <el-button
               size="mini"
               type="danger"
@@ -259,7 +268,11 @@ export default {
   methods: {
     forceNumber(s, d) {
       let N = Number(s);
-      return isNaN(N) ? 0.0 : Number(N.toFixed(d));
+      return isNaN(N) ? 0.0 : Number(N.toFixed(d ? d : 2));
+    },
+    fmtAmt(value, d){
+      let N = this.forceNumber(value, d).toFixed(d);
+      return N === '0.00' ? '' : N;
     },
     // 自定义合计
     summaryMethod(param) {
@@ -293,6 +306,10 @@ export default {
       });
       return sums;
     },
+    isARAPRow(row) {
+      let code = row && row.accountCode ? row.accountCode : "";
+      return code.startsWith("1141") || code.startsWith("2121")
+    },
     handleKeydown(e, row, name) {
       console.log("handleKeydown", e, name);
       if (e.key === "=") {
@@ -302,10 +319,11 @@ export default {
           amtCr = 0.0;
         this.tableData.forEach(item => {
           if (item !== row) {
-            amtDr = this.forceNumber(amtDr + item.amountDr, 2);
-            amtCr = this.forceNumber(amtCr + item.amountCr, 2);
+            amtDr = this.forceNumber(amtDr + this.forceNumber(item.amountDr, 2), 2);
+            amtCr = this.forceNumber(amtCr + this.forceNumber(item.amountCr, 2), 2);
           }
         });
+        console.log("amtDr", amtDr, "amtCr", amtCr);
         if (name === "amountDr") {
           this.$set(row, "amountCr", 0.0);
           this.$set(row, name, this.forceNumber(amtCr - amtDr, 2));
@@ -316,12 +334,17 @@ export default {
         }
 
         if (row.curCode === "USD") {
+          this.$set(row, "exrate", this.forceNumber(row.exrate, 4));
           if (row.exrate.toFixed(4) === "0.0000") {
-            row.exrate = 1;
+            this.$set(row, "exrate", 1);
           }
 
-          this.$set(row, "amountDrUsd", this.forceNumber(row.amountDr / row.exrate, 2));
-          this.$set(row, "amountCrUsd", this.forceNumber(row.amountCr / row.exrate, 2));
+          this.$set(row, "amountDrUsd", this.forceNumber(this.forceNumber(row.amountDr, 2) / row.exrate, 2));
+          this.$set(row, "amountCrUsd", this.forceNumber(this.forceNumber(row.amountCr, 2) / row.exrate, 2));
+        }else{
+          this.$set(row, "exrate", 1);
+          this.$set(row, "amountDrUsd", 0.00);
+          this.$set(row, "amountCrUsd", 0.00);
         }
       }
     },

src/views/iosBasicData/ComputationCenter/index.vue

@@ -167,7 +167,7 @@ export default {
       loading: false,
       // 分页
       page: {
-        pageSize: 10,
+        pageSize: 100,
         currentPage: 1,
         total: 0
       },
@@ -210,11 +210,13 @@ export default {
               label: "cnName",
               value: "cnName",
               res: "data.records"
-            }
+            },
+            width: 140,
           },
           {
             label: "MB/L NO",
             prop: "mblno",
+            width: 120,
             search: true,
             searchOrder: 2,
             overHidden: true
@@ -222,7 +224,7 @@ export default {
           {
             label: "JOB NO",
             prop: "businessNo",
-            width: "120",
+            width: 120,
             search: true,
             searchOrder: 3,
             overHidden: true
@@ -230,6 +232,7 @@ export default {
           {
             label: "HB/L NO",
             prop: "hblno",
+            width: 120,
             search: true,
             searchOrder: 4,
             overHidden: true
@@ -237,7 +240,7 @@ export default {
           {
             label: "ACCT NO",
             prop: "accountNo",
-            width: "100",
+            width: 120,
             search: true,
             searchOrder: 5,
             overHidden: true
@@ -245,6 +248,7 @@ export default {
           {
             label: "业务类型",
             prop: "businessType",
+            width: 100,
             hide: false,
             overHidden: true,
             type: "select",
@@ -257,6 +261,7 @@ export default {
           {
             label: "来源类型",
             prop: "srcType",
+            width: 100,
             overHidden: true
           },
           {
@@ -268,37 +273,42 @@ export default {
           {
             label: "单据编号",
             prop: "billNo",
+            width: 120,
             search: true,
             overHidden: true
           },
           {
             label: "来源单号",
             prop: "requestNo",
+            width: 120,
             search: true,
             overHidden: true
           },
           {
             label: "发票抬头",
             prop: "invCorpCnName",
+            width: 160,
             hide: true,
             overHidden: true
           },
           {
             label: "费用名称",
             prop: "feeCnName",
+            width: 100,
             search: true,
             overHidden: true
           },
           {
             label: "申请人",
             prop: "createUserName",
+            width: 100,
             overHidden: true
           },
           {
             label: "结算日期",
             prop: "billDate",
+            width: 140,
             overHidden: true,
-            width: "150"
           },
 
           {
@@ -360,19 +370,19 @@ export default {
           {
             label: "提交日期",
             prop: "auditDateFrom",
-            width: "140",
+            width: 140,
             overHidden: true
           },
           {
             label: "审核日期",
             prop: "auditDateTo",
-            width: "140",
+            width: 140,
             overHidden: true
           },
           {
             label: "收/付",
             prop: "dc",
-            width: "140",
+            width: 80,
             search: true,
             type: "select",
             dicData: [
@@ -395,7 +405,7 @@ export default {
             label: "对账单号",
             prop: "checkNo",
             search: true,
-            width: "100",
+            width: 100,
             searchOrder: 6,
             overHidden: true
           },
@@ -914,7 +924,7 @@ export default {
   text-align: center;
 }
 
-/deep/ .el-col-md-8 {
+::v-deep .el-col-md-8 {
   width: 24.33333%;
 }
 

src/views/iosBasicData/SeafreightExportF/bills/assembly/DocumentCenter.vue

@@ -1150,6 +1150,8 @@ export default {
       options.toolbar.showParametersButton = true; // 显示参数按钮
       options.appearance.bookmarksPrint = true; // 书签打印
       // options.toolbar.showPrintButton = false // 打印按钮是否显示   下面直接自定义控制打印弹窗是否开启
+      options.toolbar.showViewModeButton = true // 视图模式按钮
+      options.toolbar.viewMode = 2 // 视图模式 0 单页 1 连续 2 多页
 
       // printDestination 参数：用于指定报表打印的目标位置，可以是打印机、PDF 文件或者直接打印到浏览器等。
       // Stimulsoft.Viewer.StiPrintDestination.Direct：表示直接打印到打印机，即将报表内容直接发送至打印机进行打印。

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -2397,13 +2397,13 @@ export default {
       }
       this.$confirm(title)
         .then(_ => {
-          this.$set(this.assemblyForm, "hnotify2Id", "");
-          this.$set(this.assemblyForm, "hnotify2CnName", "");
-          this.$set(this.assemblyForm, "hnotify2EnName", "");
-          this.$set(this.assemblyForm, "hnotify2Code", "");
-          this.$set(this.assemblyForm, "hnotify2Details", "");
-          this.$set(this.assemblyForm, "hnotify2CntyName", "");
-          this.$set(this.assemblyForm, "hnotify2CntyCode", "");
+          this.$set(this.assemblyForm.detail, "hnotify2Id", "");
+          this.$set(this.assemblyForm.detail, "hnotify2CnName", "");
+          this.$set(this.assemblyForm.detail, "hnotify2EnName", "");
+          this.$set(this.assemblyForm.detail, "hnotify2Code", "");
+          this.$set(this.assemblyForm.detail, "hnotify2Details", "");
+          this.$set(this.assemblyForm.detail, "hnotify2CntyName", "");
+          this.$set(this.assemblyForm.detail, "hnotify2CntyCode", "");
           this.hnotify2Visible = false;
         })
         .catch(_ => {});

src/views/iosBasicData/finvouchers/assembly/fromtableDetails.vue

@@ -73,7 +73,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column prop="dc" label="方向" width="60px" style="padding: 0">
+      <el-table-column prop="dc" label="方向" width="50px" style="padding: 0; text-align: center;"  align="center">
         <template slot-scope="{ row }">
           <span>{{ row.dc == 'D' ? '借' : '贷' }}</span>
         </template>
@@ -87,7 +87,7 @@
               v-model="row.amountDr"
               size="small"
               autocomplete="off"
-              :disabled="!row.accountId || disabled"
+              :disabled="row.curCode !== 'CNY' || !row.accountId || disabled"
               placeholder="请输入借方"
               :precision="2"
               @change="amountBlur(row, 'D')"
@@ -104,7 +104,7 @@
               v-model="row.amountCr"
               size="small"
               autocomplete="off"
-              :disabled="!row.accountId || disabled"
+              :disabled="row.curCode !== 'CNY' || !row.accountId || disabled"
               placeholder="请输入货方"
               :precision="2"
               @change="amountBlur(row, 'C')"
@@ -116,12 +116,12 @@
         </el-table-column>
       </el-table-column>
       <el-table-column label="外币金额">
-        <el-table-column prop="curCode" label="币种" width="80px" align="center"> </el-table-column>
+        <el-table-column prop="curCode" label="币种" width="50px" align="center"> </el-table-column>
         <el-table-column prop="exrate" label="汇率" width="100px">
           <template slot-scope="{ row }">
             <el-input-number
               v-if="row.curCode === 'USD'"
-              style="width: 100%"
+              style="width: 100%; border: none;"
               v-model="row.exrate"
               size="small"
               autocomplete="off"
@@ -140,7 +140,7 @@
         <el-table-column prop="amountDrUsd" label="借方" width="120px">
           <template slot-scope="{ row }">
             <el-input-number
-              v-if="row.changeMode !== 'd'"
+              v-if="row.curCode === 'USD' && row.changeMode !== 'd'"
               style="width: 100%; text-align: right"
               v-model="row.amountDrUsd"
               size="small"
@@ -153,12 +153,13 @@
               :controls="false"
             >
             </el-input-number>
+            <span v-else></span>
           </template>
         </el-table-column>
         <el-table-column prop="amountCrUsd" label="货方" width="120px">
           <template slot-scope="{ row }">
             <el-input-number
-              v-if="row.changeMode !== 'd'"
+              v-if="row.curCode === 'USD' && row.changeMode !== 'd'"
               style="width: 100%"
               v-model="row.amountCrUsd"
               size="small"
@@ -171,6 +172,7 @@
               :controls="false"
             >
             </el-input-number>
+            <span v-else></span>
           </template>
         </el-table-column>
       </el-table-column>
@@ -257,7 +259,7 @@ export default {
   methods: {
     forceNumber(s, d){
       let N = Number(s);
-      return isNaN(N) ? 0.00 : Number(N.toFixed(d));
+      return isNaN(N) ? 0.00 : Number(N.toFixed(d ? d : 2));
     },
     // 自定义合计
     summaryMethod(param) {
@@ -293,32 +295,39 @@ export default {
     },
     handleKeydown(e, row, name){
       console.log("handleKeydown", e, name);
-      if(e.key === "="){
+      if (e.key === "=") {
         e.preventDefault();
         // amountDr,amountCr
-        let amtDr = 0.00, amtCr = 0.00;
-        this.tableData.forEach((item) => {
-          if(item!==row){
-            amtDr = this.forceNumber(amtDr + item.amountDr, 2);
-            amtCr = this.forceNumber(amtCr + item.amountCr, 2);
+        let amtDr = 0.0,
+          amtCr = 0.0;
+        this.tableData.forEach(item => {
+          if (item !== row) {
+            amtDr = this.forceNumber(amtDr + this.forceNumber(item.amountDr, 2), 2);
+            amtCr = this.forceNumber(amtCr + this.forceNumber(item.amountCr, 2), 2);
           }
-        })
-        if(name==='amountDr'){
-          this.$set(row, "amountCr", 0.00)
-          this.$set(row, name, this.forceNumber(amtCr - amtDr, 2))
+        });
+        console.log("amtDr", amtDr, "amtCr", amtCr);
+        if (name === "amountDr") {
+          this.$set(row, "amountCr", 0.0);
+          this.$set(row, name, this.forceNumber(amtCr - amtDr, 2));
         }
-        if(name==='amountCr'){
-          this.$set(row, "amountDr", 0.00)
-          this.$set(row, name, this.forceNumber(amtDr - amtCr, 2))
+        if (name === "amountCr") {
+          this.$set(row, "amountDr", 0.0);
+          this.$set(row, name, this.forceNumber(amtDr - amtCr, 2));
         }
 
-        if(row.curCode==="USD"){
-          if(row.exrate.toFixed(4)==='0.0000'){
-            row.exrate = 1
+        if (row.curCode === "USD") {
+          this.$set(row, "exrate", this.forceNumber(row.exrate, 4));
+          if (row.exrate.toFixed(4) === "0.0000") {
+            this.$set(row, "exrate", 1);
           }
 
-          this.$set(row, "amountDrUsd", this.forceNumber(row.amountDr / row.exrate, 2))
-          this.$set(row, "amountCrUsd", this.forceNumber(row.amountCr / row.exrate, 2))
+          this.$set(row, "amountDrUsd", this.forceNumber(this.forceNumber(row.amountDr, 2) / row.exrate, 2));
+          this.$set(row, "amountCrUsd", this.forceNumber(this.forceNumber(row.amountCr, 2) / row.exrate, 2));
+        }else{
+          this.$set(row, "exrate", 1);
+          this.$set(row, "amountDrUsd", 0.00);
+          this.$set(row, "amountCrUsd", 0.00);
         }
       }
     },
@@ -363,11 +372,17 @@ export default {
       this.$set(row, "amountDr", (row.amountDrUsd * row.exrate).toFixed(2));
     },
     // 获取科目类型数据
-    accountsListfun(code) {
+    accountsListfun(code, ref) {
+      console.log("accountsListfun", code, ref);
       // isManual == 1 的允许手工添加
       accountsList(1, 10, { code, isDetail: 1, isManual: 1 }).then((res) => {
-        console.log(res.data.data.records);
         this.accountData = res.data.data.records;
+        if(code && this.accountData.length===1){
+          if(ref){
+            ref.corpChange(this.accountData[0].code)
+            ref.visible = false
+          }
+        }
       });
     },
     // 行删除
@@ -389,6 +404,11 @@ export default {
       if (!row.accountId) {
         return this.$message.warning("请先选择科目代码");
       }
+      let amt = this.forceNumber(row.curCode!=="CNY" ? (row.dc==="D" ? row.amountCrUsd : row.amountDrUsd) : (row.dc==="D" ? row.amountCr : row.amountDr), 2)
+      if(amt<=0.00){
+        return this.$message.warning("请先输入核销金额！");
+      }
+
       this.$emit("showOffRecordsfun", row);
     },
     // 下拉回调
@@ -396,7 +416,6 @@ export default {
       let found = false;
       if (name === "accountId") {
         for (let item of this.accountData) {
-          console.log(item);
           if (item.code == value) {
             found = true;
             console.log(item, item.id);
@@ -635,4 +654,8 @@ export default {
 ::v-deep .el-input-number .el-input__inner {
   text-align: right;
 }
+
+::v-deep .el-input__inner {
+  /* border: none !important; */
+}
 </style>

src/views/iosBasicData/finvouchers/finvouchersitems.vue

@@ -1171,10 +1171,10 @@ export default {
         }
       });
 
-      if (amt.toFixed(2) !== amtOff.toFixed(2)) {
+      if (Number(amt.toFixed(2)) < Number(amtOff.toFixed(2))) {
         return this.$message({
           dangerouslyUseHTMLString: true,
-          message: "<div>选定核销金额与应核销金额不一致！</div>",
+          message: "<div>选定核销金额不应该大于应核销金额！</div>",
           type: "warning",
         });
       }

src/views/iosBasicData/humanResources/employees/detailsPage.vue

@@ -52,6 +52,7 @@ export default {
     data() {
         return {
             deptList: [],
+            deptListTree: [],
             editDisabled: false,
             form: {
                 whetherEmployedOrNot: '1'
@@ -112,13 +113,14 @@ export default {
                         prop: "accountingDepartmentName",
                         type: "cascader",
                         dataType: 'string',
-                        emitPath: false,
-                        dicUrl: "/api/blade-system/dept/list",
+                        emitPath: true,
+                        // dicUrl: "/api/blade-system/dept/list",
                         props: {
                             label: 'deptName',
                             value: 'deptName',
                         },
-                        showAllLevels: false,
+                        dicData: [],
+                        // showAllLevels: false,
                         disabled: false,
                         rules: [{
                             required: true,
@@ -172,13 +174,14 @@ export default {
                         prop: "administrativeDepartmentName",
                         type: "cascader",
                         dataType: 'string',
-                        emitPath: false,
-                        dicUrl: "/api/blade-system/dept/list",
+                        emitPath: true,
+                        // dicUrl: "/api/blade-system/dept/list",
                         props: {
                             label: 'deptName',
                             value: 'deptName',
                         },
-                        showAllLevels: false,
+                        dicData: [],
+                        // showAllLevels: false,
                         disabled: false,
                     },
                     {
@@ -576,12 +579,26 @@ export default {
         }
         let List = []
         getDeptList().then(res => {
+            this.deptListTree = res.data.data
             List = res.data.data
             res.data.data.forEach(e => {
+                e.cascaderName = e.deptName + "," + e.deptName
                 if (e.children) {
-                    this.deptList = List.concat(e.children)
+                  e.children.forEach(b=>{
+                    b.cascaderName = e.deptName + "," + b.deptName
+                  })
+                  this.deptList = List.concat(e.children)
                 }
             });
+            this.deptListTree.forEach(e=>{
+              if(e.children && e.children.length>0) {
+                let a = JSON.parse(JSON.stringify(e))
+                delete a.children
+                e.children.splice(0, 0, a)
+              }
+            })
+            this.findObject(this.optionForm1.column, "accountingDepartmentName").dicData = this.deptListTree;
+            this.findObject(this.optionForm1.column, "administrativeDepartmentName").dicData = this.deptListTree;
         })
     },
     methods: {
@@ -623,10 +640,10 @@ export default {
                 done();
                 if (valid) {
                     this.deptList.forEach(item => {
-                        if (item.deptName == this.form.accountingDepartmentName) {
+                        if (item.cascaderName === this.form.accountingDepartmentName) {
                             this.form.accountingDepartmentId = item.id
                         }
-                        if (item.deptName == this.form.administrativeDepartmentName) {
+                        if (item.cascaderName === this.form.administrativeDepartmentName) {
                             this.form.administrativeDepartmentId = item.id
                         }
                     })

src/views/iosBasicData/humanResources/employees/index.vue

@@ -176,7 +176,14 @@ export default {
                     {
                         label: "职务",
                         prop: "position",
-                        overHidden: true
+                        overHidden: true,
+                      type: 'select',
+                      filterable: true,
+                      dicUrl: "/api/blade-system/dict-biz/dictionary?code=position",
+                      props: {
+                        label: 'dictValue',
+                        value: 'dictKey',
+                      },
                     },
                     // {
                     //     label: "*何时参加工作*",
@@ -433,4 +440,4 @@ export default {
 ::v-deep .el-col-md-8 {
     width: 24.33333%;
 }
-</style>
+</style>

src/views/iosBasicData/humanResources/resignations/index.vue

@@ -174,7 +174,14 @@ export default {
                     {
                         label: "职务",
                         prop: "position",
-                        overHidden: true
+                        overHidden: true,
+                      type: 'select',
+                      filterable: true,
+                      dicUrl: "/api/blade-system/dict-biz/dictionary?code=position",
+                      props: {
+                        label: 'dictValue',
+                        value: 'dictKey',
+                      },
                     },
                     // {
                     //     label: "*何时参加工作*",
@@ -431,4 +438,4 @@ export default {
 ::v-deep .el-col-md-8 {
     width: 24.33333%;
 }
-</style>
+</style>