修復

src/components/confirmed/confirmed-keypwd.vue

@@ -58,7 +58,7 @@
       </template>
 
       <template slot-scope="{disabled,size}" slot="categorySearch">
-        <avue-input-tree :check-strictly="false" multiple v-model="search.category" placeholder="請選擇內容" type="tree" :dic="typeList" :props="props"></avue-input-tree>
+        <avue-input-tree :check-strictly="false" v-model="search.category" placeholder="請選擇內容" type="tree" :dic="typeList" :props="props"></avue-input-tree>
       </template>
 
       <template slot="isTurnIn" slot-scope="{row}">
@@ -88,7 +88,9 @@
     </avue-crud>
 
     <el-dialog :append-to-body="true" :modal-append-to-body="false" :destroy-on-close="true" :fullscreen="true" :visible.sync="keepVisible" title="保管人查詢">
-      <keypwd-keep></keypwd-keep>
+      <div v-if="keepVisible">
+        <keypwd-keep></keypwd-keep>
+      </div>
     </el-dialog>
 
     <el-dialog title="信息確認"
@@ -105,7 +107,7 @@
   import {mapGetters} from "vuex";
   import {dateFormat} from "@/util/date";
   import SelectDialogUser from "@/components/select-dialog/select-dialog-user";
-  import { getCurrentDept } from "@/api/system/dept";
+  import { getCurrentDept, getChildsDept } from "@/api/system/dept";
   import {getDeptTree, getTree} from "@/api/system/dept";
   import KeypwdKeep from "@/views/bank/keypwd-keep";
   import {getStandardByCode} from "@/api/bank/handoverstandard";
@@ -532,43 +534,18 @@
         })
         this.findObject(this.option.column, "orgNo").dicData = dicData;
       });
-      getCurrentDept().then(res => {
-        const data =  res.data.data;
-        this.currentDept = data;
-        this.isManageUser = data.deptCategory == 1;
-        if (data.deptCategory != 1){
-          //非管理部门
-          let $category = this.findObject(this.option.column, 'category');
-          let dicDataOld = $category.dicData;
-          $category.dicData = [];
-          getCurrentUserKeepCategory().then(res => {
-            let data = res.data.data;
-            if (!data){
-              // this.$message.warning("當前用戶暫時並無持有相關鑰匙/密碼/實物！");
-            }else{
-              let dicDataNew = [];
-              dicDataOld.forEach(item => {
-                item.disabled = true;
-                if (item.hasChildren){
-                  item.children.forEach(child => {
-                    child.disabled = child.isSealed == 1;
-                    if (data.indexOf(child.dictKey) != -1){
-                      dicDataNew.push(child)
-                    }
-                  })
-                }
-              })
-              $category.dicData = dicDataNew;
-            }
-          });
-        }else{
-          this.findObject(this.option.column, 'orgNo').disabled = false;
-          this.findObject(this.option.column, 'orgName').disabled = false;
-        }
 
-      });
+      // this.initCurrentDeptAndKeepCategroy();
     },
     methods: {
+      initCurrentDeptAndKeepCategroy(){
+        getCurrentDept().then(res => {
+          const data =  res.data.data;
+          this.currentDept = data;
+          this.isManageUser = data.deptCategory == 1;
+
+        });
+      },
       turnInChange(value){
         this.findObject(this.option.column, "receiverNo").rules[0].required = !value;
         this.findObject(this.option.column, "receiverName").rules[0].required = !value;
@@ -585,7 +562,7 @@
             .then(() => {
               getDownloadList(this.query).then(res => {
                 let data = res.data.data;
-                data.forEach(item => {item.isTurnIn = item.isTurnIn == 1 ? true : false})
+                data.forEach(item => {item.isTurnIn = item.isTurnIn == 1 ? true : false;item.categoryShow = item.category;})
                 this.downLoadData(data, true)
               });
             })
@@ -629,6 +606,7 @@
             })
           })
           arr.forEach(item => {
+            item.disabled = true;
             data.forEach(it => {
               if (item.id == it.parentId){
                 if (!item.children){
@@ -650,7 +628,6 @@
               })
             }
           });
-          debugger
           this.findObject(this.option.column, 'category').dicData = formDicData;
           this.findObject(this.option.column, 'categoryShow').dicData = formDicData;
           return arr;
@@ -738,36 +715,68 @@
           this.form.number = 1;
           this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
 
-            const data =  this.currentDept;
-            this.form.bankNo = data.bankNo;
-            if (data.deptCategory != 1){
-              //非管理部门
-              this.form.orgNo = data.orgNo;
-              this.form.orgName = data.deptName;
-              this.form.handoverPersonName = this.userInfo.user_name;
-              this.form.handoverPersonNo = this.userInfo.user_ehr;
-              this.form.handoverPersonId = this.userInfo.user_id;
-            }else{
-              this.findObject(this.option.column, 'orgNo').disabled = false;
-              this.findObject(this.option.column, 'orgName').disabled = false;
-            }
+          const data =  this.currentDept;
+          this.form.bankNo = data.bankNo;
+          if (data.deptCategory != 1){
+            //非管理部门
+            this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
+            this.form.handoverPersonName = this.userInfo.user_name;
+            this.form.handoverPersonNo = this.userInfo.user_ehr;
+            this.form.handoverPersonId = this.userInfo.user_id;
+
+            let $category = this.findObject(this.option.column, 'category');
+            let dicDataOld = this.findObject(this.option.column, 'categoryShow').dicData;
+            $category.dicData = [];
+            getCurrentUserKeepCategory().then(res => {
+              let data = res.data.data;
+              if (!data){
+                // this.$message.warning("當前用戶暫時並無持有相關鑰匙/密碼/實物！");
+              }else{
+                let dicDataNew = [];
+                dicDataOld.forEach(item => {
+                  item.disabled = true;
+                  if (item.hasChildren){
+                    item.children.forEach(child => {
+                      child.disabled = child.isSealed == 1;
+                      if (data.indexOf(child.dictKey) != -1){
+                        dicDataNew.push(child)
+                      }
+                    })
+                  }
+                })
+                $category.dicData = dicDataNew;
+                this.userKeepList = dicDataNew;
+              }
+              done();
+            });
+          }else{
+            this.findObject(this.option.column, 'orgNo').disabled = false;
+            this.findObject(this.option.column, 'orgName').disabled = false;
+            done();
+
+          }
+
+          /*// 支行用户自行添加交接，需要获取当前用户持有的列表作为下拉内容
+          this.findObject(this.option.column, 'sealType').dicData = this.userKeepList;*/
 
         }
         if (["edit", "view"].includes(type)) {
           getDetail(this.form.id).then(res => {
             this.form = res.data.data;
+            done();
           });
         }
