src/components/confirmed/confirmed-postchange.vue

@@ -81,11 +81,11 @@
             <table v-show="false" border="1" cellpadding="5" cellspacing="5">
               <caption>網點出納主管及專管員崗位變更記錄表</caption><!--可以生成表格的标题-->
               <tr>
-                <th>銀行號</th>
-                <td>{{row.bankNo}}</td>
+                <th>機構名稱</th>
+                <td>{{row.orgName}}</td>
                 <th></th>
-                <th>機構號</th>
-                <td>{{row.orgNo}}</td>
+                <th></th>
+                <td></td>
               </tr>
               <tr>
                 <th>申請日期</th>

src/components/initiated/init-postchange.vue

@@ -81,11 +81,11 @@
             <table v-show="false" border="1" cellpadding="5" cellspacing="5">
               <caption>網點出納主管及專管員崗位變更記錄表</caption><!--可以生成表格的标题-->
               <tr>
-                <th>銀行號</th>
-                <td>{{row.bankNo}}</td>
+                <th>機構名稱</th>
+                <td>{{row.orgName}}</td>
                 <th></th>
-                <th>機構號</th>
-                <td>{{row.orgNo}}</td>
+                <th></th>
+                <td></td>
               </tr>
               <tr>
                 <th>申請日期</th>

src/components/tobeconfirm/tobeconfirm-postchange.vue

@@ -81,11 +81,11 @@
             <table v-show="false" border="1" cellpadding="5" cellspacing="5">
               <caption>網點出納主管及專管員崗位變更記錄表</caption><!--可以生成表格的标题-->
               <tr>
-                <th>銀行號</th>
-                <td>{{row.bankNo}}</td>
+                <th>機構名稱</th>
+                <td>{{row.orgName}}</td>
                 <th></th>
-                <th>機構號</th>
-                <td>{{row.orgNo}}</td>
+                <th></th>
+                <td></td>
               </tr>
               <tr>
                 <th>申請日期</th>

src/config/website.js

@@ -40,7 +40,7 @@ export default {
     }
   },
   // 第三方系统授权地址
-  authUrl: 'http://localhost/blade-auth/oauth/render',
+  authUrl: 'http://192.168.1.175:8090/blade-auth/oauth/render',
   // 流程设计器地址
   flowDesignUrl: 'http://localhost:8888',
   // 报表设计器地址(cloud端口为8108,boot端口为80)

src/views/bank/autodata.vue

@@ -59,7 +59,7 @@
           <approve-history :data="row"></approve-history>
         </template>
         <template slot-scope="{row, index}" slot="menu">
-          <el-button size="small" class="el-button--text" v-if="approveSwitch == 0 || (approveSwitch == 1 && isManageRole && approveType == 1 && row.processStatus == '已關閉' )"
+          <el-button size="small" class="el-button--text" v-if="(approveSwitch == 0 && isManageRole) || (approveSwitch == 1 && isManageRole && approveType == 1 && row.processStatus == '已關閉' )"
                      @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
           <el-button size="small" class="el-button--text" v-if="userInfo.user_id == row.createUser && row.receiverId.indexOf(userInfo.user_id) > -1 && tableEditBtn && ((approveType == 1 && (row.processStatus == '已退回' || (row.processStatus == '待審批' && !row.approveHistory))) || (approveType == 2 && !row.approveHistory))"
                      @click="formEdit(row, index)"><i class="el-icon-edit"></i> 編 輯</el-button>
@@ -289,7 +289,8 @@
         return {
           addBtn: this.vaildData(this.permission.autodata_add, false),
           viewBtn: this.vaildData(this.permission.autodata_view, false),
-          delBtn: this.vaildData(this.permission.autodata_delete, false),
+          // delBtn: this.vaildData(this.permission.autodata_delete, false),
+          delBtn: false,
           editBtn: this.vaildData(this.permission.autodata_edit, false)
         };
       },
@@ -535,11 +536,10 @@
         this.approveNum = tableStruct.num;
         let option = opStr2opObj(tableStruct.columns);
         option.addBtn = tableStruct.canWrite;
-        _this.deleteBatch = tableStruct.isManageRole;
+        _this.deleteBatch = false;
         // option.delBtn = tableStruct.isManageRole;
         // option.excelBtn = tableStruct.isManageRole;
         this.isManageRole = tableStruct.isManageRole;
-        option.delBtn = false;
         option.editBtn = false;
         option.viewBtn = true;
         this.tableEditBtn = tableStruct.approveSwitch == 1;
@@ -578,6 +578,8 @@
         if (option.group){
           this.approveOption.group = this.deepClone(option.group);
           this.approveOption.group[0].column.forEach(item=>{item.disabled = true})
+        }else{
+          this.approveOption.group = []
         }
         this.approveOption.column.forEach(item => {
           item.disabled = true;
@@ -827,6 +829,7 @@
           const data = res.data.data;
           this.page.total = data.total;
           this.data = this.initData(data.records);
+          debugger
           this.loading = false;
           this.selectionClear();
         });

src/views/bank/keypwd-keep.vue

@@ -94,6 +94,7 @@
               prop: "bankNo",
               span: 24,
               hide: true,
+              display: false,
               disabled: true,
               search: false,
               searchSpan: 4,
@@ -107,6 +108,7 @@
               label: "機構號",
               prop: "orgNo",
               hide: true,
+              display: false,
               disabled: true,
               rules: [{
                 required: true,
@@ -118,6 +120,7 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              span: 24,
               rules: [{
                 required: true,
                 message: "請輸入機構號",

src/views/bank/postchange.vue

@@ -81,11 +81,11 @@
             <table v-show="false" border="1" cellpadding="5" cellspacing="5">
               <caption>網點出納主管及專管員崗位變更記錄表</caption><!--可以生成表格的标题-->
               <tr>
-                <th>銀行號</th>
-                <td>{{row.bankNo}}</td>
+                <th>機構名稱</th>
+                <td>{{row.orgName}}</td>
                 <th></th>
-                <th>機構號</th>
-                <td>{{row.orgNo}}</td>
+                <th></th>
+                <td></td>
               </tr>
               <tr>
                 <th>申請日期</th>

src/views/bank/sealhandover-keep.vue

@@ -83,6 +83,7 @@
               span: 24,
               hide: true,
               disabled: true,
+              display: false,
               search: false,
               searchSpan: 4,
               rules: [{
@@ -96,6 +97,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -106,6 +108,7 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              span: 24,
               rules: [{
                 required: true,
                 message: "請輸入機構號",

src/views/system/user.vue

@@ -88,6 +88,7 @@
                        @click="testVisible = true">驗證測試
             </el-button>
           </template>
+
           <template slot-scope="{row}"
                     slot="tenantName">
             <el-tag>{{row.tenantName}}</el-tag>
@@ -383,7 +384,8 @@
           group: [
             {
               label: '基礎信息',
-              prop: 'baseInfo',
+              prop: 'baseinfo',
+              headerslot: true,
               icon: 'el-icon-user-solid',
               column: [
                 {