修复

src/router/axios.js

@@ -10,11 +10,12 @@ import store from '@/store/';
 import router from '@/router/router';
 import {serialize} from '@/util/util';
 import {getToken} from '@/util/auth';
-import {Message, Alert} from 'element-ui';
+import {Message} from 'element-ui';
 import website from '@/config/website';
 import {Base64} from 'js-base64';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
+import error from "../views/monitor/log/error";
 
 //默认超时时间
 axios.defaults.timeout = 10000;
@@ -65,10 +66,12 @@ axios.interceptors.response.use(res => {
   if (status === 401) store.dispatch('FedLogOut').then(() => router.push({path: '/login'}));
   // 如果请求为非200否者默认统一处理
   if (status !== 200) {
-    Alert({
+    /*debugger
+    Message({
       message: message,
       type: 'error'
-    });
+    });*/
+    alert(message);
     return Promise.reject(new Error(message))
   }
   return res;

src/views/bank/postchange.vue

@@ -18,12 +18,12 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="primary"
+        <!--<el-button type="primary"
                    size="small"
                    icon="el-icon-plus"
                    v-if="permission.postchange_edit"
                    @click="handleEdit">新 增
-        </el-button>
+        </el-button>-->
         <el-button type="success"
                    size="small"
                    icon="el-icon-setting"
@@ -53,6 +53,121 @@
         <select-dialog-user :id="form.personId" :name="form.personName" :ehr="form.personNo" :callback="selectCallback"></select-dialog-user>
       </template>
 
+      <template slot="testForm" slot-scope="{row}">
+        <div>
+          <table border="1" cellpadding="5" cellspacing="5">
+            <tr>
+              <th>人員配置</th>
+              <th></th>
+              <th colspan="3">網點出納主管</th>
+              <th colspan="3">網點出納專管員</th>
+            </tr>
+            <tr>
+              <th></th>
+              <th></th>
+              <th>持有人</th>
+              <th colspan="2">後備人員</th>
+              <th>持有人</th>
+              <th colspan="2">後備人員</th>
+            </tr>
+            <tr>
+              <th></th>
+              <th></th>
+              <th>
+                <el-select v-model="row.holderDirector" placeholder="请选择">
+                  <el-option
+                    v-for="item in userList"
+                    :key="item.ehr"
+                    :label="item.text"
+                    :value="item.ehr">
+                  </el-option>
+                </el-select>
+              </th>
+              <th>
+                <el-select v-model="row.backupDirector1" placeholder="请选择">
+                  <el-option
+                    v-for="item in userList"
+                    :key="item.ehr"
+                    :label="item.text"
+                    :value="item.ehr">
+                  </el-option>
+                </el-select>
+              </th>
+              <th>
+                <el-select v-model="row.backupDirector2" placeholder="请选择">
+                  <el-option
+                    v-for="item in userList"
+                    :key="item.ehr"
+                    :label="item.text"
+                    :value="item.ehr">
+                  </el-option>
+                </el-select>
+              </th>
+              <th>
+                <el-select v-model="row.holderManage" placeholder="请选择">
+                  <el-option
+                    v-for="item in userList"
+                    :key="item.ehr"
+                    :label="item.text"
+                    :value="item.ehr">
+                  </el-option>
+                </el-select>
+              </th>
+              <th>
+                <el-select v-model="row.backupManage1" placeholder="请选择">
+                  <el-option
+                    v-for="item in userList"
+                    :key="item.ehr"
+                    :label="item.text"
+                    :value="item.ehr">
+                  </el-option>
+                </el-select>
+              </th>
+              <th>
+                <el-select v-model="row.backupManage2" placeholder="请选择">
+                  <el-option
+                    v-for="item in userList"
+                    :key="item.ehr"
+                    :label="item.text"
+                    :value="item.ehr">
+                  </el-option>
+                </el-select>
+              </th>
+            </tr>
+
+            <tr v-for="(item1, index1) in dicts" :key="item1.id">
+              <th v-if="!(item1.index != 0 && item1.parentName == dicts[index1-1].parentName)" :rowspan="item1.rowspan + ''">{{item1.parentName}}</th>
+              <th>{{item1.dictValue}}</th>
+              <th>
+                <el-checkbox size="medium" v-model="row['holder1' + item1.code + '' + item1.dictKey]"></el-checkbox>
+                <el-tag size="small " type="success" plain v-if="row['holder1' + item1.code + '' + item1.dictKey]">√</el-tag>
+              </th>
+              <th>
+                <el-checkbox size="small" v-model="row['backup1' + item1.code + '' + item1.dictKey]"></el-checkbox>
+                <el-tag size="small " type="success" plain v-if="row['backup1' + item1.code + '' + item1.dictKey]">√</el-tag>
+              </th>
+              <th>
+                <el-checkbox size="mini" v-model="row['backup11' + item1.code + '' + item1.dictKey]"></el-checkbox>
+                <el-tag size="small " type="success" plain v-if="row['backup11' + item1.code + '' + item1.dictKey]">√</el-tag>
+              </th>
+              <th>
+                <el-checkbox v-model="row['holder2' + item1.code + '' + item1.dictKey]"></el-checkbox>
+                <el-tag size="small " type="success" plain v-if="row['holder2' + item1.code + '' + item1.dictKey]">√</el-tag>
+              </th>
+              <th>
+                <el-checkbox v-model="row['backup2' + item1.code + '' + item1.dictKey]"></el-checkbox>
+                <el-tag size="small " type="success" plain v-if="row['backup2' + item1.code + '' + item1.dictKey]">√</el-tag>
+              </th>
+              <th>
+                <el-checkbox v-model="row['backup22' + item1.code + '' + item1.dictKey]"></el-checkbox>
+                <el-tag size="small " type="success" plain v-if="row['backup22' + item1.code + '' + item1.dictKey]">√</el-tag>
+              </th>
+            </tr>
+
+          </table>
+        </div>
+      </template>
+
     </avue-crud>
 
     <el-dialog :append-to-body="true" :modal-append-to-body="false" :visible.sync="settingVisible" title="设置審批人">
@@ -81,6 +196,8 @@
     components: {SelectDialogUser, FlowSettings},
     data() {
       return {
+        dicts: [],
+
         approveFlag: false,
 
         form: {},
@@ -108,11 +225,12 @@
           tip: false,
           searchShow: true,
           searchMenuSpan: 6,
+          dialogFullscreen: true,
           border: true,
           index: false,
           viewBtn: false,
-          addBtn: false,
-          editBtn: false,
+          addBtn: true,
+          editBtn: true,
           delBtn: false,
           selection: true,
           dialogClickModal: false,
@@ -215,7 +333,7 @@
               rules: [{
                 required: true,
                 message: "请输入審批人姓名",
-                trigger: "blur"
+                trigger: "change"
               }]
             },
             {
@@ -246,6 +364,18 @@
               editDisplay: false,
             },
           ],
+          group: [
+            {
+              label: "人員配置",
+              column: [
+                {
+                  // label: "人員配置",
+                  prop: "test",
+                  span: 24,
+                }
+              ]
+            }
+          ],
         },
         optionForm: {
           dialogClickModal: false,
@@ -598,7 +728,7 @@
           item.text = item.name + '-' + item.ehr;
         }
         this.userList = data;
-        this.groupEdit[0].column.forEach(item => {
+        /*this.groupEdit[0].column.forEach(item => {
           if (item.prop.indexOf('holder') > -1 || item.prop.indexOf('backup') > -1){
             item.dicData = data;
           }
@@ -608,11 +738,12 @@
             item.dicData = data;
           }
           item.disabled = true;
-        })
+        })*/
         this.initForm();
       })
     },
     mounted() {
+      // this.initForm();
       getDeptTree().then(res => {
         const column = this.findObject(this.option.column, "orgNos");
         let treeData = getTree(res.data.data, this.userInfo.dept_id);
@@ -788,13 +919,7 @@
           let backupPerson = !!res ? JSON.parse(data.backupPerson) : {};
           Object.assign(data, holder, backupPerson)
           // this.form = data;
-          if (type === 'edit'){
-            _this.option.group = [];
-            let tem = _this.deepClone(_this.option);
-            // this.option = []
-            tem.group = _this.groupEdit;
-            _this.option = tem;
-
+          if (type === 'edit' || type === 'add'){
             if (_this.approveFlag){
               _this.option.updateBtnText = '確認';
               _this.option.editTitle = '信息確認【網點出納主管及專管員崗位表更記錄表】';
@@ -808,7 +933,7 @@
               })
               _this.form = data;
             }else{
-              data.applyDate = '',data.effectiveDate = '',data.remark = '',delete data.id;
+              data.applyDate = '',data.remark = '',delete data.id;
               data.applyDate = dateFormat(new Date(), "yyyy-MM-dd");
               getCurrentDept().then(res => {
                 const data2 =  res.data.data;
@@ -841,18 +966,9 @@
 
             }
           }else{
-            _this.option.group = [];
-            let tem = this.deepClone(_this.option);
-            // this.option = []
-            tem.group = _this.groupView;
-            _this.option = tem;
-            // this.option.group = this.groupView;
             _this.form = data;
             if (_this.form.previousId){
-              console.log(new Date().getTime())
               getDetail(_this.form.previousId).then(res => {
-                console.log(new Date().getTime())
-
                 let preData = res.data.data;
                 let preholderStr = preData.holder.replaceAll('holder', 'preholder');
                 let prebackupPersonStr = preData.backupPerson.replaceAll('backupPerson', 'prebackupPerson');
@@ -869,7 +985,7 @@
         done();
       },
       initForm(){
-        let holderObj = {
+        /*let holderObj = {
           label: "持有人",
           prop: "holder",
           span: 11,
@@ -956,6 +1072,24 @@
             this.option.group = $groupEdit;
             this.optionForm.group = $groupView
           })
+        });*/
+        getDictByCode("cashier_key_type").then(res => {
+            const data = res.data.data;
+            data.forEach(item => {
+              let code = item.dictKey;
+              let value = item.dictValue;
+              getDictByCode(code).then(res2 => {
+                const data2 = res2.data.data;
+                // item.children = data2;
+                data2.forEach((item2, index) => {
+                  item2.index = index;
+                  item2.parentName = value;
+                  item2.rowspan = data2.length;
+                  this.dicts.push(item2)
+                })
+              });
+            })
+          // this.dicts = data;
         });
       },
       beforeSave(row){

src/views/bank/returns.vue

@@ -65,6 +65,10 @@
         <el-tag size="small " type="warning" plain v-if="row.process == 3">待確認</el-tag>
         <el-tag size="small " type="success" plain v-if="row.process == 4">已確認</el-tag>
       </template>
+
+      <template slot="personNo" slot-scope="{row}">
+        <span v-if="row.process != 4">{{row.personName + '-' + row.personNo}}</span>
+      </template>
     </avue-crud>
 
     <el-dialog title="文件上传"
@@ -246,6 +250,15 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "支行機構號",
+              prop: "subOrgNo",
+              rules: [{
+                required: true,
+                message: "请输入支行機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "客戶名稱",
               prop: "customerName",