-        done();
+        /*done();*/
       },
       searchReset() {
         this.query = {};
         this.onLoad(this.page);
       },
       searchChange(params, done) {
-        if (params.category){
+        /*if (params.category){
           params.category = params.category.join();
-        }
+        }*/
         if (params.orgNos){
           params.orgNostr = params.orgNos.join();
           params.orgNos = '';
@@ -811,6 +820,9 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
+        params.status = 1;
+        params.process = 3;
+        params.receiverId = this.userInfo.user_id;
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
@@ -822,6 +834,8 @@
           this.loading = false;
           this.selectionClear();
         });
+
+        this.initCurrentDeptAndKeepCategroy();
       }
     }
   };

src/components/confirmed/confirmed-sealhandover.vue

@@ -81,7 +81,7 @@
       </template>
 
       <template slot="isTurnInForm" slot-scope="{row, index}">
-        <el-checkbox v-model="row.isTurnIn" @change="turnInChange"></el-checkbox>
+        <el-checkbox v-model="row.isTurnIn" :disabled="turnInDisabled" @change="turnInChange"></el-checkbox>
         <el-tag size="small " type="success" plain v-if="row.isTurnIn">上繳至上級單位</el-tag>
         <el-tag size="small " type="danger" plain v-if="!row.isTurnIn">非上繳</el-tag>
       </template>
@@ -94,7 +94,9 @@
     </avue-crud>
 
     <el-dialog :append-to-body="true" :modal-append-to-body="false" :destroy-on-close="true" :fullscreen="true" :visible.sync="keepVisible" title="保管人查詢">
-      <sealhandover-keep></sealhandover-keep>
+      <div v-if="keepVisible">
+        <sealhandover-keep></sealhandover-keep>
+      </div>
     </el-dialog>
 
     <el-dialog title="信息確認"
@@ -123,6 +125,8 @@
     components: {SealhandoverKeep, SealhandoverSure,  SelectDialogUser},
     data() {
       return {
+        turnInDisabled: false,
+
         isManageUser: false,
         userKeepList: [],
         currentDept: [],
@@ -264,23 +268,23 @@
                 if (!value || this.type == 'view') return;
                 if (!this.form.sealNo){
                   getByNoAndType(this.form.sealNo, value, this.form.orgNo).then(res => {
-                  const data = res.data.data;
-                  if (Object.keys(data).length == 0){
-                    this.receiverDisabled = false;
-                  } else {
-                    // 編輯時，若記錄為自己，則跳過
-                    if (this.form.id == data.id){
-                      return;
-                    }
-                    if (data.isTurnIn == 1){
-                      this.$message.warning("此印章已上繳，請重新選擇！");
-                      this.receiverDisabled = true;
-                      this.form.sealNo = null;
-                    }else{
+                    const data = res.data.data;
+                    if (Object.keys(data).length == 0){
                       this.receiverDisabled = false;
+                    } else {
+                      // 編輯時，若記錄為自己，則跳過
+                      if (this.form.id == data.id){
+                        return;
+                      }
+                      if (data.isTurnIn == 1){
+                        this.$message.warning("此印章已上繳，請重新選擇！");
+                        this.receiverDisabled = true;
+                        this.form.sealNo = null;
+                      }else{
+                        this.receiverDisabled = false;
+                      }
                     }
-                  }
-                });
+                  });
                 }
 
                 //支行用户添加交接
@@ -556,7 +560,7 @@
             .then(() => {
               getDownloadList(this.query).then(res => {
                 let data = res.data.data;
-                data.forEach(item => {item.isTurnIn = item.isTurnIn == 1 ? true : false})
+                data.forEach(item => {item.isTurnIn = item.isTurnIn == 1 ? true : false;item.sealTypeSearch = item.sealType;})
                 this.downLoadData(data, true)
               });
             })
@@ -718,6 +722,7 @@
             this.form = res.data.data;
           });
         }*/
