机构名称

src/components/common/cardswallow-comfirm.vue

@@ -66,6 +66,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "序號",
               prop: "serialNo",

src/components/common/cardswallow-issue.vue

@@ -26,6 +26,16 @@
               prop: "orgNo",
               disabled: true,
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "序號",
               prop: "serialNo",

src/components/common/goodsuse-sure.vue

@@ -35,6 +35,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "日期",
               prop: "date",

src/components/common/returns-approve.vue

@@ -66,6 +66,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "序號",
               prop: "serialNo",

src/components/common/returns-comfire.vue

@@ -85,6 +85,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             /* {
                label: "序號",
                prop: "serialNo",

src/components/common/returns-issue.vue

@@ -66,6 +66,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "序號",
               prop: "serialNo",

src/components/confirmed/confirmed-cardswallow.vue

@@ -188,6 +188,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",

src/components/confirmed/confirmed-goodsuse.vue

@@ -169,6 +169,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "日期",
               prop: "date",
@@ -713,6 +723,7 @@
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
             this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
           });
 
           /*getSetting().then((res) => {

src/components/confirmed/confirmed-postchange.vue

@@ -410,6 +410,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",
@@ -572,7 +582,16 @@
                 trigger: "blur"
               }]
             },
-
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "申請日期",
               prop: "applyDate",

src/components/confirmed/confirmed-returns.vue

@@ -215,6 +215,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",

src/components/initiated/init-cardswallow.vue

@@ -186,6 +186,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",

src/components/initiated/init-checklist.vue

@@ -156,6 +156,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",
@@ -658,6 +668,7 @@
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
             this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
           });
         }
         if (["edit", "view"].includes(type)) {

src/components/initiated/init-checkwarehouse.vue

@@ -179,6 +179,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",
@@ -582,6 +592,7 @@
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
             this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
           });
         }
 

src/components/initiated/init-goodsuse.vue

@@ -168,6 +168,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "日期",
               prop: "date",
@@ -712,6 +722,7 @@
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
             this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
           });
 
           /*getSetting().then((res) => {

src/components/initiated/init-keypwd.vue

@@ -161,6 +161,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "分類種類",
               prop: "category",
@@ -581,6 +591,7 @@
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
             this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
           });
         }
         if (["edit", "view"].includes(type)) {

src/components/initiated/init-postchange.vue

@@ -410,6 +410,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",
@@ -572,7 +582,16 @@
                 trigger: "blur"
               }]
             },
-
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "申請日期",
               prop: "applyDate",

src/components/initiated/init-returns.vue

@@ -215,6 +215,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",

src/components/initiated/init-sealhandover.vue

@@ -163,6 +163,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "印章類型",
               prop: "sealTypeSearch",
@@ -538,6 +548,7 @@
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
             this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
           });
         }
 

src/components/initiated/init-tellertrunk.vue

@@ -150,6 +150,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",
@@ -593,6 +603,7 @@
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
             this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
           });
         }
 

src/components/release/release-cardswallow.vue

@@ -90,6 +90,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "序號",
               prop: "serialNo",

src/components/release/release-returns.vue

@@ -215,6 +215,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",

src/components/tobeconfirm/tobeconfirm-cardswallow.vue

@@ -188,6 +188,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",

src/components/tobeconfirm/tobeconfirm-goodsuse.vue

@@ -169,6 +169,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "日期",
               prop: "date",
@@ -712,6 +722,7 @@
           getCurrentDept().then(res => {
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
+            this.form.orgName = data.deptName;
             this.form.orgNo = data.orgNo;
           });
 

src/components/tobeconfirm/tobeconfirm-postchange.vue

@@ -410,6 +410,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",
@@ -572,7 +582,16 @@
                 trigger: "blur"
               }]
             },
-
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "申請日期",
               prop: "applyDate",

src/components/tobeconfirm/tobeconfirm-returns.vue

@@ -215,6 +215,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",

src/page/index/index.vue

@@ -129,8 +129,6 @@
           let expiresIn = localStorage.getItem('saber-expires-in');
           // 因为不刷新token，也还有对应的有效时间，并不是立即失效的，所以这里把失效时长减半，这样就对应上了
           let flag = new Date(tokenDatetime + (expiresIn * 1000 / 2)) > new Date().getTime();
-          console.log("datetime-" + tokenDatetime)
-          console.log("flag-" + flag)
           if (flag){
             this.refreshLock = true;
             this.$store

src/router/axios.js

@@ -93,11 +93,9 @@ axios.interceptors.response.use(res => {
     if (res.config.params && res.config.params.refresh_token){
     }else{
       localStorage.setItem('saber-token-datetime', new Date().getTime())
-      console.log('resettoken1')
     }
   }else if (res.config.url == '/api/blade-desk/notice/myNoticePage'){
   }else{
-    console.log('resettoken2')
     localStorage.setItem('saber-token-datetime', new Date().getTime())
   }
 

src/views/bank/cardswallow.vue

@@ -187,6 +187,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",

src/views/bank/checklist.vue

@@ -155,6 +155,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",
@@ -659,6 +669,7 @@
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
             this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
           });
         }
         if (["edit", "view"].includes(type)) {

src/views/bank/checkwarehouse.vue

@@ -178,6 +178,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",
@@ -587,6 +597,7 @@
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
             this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
           });
         }
 

src/views/bank/goodsuse-balance.vue

@@ -94,6 +94,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "日期",
               prop: "date",
@@ -284,6 +294,7 @@
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
             this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
           });
         }
         if (["edit", "view"].includes(type)) {

src/views/bank/goodsuse.vue

@@ -170,6 +170,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "日期",
               prop: "date",
@@ -714,6 +724,7 @@
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
             this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
           });
 
           /*getSetting().then((res) => {

src/views/bank/keypwd-keep.vue

@@ -112,7 +112,16 @@
                 trigger: "blur"
               }]
             },
-
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",
@@ -458,6 +467,7 @@
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
             this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
           });
         }
         if (["edit", "view"].includes(type)) {

src/views/bank/keypwd.vue

@@ -160,6 +160,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "分類種類",
               prop: "category",
@@ -580,7 +590,8 @@
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
             this.form.orgNo = data.orgNo;
-            this.form.orgName = data.orgName;
+            this.form.orgName = data.deptName;
+            this.form.orgName = data.deptName;
           });
         }
         if (["edit", "view"].includes(type)) {

src/views/bank/postchange.vue

@@ -411,6 +411,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",
@@ -573,7 +583,16 @@
                 trigger: "blur"
               }]
             },
-
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "申請日期",
               prop: "applyDate",

src/views/bank/returns.vue

@@ -214,6 +214,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",

src/views/bank/sealhandover-keep.vue

@@ -99,6 +99,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "印章類型",
               prop: "sealType",
@@ -395,6 +405,7 @@
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
             this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
           });
         }
 

src/views/bank/sealhandover.vue

@@ -162,6 +162,26 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "印章類型",
               prop: "sealTypeSearch",
@@ -537,6 +557,7 @@
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
             this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
           });
         }
 

src/views/bank/tellertrunk.vue

@@ -149,6 +149,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "區域/支行",
               prop: "orgNos",
@@ -594,6 +604,7 @@
             const data =  res.data.data;
             this.form.bankNo = data.bankNo;
             this.form.orgNo = data.orgNo;
+            this.form.orgName = data.deptName;
           });
         }
 

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

@@ -46,6 +46,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "表名",
               prop: "tableName",
@@ -287,6 +297,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "申請日期",
               prop: "applyDate",
@@ -864,6 +884,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "發送日期",
               prop: "sendDate",

src/views/report/abnormal-reportlist.vue

@@ -112,6 +112,16 @@ export default {
               trigger: "blur"
             }]
           },
+          {
+            label: "機構名称",
+            prop: "orgName",
+            disabled: true,
+            rules: [{
+              required: true,
+              message: "請輸入機構號",
+              trigger: "blur"
+            }]
+          },
           {
             label: "区域/支行",
             prop: "orgNos",

src/views/report/reportlist.vue

@@ -100,6 +100,16 @@ export default {
             prop: "orgNo",
             disabled: true,
           },
+          {
+            label: "機構名称",
+            prop: "orgName",
+            disabled: true,
+            rules: [{
+              required: true,
+              message: "請輸入機構號",
+              trigger: "blur"
+            }]
+          },
           {
             label: "支行",
             prop: "deptName",

src/views/report/userlog.vue

@@ -100,6 +100,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "表名",
               prop: "tableName",

src/views/system/dept.vue

@@ -148,6 +148,16 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "機構名称",
+              prop: "orgName",
+              disabled: true,
+              rules: [{
+                required: true,
+                message: "請輸入機構號",
+                trigger: "blur"
+              }]
+            },
             {
               label: "上級機構",
               prop: "parentId",