+        this.turnInDisabled = type == 'edit'
         done();
       },
       searchReset() {
@@ -772,6 +777,9 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
+        params.status = 1;
+        params.process = 3;
+        params.receiverId = this.userInfo.user_id;
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;

src/components/initiated/init-keypwd.vue

@@ -658,6 +658,7 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
+        params.status = 1;
         params.createUser = this.userInfo.user_id;
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;

src/components/initiated/init-sealhandover.vue

@@ -626,6 +626,7 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
+        params.status = 1;
         params.createUser = this.userInfo.user_id;
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;

src/components/tobeconfirm/tobeconfirm-keypwd.vue

@@ -58,7 +58,7 @@
       </template>
 
       <template slot-scope="{disabled,size}" slot="categorySearch">
-        <avue-input-tree :check-strictly="false" multiple v-model="search.category" placeholder="請選擇內容" type="tree" :dic="typeList" :props="props"></avue-input-tree>
+        <avue-input-tree :check-strictly="false" v-model="search.category" placeholder="請選擇內容" type="tree" :dic="typeList" :props="props"></avue-input-tree>
       </template>
 
       <template slot="isTurnIn" slot-scope="{row}">
@@ -88,7 +88,9 @@
     </avue-crud>
 
     <el-dialog :append-to-body="true" :modal-append-to-body="false" :destroy-on-close="true" :fullscreen="true" :visible.sync="keepVisible" title="保管人查詢">
-      <keypwd-keep></keypwd-keep>
+      <div v-if="keepVisible">
+        <keypwd-keep></keypwd-keep>
+      </div>
     </el-dialog>
 
     <el-dialog title="信息確認"
@@ -105,7 +107,7 @@
   import {mapGetters} from "vuex";
   import {dateFormat} from "@/util/date";
   import SelectDialogUser from "@/components/select-dialog/select-dialog-user";
-  import { getCurrentDept } from "@/api/system/dept";
+  import { getCurrentDept, getChildsDept } from "@/api/system/dept";
   import {getDeptTree, getTree} from "@/api/system/dept";
   import KeypwdKeep from "@/views/bank/keypwd-keep";
   import {getStandardByCode} from "@/api/bank/handoverstandard";
@@ -532,43 +534,18 @@
         })
         this.findObject(this.option.column, "orgNo").dicData = dicData;
       });
-      getCurrentDept().then(res => {
-        const data =  res.data.data;
-        this.currentDept = data;
-        this.isManageUser = data.deptCategory == 1;
-        if (data.deptCategory != 1){
-          //非管理部门
-          let $category = this.findObject(this.option.column, 'category');
-          let dicDataOld = $category.dicData;
-          $category.dicData = [];
-          getCurrentUserKeepCategory().then(res => {
-            let data = res.data.data;
-            if (!data){
-              // this.$message.warning("當前用戶暫時並無持有相關鑰匙/密碼/實物！");
-            }else{
-              let dicDataNew = [];
-              dicDataOld.forEach(item => {
-                item.disabled = true;
-                if (item.hasChildren){
-                  item.children.forEach(child => {
-                    child.disabled = child.isSealed == 1;
-                    if (data.indexOf(child.dictKey) != -1){
-                      dicDataNew.push(child)
-                    }
-                  })
-                }
-              })
-              $category.dicData = dicDataNew;
-            }
-          });
-        }else{
-          this.findObject(this.option.column, 'orgNo').disabled = false;
-          this.findObject(this.option.column, 'orgName').disabled = false;
-        }
 
-      });
+      // this.initCurrentDeptAndKeepCategroy();
     },
     methods: {
+      initCurrentDeptAndKeepCategroy(){
+        getCurrentDept().then(res => {
+          const data =  res.data.data;
+          this.currentDept = data;
+          this.isManageUser = data.deptCategory == 1;
+
+        });
+      },
       turnInChange(value){
         this.findObject(this.option.column, "receiverNo").rules[0].required = !value;
         this.findObject(this.option.column, "receiverName").rules[0].required = !value;
@@ -585,7 +562,7 @@
             .then(() => {
               getDownloadList(this.query).then(res => {
                 let data = res.data.data;
-                data.forEach(item => {item.isTurnIn = item.isTurnIn == 1 ? true : false})
+                data.forEach(item => {item.isTurnIn = item.isTurnIn == 1 ? true : false;item.categoryShow = item.category;})
                 this.downLoadData(data, true)
               });
             })
@@ -629,6 +606,7 @@
             })
           })
           arr.forEach(item => {
+            item.disabled = true;
             data.forEach(it => {
               if (item.id == it.parentId){
                 if (!item.children){
@@ -650,7 +628,6 @@
               })
             }
           });
-          debugger
           this.findObject(this.option.column, 'category').dicData = formDicData;
           this.findObject(this.option.column, 'categoryShow').dicData = formDicData;
           return arr;
@@ -747,27 +724,59 @@
               this.form.handoverPersonName = this.userInfo.user_name;
               this.form.handoverPersonNo = this.userInfo.user_ehr;
               this.form.handoverPersonId = this.userInfo.user_id;
+
+              let $category = this.findObject(this.option.column, 'category');
+              let dicDataOld = this.findObject(this.option.column, 'categoryShow').dicData;
+              $category.dicData = [];
+              getCurrentUserKeepCategory().then(res => {
+                let data = res.data.data;
+                if (!data){
+                  // this.$message.warning("當前用戶暫時並無持有相關鑰匙/密碼/實物！");
+                }else{
+                  let dicDataNew = [];
+                  dicDataOld.forEach(item => {
+                    item.disabled = true;
+                    if (item.hasChildren){
+                      item.children.forEach(child => {
+                        child.disabled = child.isSealed == 1;
+                        if (data.indexOf(child.dictKey) != -1){
+                          dicDataNew.push(child)
+                        }
+                      })
+                    }
+                  })
+                  $category.dicData = dicDataNew;
+                  this.userKeepList = dicDataNew;
+                }
+                done();
+              });
             }else{
               this.findObject(this.option.column, 'orgNo').disabled = false;
               this.findObject(this.option.column, 'orgName').disabled = false;
+              done();
+
             }
 
+          /*// 支行用户自行添加交接，需要获取当前用户持有的列表作为下拉内容
+          this.findObject(this.option.column, 'sealType').dicData = this.userKeepList;*/
+
         }
         if (["edit", "view"].includes(type)) {
           getDetail(this.form.id).then(res => {
             this.form = res.data.data;
+            done();
           });
         }
-        done();
+        /*done();*/
       },
       searchReset() {
         this.query = {};
         this.onLoad(this.page);
       },
       searchChange(params, done) {
-        if (params.category){
+        /*if (params.category){
           params.category = params.category.join();
-        }
+        }*/
         if (params.orgNos){
           params.orgNostr = params.orgNos.join();
           params.orgNos = '';
@@ -811,6 +820,9 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
+        params.status = 1;
+        params.process = 2;
+        params.receiverId = this.userInfo.user_id;
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
@@ -822,6 +834,8 @@
           this.loading = false;
           this.selectionClear();
         });
+
+        this.initCurrentDeptAndKeepCategroy();
       }
     }
   };

src/components/tobeconfirm/tobeconfirm-sealhandover.vue

@@ -81,7 +81,7 @@
       </template>
 
       <template slot="isTurnInForm" slot-scope="{row, index}">
-        <el-checkbox v-model="row.isTurnIn" @change="turnInChange"></el-checkbox>
+        <el-checkbox v-model="row.isTurnIn" :disabled="turnInDisabled" @change="turnInChange"></el-checkbox>
         <el-tag size="small " type="success" plain v-if="row.isTurnIn">上繳至上級單位</el-tag>
         <el-tag size="small " type="danger" plain v-if="!row.isTurnIn">非上繳</el-tag>
       </template>
@@ -94,7 +94,9 @@
     </avue-crud>
 
     <el-dialog :append-to-body="true" :modal-append-to-body="false" :destroy-on-close="true" :fullscreen="true" :visible.sync="keepVisible" title="保管人查詢">
-      <sealhandover-keep></sealhandover-keep>
+      <div v-if="keepVisible">
+        <sealhandover-keep></sealhandover-keep>
+      </div>
     </el-dialog>
 
     <el-dialog title="信息確認"
@@ -123,6 +125,8 @@
     components: {SealhandoverKeep, SealhandoverSure,  SelectDialogUser},
     data() {
       return {
+        turnInDisabled: false,
+
         isManageUser: false,
         userKeepList: [],
         currentDept: [],
@@ -556,7 +560,7 @@
             .then(() => {
               getDownloadList(this.query).then(res => {
                 let data = res.data.data;
-                data.forEach(item => {item.isTurnIn = item.isTurnIn == 1 ? true : false})
+                data.forEach(item => {item.isTurnIn = item.isTurnIn == 1 ? true : false;item.sealTypeSearch = item.sealType;})
                 this.downLoadData(data, true)
               });
             })
@@ -718,6 +722,7 @@
             this.form = res.data.data;
           });
         }*/
+        this.turnInDisabled = type == 'edit'
         done();
       },
       searchReset() {
@@ -772,6 +777,9 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
+        params.status = 1;
+        params.process = 2;
+        params.receiverId = this.userInfo.user_id;
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;

src/page/index/top/index.vue

@@ -25,6 +25,8 @@
       <div style="font-size: small;font-weight: bold;">角色：</div>
       <div style="font-size: small;margin-right: 10px;">{{form.roleName}}</div>
       <div style="font-size: small;font-weight: bold;">賬號：</div>
+      <div style="font-size: small;margin-right: 10px;">{{form.account}}</div>
+      <div style="font-size: small;font-weight: bold;">用戶：</div>
       <div style="font-size: small;margin-right: 10px;">{{form.name}}</div>
       <el-tooltip v-if="showColor"
                   effect="dark"
@@ -141,6 +143,7 @@
         this.form = {
           id: user.id,
           avatar: user.avatar,
+          account: user.account,
           name: user.name,
           deptName: user.deptName,
           roleName: user.roleName,

src/store/modules/common.js

@@ -21,9 +21,9 @@ const common = {
     showSearch: true,
     showLock: true,
     showFullScren: true,
-    showTheme: true,
+    showTheme: false,
     showMenu: true,
-    showColor: true,
+    showColor: false,
     colorName: getStore({name: 'colorName'}) || '#409EFF',
     themeName: getStore({name: 'themeName'}) || 'theme-default',
     lockPasswd: getStore({name: 'lockPasswd'}) || '',

src/store/modules/user.js

@@ -208,7 +208,6 @@ const user = {
       setStore({name: 'token', content: state.token})
     },
     SET_EXPIRESIN: (expiresIn) => {
-      debugger
       state.expiresIn = expiresIn;
       if (expiresIn) setStore({name: 'expiresIn', content: state.expiresIn})
     },

src/views/bank/keypwd.vue

@@ -58,7 +58,7 @@
       </template>
 
       <template slot-scope="{disabled,size}" slot="categorySearch">
-        <avue-input-tree :check-strictly="false" multiple v-model="search.category" placeholder="請選擇內容" type="tree" :dic="typeList" :props="props"></avue-input-tree>
+        <avue-input-tree :check-strictly="false" v-model="search.category" placeholder="請選擇內容" type="tree" :dic="typeList" :props="props"></avue-input-tree>
       </template>
 
       <template slot="isTurnIn" slot-scope="{row}">
@@ -542,35 +542,7 @@
           const data =  res.data.data;
           this.currentDept = data;
           this.isManageUser = data.deptCategory == 1;
-          if (data.deptCategory != 1){
-            //非管理部门
-            let $category = this.findObject(this.option.column, 'category');
-            let dicDataOld = $category.dicData;
-            $category.dicData = [];
-            getCurrentUserKeepCategory().then(res => {
-              let data = res.data.data;
-              if (!data){
-                // this.$message.warning("當前用戶暫時並無持有相關鑰匙/密碼/實物！");
-              }else{
-                let dicDataNew = [];
-                dicDataOld.forEach(item => {
-                  item.disabled = true;
-                  if (item.hasChildren){
-                    item.children.forEach(child => {
-                      child.disabled = child.isSealed == 1;
-                      if (data.indexOf(child.dictKey) != -1){
-                        dicDataNew.push(child)
-                      }
-                    })
-                  }
-                })
-                $category.dicData = dicDataNew;
-              }
-            });
-          }else{
-            this.findObject(this.option.column, 'orgNo').disabled = false;
-            this.findObject(this.option.column, 'orgName').disabled = false;
-          }
+
         });
       },
       turnInChange(value){
@@ -589,7 +561,7 @@
             .then(() => {
               getDownloadList(this.query).then(res => {
                 let data = res.data.data;
-                data.forEach(item => {item.isTurnIn = item.isTurnIn == 1 ? true : false})
+                data.forEach(item => {item.isTurnIn = item.isTurnIn == 1 ? true : false;item.categoryShow = item.category;})
                 this.downLoadData(data, true)
               });
             })
@@ -632,6 +604,7 @@
             })
           })
           arr.forEach(item => {
+            item.disabled = true;
             data.forEach(it => {
               if (item.id == it.parentId){
                 if (!item.children){
@@ -749,27 +722,59 @@
               this.form.handoverPersonName = this.userInfo.user_name;
               this.form.handoverPersonNo = this.userInfo.user_ehr;
               this.form.handoverPersonId = this.userInfo.user_id;
+
+              let $category = this.findObject(this.option.column, 'category');
+              let dicDataOld = this.findObject(this.option.column, 'categoryShow').dicData;
+              $category.dicData = [];
+              getCurrentUserKeepCategory().then(res => {
+                let data = res.data.data;
+                if (!data){
+                  // this.$message.warning("當前用戶暫時並無持有相關鑰匙/密碼/實物！");
+                }else{
+                  let dicDataNew = [];
+                  dicDataOld.forEach(item => {
+                    item.disabled = true;
+                    if (item.hasChildren){
+                      item.children.forEach(child => {
+                        child.disabled = child.isSealed == 1;
+                        if (data.indexOf(child.dictKey) != -1 && data.indexOf(child.dictKey + "**") != -1){
+                          dicDataNew.push(child)
+                        }
+                      })
+                    }
+                  })
+                  $category.dicData = dicDataNew;
+                  this.userKeepList = dicDataNew;
+                }
+                done();
+              });
             }else{
               this.findObject(this.option.column, 'orgNo').disabled = false;
               this.findObject(this.option.column, 'orgName').disabled = false;
+              done();
+
             }
 
+          /*// 支行用户自行添加交接，需要获取当前用户持有的列表作为下拉内容
+          this.findObject(this.option.column, 'sealType').dicData = this.userKeepList;*/
+
         }
         if (["edit", "view"].includes(type)) {
           getDetail(this.form.id).then(res => {
             this.form = res.data.data;
+            done();
           });
         }
-        done();
+        /*done();*/
       },
       searchReset() {
         this.query = {};
         this.onLoad(this.page);
       },
       searchChange(params, done) {
-        if (params.category){
+        /*if (params.category){
           params.category = params.category.join();
-        }
+        }*/
         if (params.orgNos){
           params.orgNostr = params.orgNos.join();
           params.orgNos = '';

src/views/bank/message.vue

@@ -280,6 +280,13 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "發佈時間",
+              prop: "createTime",
+              addDisplay: false,
+              editDisplay: false,
+
+            }
           ]
         },
         data: []

src/views/bank/returns.vue

@@ -176,7 +176,7 @@
               label: "業務類型",
               prop: "isPublic",
               type: "select",
-              hide: true,
+              // hide: true,
               viewDisplay: false,
               dataType: "string",
               dicUrl: `/api/blade-system/dict/dictionary?code=business_type`,

src/views/bank/sealhandover.vue

@@ -559,7 +559,7 @@
             .then(() => {
               getDownloadList(this.query).then(res => {
                 let data = res.data.data;
-                data.forEach(item => {item.isTurnIn = item.isTurnIn == 1 ? true : false})
+                data.forEach(item => {item.isTurnIn = item.isTurnIn == 1 ? true : false;item.sealTypeSearch = item.sealType;})
                 this.downLoadData(data, true)
               });
             })

src/views/bank/user-log-view.vue

@@ -1033,7 +1033,6 @@
         })
       },
       initForm(dictObj) {
-        debugger
         const newData = JSON.parse(!this.form.newData ? "{}" : this.form.newData);
         const oldData = JSON.parse(!this.form.oldData ? "{}" : this.form.oldData);
         const tableName = this.form.tableName;
@@ -1066,7 +1065,6 @@
         this[tableName + 'Group'][0].column = arr;
         delete this.option.group;
         this.option.group = this[tableName + 'Group'];
-        debugger
         if (this.form.operationType == 'del'){
           Object.assign(this.form, oldData)
         }else{

src/views/desk/confirmed.vue

@@ -1,18 +1,36 @@
 <template>
   <basic-container>
-    <el-tabs type="border-card">
-      <el-tab-pane v-if="permission.postchange_view" label="網點出納主管及專管員崗位變更記錄表">
-        <confirmed-postchange></confirmed-postchange>
+    <el-tabs type="border-card" @tab-click="handleClick">
+      <el-tab-pane v-if="permission.keypwd_view" label="網點鎖匙/密碼/實物交接登記表" name="keypwd">
+        <div v-if="activeTab == 'keypwd'">
+          <confirmed-keypwd></confirmed-keypwd>
+        </div>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.goodsuse_view" label="網點各項憑證/實物使用及出入庫">
-        <tobeconfirm-goodsuse></tobeconfirm-goodsuse>
-        <confirmed-goodsuse></confirmed-goodsuse>
+      <el-tab-pane v-if="permission.sealhandover_view" label="業務印章交接登記表" name="sealhandover">
+        <div v-if="activeTab == 'sealhandover'">
+          <confirmed-sealhandover></confirmed-sealhandover>
+        </div>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.returns_view" label="新開戶退件登記表">
-        <confirmed-returns></confirmed-returns>
+
+      <el-tab-pane v-if="permission.postchange_view" label="網點出納主管及專管員崗位變更記錄表" name="postchange">
+        <div v-if="activeTab == 'postchange'">
+          <confirmed-postchange></confirmed-postchange>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane v-if="permission.goodsuse_view" label="網點各項憑證/實物使用及出入庫" name="goodsuse">
+        <div v-if="activeTab == 'goodsuse'">
+          <confirmed-goodsuse></confirmed-goodsuse>
+        </div>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.cardswallow_view" label="自助設備吞卡資料">
-        <confirmed-cardswallow></confirmed-cardswallow>
+      <el-tab-pane v-if="permission.returns_view" label="新開戶退件登記表" name="returns">
+        <div v-if="activeTab == 'returns'">
+          <confirmed-returns></confirmed-returns>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane v-if="permission.cardswallow_view" label="自助設備吞卡資料" name="cardswallow">
+        <div v-if="activeTab == 'cardswallow'">
+          <confirmed-cardswallow></confirmed-cardswallow>
+        </div>
       </el-tab-pane>
     </el-tabs>
   </basic-container>
@@ -24,12 +42,16 @@
   import ConfirmedGoodsuse from "@/components/confirmed/confirmed-goodsuse";
   import ConfirmedReturns from "../../components/confirmed/confirmed-returns";
   import ConfirmedCardswallow from "../../components/confirmed/confirmed-cardswallow";
+  import ConfirmedKeypwd from "../../components/confirmed/confirmed-keypwd";
+  import ConfirmedSealhandover from "../../components/confirmed/confirmed-sealhandover";
 
   export default {
-    components: {ConfirmedCardswallow, ConfirmedReturns, ConfirmedGoodsuse, ConfirmedPostchange},
+    components: {
+      ConfirmedSealhandover,
+      ConfirmedKeypwd, ConfirmedCardswallow, ConfirmedReturns, ConfirmedGoodsuse, ConfirmedPostchange},
     data() {
       return {
-
+        activeTab: "keypwd",
         data: []
       };
     },
@@ -51,8 +73,15 @@
         return ids.join(",");
       }
     },
+    mounted() {
+      this.$nextTick(() => {
+        document.getElementById("tab-keypwd").click();
+      })
+    },
     methods: {
-
+      handleClick(tab, event) {
+        this.activeTab = tab.name;
+      }
     }
   };
 </script>

src/views/desk/initiated.vue

@@ -1,37 +1,57 @@
 <template>
   <basic-container>
-    <el-tabs type="border-card">
-      <el-tab-pane v-if="permission.keypwd_view" label="網點鎖匙/密碼/實物交接登記表">
-        <init-keypwd></init-keypwd>
+    <el-tabs type="border-card" @tab-click="handleClick">
+      <el-tab-pane v-if="permission.keypwd_view" label="網點鎖匙/密碼/實物交接登記表" name="keypwd">
+        <div v-if="activeTab == 'keypwd'">
+          <init-keypwd></init-keypwd>
+        </div>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.sealhandover_view" label="業務印章交接登記表">
-        <init-sealhandover></init-sealhandover>
+      <el-tab-pane v-if="permission.sealhandover_view" label="業務印章交接登記表" name="sealhandover">
+        <div v-if="activeTab == 'sealhandover'">
+          <init-sealhandover></init-sealhandover>
+        </div>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.postchange_view" label="網點出納主管及專管員崗位變更記錄表">
-        <init-postchange></init-postchange>
+      <el-tab-pane v-if="permission.postchange_view" label="網點出納主管及專管員崗位變更記錄表" name="postchange">
+        <div v-if="activeTab == 'postchange'">
+         <init-postchange></init-postchange>
+        </div>
       </el-tab-pane>
 
-      <el-tab-pane v-if="permission.checkwarehouse_view" label="查庫流水賬記錄表">
-        <init-checkwarehouse></init-checkwarehouse>
+      <el-tab-pane v-if="permission.checkwarehouse_view" label="查庫流水賬記錄表" name="checkwarehouse">
+        <div v-if="activeTab == 'checkwarehouse'">
+          <init-checkwarehouse></init-checkwarehouse>
+        </div>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.checklist_view" label="每日每週每月核對記錄表">
-        <init-checklist></init-checklist>
+      <el-tab-pane v-if="permission.checklist_view" label="每日每週每月核對記錄表" name="checklist">
+        <div v-if="activeTab == 'checklist'">
+          <init-checklist></init-checklist>
+        </div>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.tellertrunk_view" label="櫃員尾箱檢查流水賬記錄表">
-        <init-tellertrunk></init-tellertrunk>
+      <el-tab-pane v-if="permission.tellertrunk_view" label="櫃員尾箱檢查流水賬記錄表" name="tellertrunk">
+        <div v-if="activeTab == 'tellertrunk'">
+          <init-tellertrunk></init-tellertrunk>
+        </div>
       </el-tab-pane>
 
-      <el-tab-pane v-if="permission.goodsuse_view" label="網點各項憑證/實物使用及出入庫">
-        <init-goodsuse></init-goodsuse>
+      <el-tab-pane v-if="permission.goodsuse_view" label="網點各項憑證/實物使用及出入庫" name="goodsuse">
+        <div v-if="activeTab == 'goodsuse'">
+          <init-goodsuse></init-goodsuse>
+        </div>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.returns_view" label="新開戶退件登記表">
-        <init-returns></init-returns>
+      <el-tab-pane v-if="permission.returns_view" label="新開戶退件登記表" name="returns">
+        <div v-if="activeTab == 'returns'">
+          <init-returns></init-returns>
+        </div>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.cardswallow_view" label="自助設備吞卡資料">
-        <init-cardswallow></init-cardswallow>
+      <el-tab-pane v-if="permission.cardswallow_view" label="自助設備吞卡資料" name="cardswallow">
+        <div v-if="activeTab == 'cardswallow'">
+          <init-cardswallow></init-cardswallow>
+        </div>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.message_view" label="信息發佈">
-        <init-message></init-message>
+      <el-tab-pane v-if="permission.message_view" label="信息發佈" name="message">
+        <div v-if="activeTab == 'message'">
+          <init-message></init-message>
+        </div>
       </el-tab-pane>
     </el-tabs>
   </basic-container>
@@ -58,7 +78,7 @@
       InitSealhandover, InitKeypwd, InitMessage, InitCardswallow, InitReturns, InitGoodsuse, InitPostchange},
     data() {
       return {
-
+        activeTab: "keypwd",
         data: []
       };
     },
@@ -72,8 +92,15 @@
         return ids.join(",");
       }
     },
+    mounted() {
+      this.$nextTick(() => {
+        document.getElementById("tab-keypwd").click();
+      })
+    },
     methods: {
-
+      handleClick(tab, event) {
+        this.activeTab = tab.name;
+      }
     }
   };
 </script>

src/views/desk/tobeconfirm.vue

@@ -1,24 +1,36 @@
 <template>
   <basic-container>
-    <el-tabs type="border-card">
-      <el-tab-pane v-if="permission.keypwd_view" label="網點鎖匙/密碼/實物交接登記表">
-        <tobeconfirm-keypwd></tobeconfirm-keypwd>
+    <el-tabs type="border-card" @tab-click="handleClick">
+      <el-tab-pane v-if="permission.keypwd_view" label="網點鎖匙/密碼/實物交接登記表" name="keypwd">
+        <div v-if="activeTab == 'keypwd'">
+          <tobeconfirm-keypwd></tobeconfirm-keypwd>
+        </div>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.sealhandover_view" label="業務印章交接登記表">
-        <tobeconfirm-sealhandover></tobeconfirm-sealhandover>
+      <el-tab-pane v-if="permission.sealhandover_view" label="業務印章交接登記表" name="sealhandover">
+        <div v-if="activeTab == 'sealhandover'">
+          <tobeconfirm-sealhandover></tobeconfirm-sealhandover>
+        </div>
       </el-tab-pane>
 
-      <el-tab-pane v-if="permission.postchange_view" label="網點出納主管及專管員崗位變更記錄表">
-        <tobeconfirm-postchange></tobeconfirm-postchange>
+      <el-tab-pane v-if="permission.postchange_view" label="網點出納主管及專管員崗位變更記錄表" name="postchange">
+        <div v-if="activeTab == 'postchange'">
+          <tobeconfirm-postchange></tobeconfirm-postchange>
+        </div>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.goodsuse_view" label="網點各項憑證/實物使用及出入庫">
-        <tobeconfirm-goodsuse></tobeconfirm-goodsuse>
+      <el-tab-pane v-if="permission.goodsuse_view" label="網點各項憑證/實物使用及出入庫" name="goodsuse">
+        <div v-if="activeTab == 'goodsuse'">
+          <tobeconfirm-goodsuse></tobeconfirm-goodsuse>
+        </div>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.returns_view" label="新開戶退件登記表">
-        <tobeconfirm-returns></tobeconfirm-returns>
+      <el-tab-pane v-if="permission.returns_view" label="新開戶退件登記表" name="returns">
+        <div v-if="activeTab == 'returns'">
+          <tobeconfirm-returns></tobeconfirm-returns>
+        </div>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.cardswallow_view" label="自助設備吞卡資料">
-        <tobeconfirm-cardswallow></tobeconfirm-cardswallow>
+      <el-tab-pane v-if="permission.cardswallow_view" label="自助設備吞卡資料" name="cardswallow">
+        <div v-if="activeTab == 'cardswallow'">
+          <tobeconfirm-cardswallow></tobeconfirm-cardswallow>
+        </div>
       </el-tab-pane>
     </el-tabs>
   </basic-container>
@@ -40,7 +52,7 @@
       TobeconfirmCardswallow, TobeconfirmReturns, TobeconfirmGoodsuse, TobeconfirmPostchange},
     data() {
       return {
-
+        activeTab: "keypwd",
         data: []
       };
     },
@@ -62,8 +74,17 @@
         return ids.join(",");
       }
     },
-    methods: {
+    mounted() {
+      // this.activeName = 'keypwd'
 
+      this.$nextTick(() => {
+        document.getElementById("tab-keypwd").click();
+      })
+    },
+    methods: {
+      handleClick(tab, event) {
+        this.activeTab = tab.name;
+      }
     }
   };
 </script>

src/views/desk/toberelease.vue

@@ -1,8 +1,10 @@
 <template>
   <basic-container>
-    <el-tabs type="border-card">
-      <el-tab-pane v-if="permission.returns_view" label="新開戶退件登記表">
-        <release-returns></release-returns>
+    <el-tabs type="border-card" @tab-click="handleClick">
+      <el-tab-pane v-if="permission.returns_view" label="新開戶退件登記表" name="returns">
+        <div v-if="activeTab == 'returns'">
+          <release-returns></release-returns>
+        </div>
       </el-tab-pane>
      <!-- <el-tab-pane v-if="permission.cardswallow_view" label="自助設備吞卡資料">
         <init-cardswallow></init-cardswallow>
@@ -21,7 +23,7 @@
     components: {ReleaseCardswallow, ReleaseReturns},
     data() {
       return {
-
+        activeTab: "returns",
         data: []
       };
     },
@@ -43,8 +45,15 @@
         return ids.join(",");
       }
     },
+    mounted() {
+      this.$nextTick(() => {
+        document.getElementById("tab-returns").click();
+      })
+    },
     methods: {
-
+      handleClick(tab, event) {
+        this.activeTab = tab.name;
+      }
     }
   };
 </script>

src/views/wel/index.vue

@@ -209,10 +209,10 @@
             },*/
             {
               click: (item) => {
-                this.$router.push({path: "/bank/checklist"})
+                this.$router.push({path: "/desk/tobeconfirm"})
               },
               count: '0',
-              title: '異常報表',
+              title: '待處理',
               icon: 'el-icon-setting',
               color: '#f39c12'
             },{
@@ -386,6 +386,7 @@
       getToBeConfirmed().then(res => {
         const tobeConfirmedCount = res.data.data;
         this.optionFront.data[1].count = tobeConfirmedCount;
+        this.optionBackgr.data[0].count = tobeConfirmedCount;
       });
       getMyConfirmation().then(res => {
         const confirmedCount = res.data.data;
@@ -422,7 +423,7 @@
       onLoadDay(page, params = {}){
         params.cycle = "day";
         params.orgNo = this.selectOrgNo;
-        getReport(Object.assign(params, this.pageDay)).then(res => {
+        getReport(Object.assign(params, page)).then(res => {
           const data = res.data.data;
           this.dataDay = data;
           this.loading = false;
@@ -451,7 +452,7 @@
       onLoadWeek(page, params = {}){
         params.cycle = "week";
         params.orgNo = this.selectOrgNo;
-        getReport(Object.assign(params, this.pageWeek)).then(res => {
+        getReport(Object.assign(params, page)).then(res => {
           const data = res.data.data;
           this.dataWeek = data;
           this.loading = false;
@@ -480,7 +481,7 @@
       onLoadMonth(page, params = {}){
         params.cycle = "month";
         params.orgNo = this.selectOrgNo;
-        getReport(Object.assign(params, this.pageMonth)).then(res => {
+        getReport(Object.assign(params, page)).then(res => {
           const data = res.data.data;
           this.dataMonth = data;
           this.loading = false;