```快速構建調整

src/api/bank/autodata.js

@@ -56,6 +56,14 @@ export const approveYes = (row) => {
   })
 }
 
+export const approveReject = (row) => {
+  return request({
+    url: '/api/bank/autodata/approveReject',
+    method: 'post',
+    data: row
+  })
+}
+
 export const approveNo = (row) => {
   return request({
     url: '/api/bank/autodata/approveNo',

src/components/common/cardswallow-comfirm.vue

@@ -110,6 +110,8 @@
             {
               label: "發送支行機構號",
               prop: "sendOrgNo",
+              hide: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入發送支行機構號",

src/components/common/keypwd-sure.vue

@@ -36,6 +36,7 @@
               prop: "bankNo",
               span: 24,
               hide: true,
+              display: false,
               disabled: true,
               rules: [{
                 required: true,
@@ -47,6 +48,7 @@
               label: "機構號",
               prop: "orgNo",
               hide: true,
+              display: false,
               disabled: true,
               rules: [{
                 required: true,
@@ -57,6 +59,7 @@
             {
               label: "機構名稱",
               prop: "orgName",
+              span: 24,
               disabled: true,
               rules: [{
                 required: true,

src/components/confirmed/confirmed-cardswallow.vue

@@ -172,7 +172,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              display: false,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -269,6 +270,8 @@
             {
               label: "發送支行機構號",
               prop: "sendOrgNo",
+              hide: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入發送支行機構號",

src/components/confirmed/confirmed-goodsuse.vue

@@ -111,6 +111,8 @@
     components: {GoodsuseBalance, GoodsuseSure, SelectDialogUser, FlowSettings},
     data() {
       return {
+        isManageUser: false,
+
         balanceVisible: false,
         transferVisible: false,
         delBatchBtn: true,
@@ -155,7 +157,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              search: false,
+              display: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -168,6 +171,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -178,6 +182,7 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              span: 24,
               rules: [{
                 required: true,
                 message: "請輸入機構號",

src/components/confirmed/confirmed-keypwd.vue

@@ -20,14 +20,14 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger"
+        <!--<el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
                    :disabled="delBatchBtn"
                    plain
                    v-if="permission.keypwd_delete"
                    @click="handleDelete">刪 除
-        </el-button>
+        </el-button>-->
         <el-button type="success"
                    size="small"
                    icon="el-icon-search"
@@ -181,7 +181,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              display: false,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -195,6 +196,7 @@
               type: "select",
               hide: true,
               disabled: true,
+              display: true,
               filterable: true,
               dicData: [],
               props: {
@@ -203,7 +205,7 @@
               },
               change: ({value, column}) => {
                 if (!value) return;
-                let dicData = this.findObject(this.option.column, 'orgNo').dicData;
+                let dicData = column.dicData;
                 dicData.forEach(item => {
                   if (item.orgNo == value){
                     this.form.orgName = item.deptName;
@@ -220,6 +222,22 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              type: "select",
+              filterable: true,
+              dicData: [],
+              props: {
+                label: "deptName",
+                value: "deptName"
+              },
+              change: ({value, column}) => {
+                if (!value) return;
+                let dicData = column.dicData;
+                dicData.forEach(item => {
+                  if (item.deptName == value){
+                    this.form.orgNo = item.orgNo;
+                  }
+                })
+              },
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -357,7 +375,7 @@
                 trigger: "blur"
               }]
             },*/
-           /* {
+            /*{
               label: "數量",
               prop: "number",
               type: "number",
@@ -543,6 +561,7 @@
           }
         })
         this.findObject(this.option.column, "orgNo").dicData = dicData;
+        this.findObject(this.option.column, "orgName").dicData = dicData;
       });
 
       // this.initCurrentDeptAndKeepCategroy();
@@ -554,6 +573,10 @@
           this.currentDept = data;
           this.isManageUser = data.deptCategory == 1;
 
+          //控制字段顯隱
+          this.findObject(this.option.column, "bankNo").display = false;
+          this.findObject(this.option.column, "orgNo").display = this.isManageUser;
+          this.findObject(this.option.column, "orgName").span = this.isManageUser ? 12 : 24;
         });
       },
       turnInChange(value){

src/components/confirmed/confirmed-postchange.vue

@@ -355,6 +355,8 @@
     components: {SelectDialogUser, FlowSettings},
     data() {
       return {
+        isManageUser: false,
+
         dicts: [],
         transferVisible: false,
 
@@ -412,7 +414,7 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -589,6 +591,7 @@
               span: 24,
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入銀行號",
@@ -600,6 +603,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -609,6 +613,7 @@
             {
               label: "機構名稱",
               prop: "orgName",
+              span: 24,
               disabled: true,
               rules: [{
                 required: true,

src/components/confirmed/confirmed-returns.vue

@@ -126,12 +126,16 @@
   import {getStandardByCode} from "@/api/bank/handoverstandard";
   import ReturnsApproveBatch from "../../components/common/returns-approve-batch";
   import {getDictValue} from "../../api/system/dict";
+  import {getDictByCodes} from "../../api/system/dict";
 
   export default {
     name: "confirmed-returns",
     components: {ReturnsApproveBatch, ReturnsIssue, FlowSettings, ReturnsApprove, ReturnsComfire},
     data() {
       return {
+        dictReturnsStatus: [],
+        dictBusinessType: [],
+
         personId: null,
         personNo: null,
         personName: null,
@@ -215,7 +219,8 @@
               prop: "bankNo",
               span: 24,
               hide: true,
-              search: true,
+              display: false,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -227,7 +232,7 @@
               label: "機構號",
               prop: "orgNo",
               hide: true,
-              viewDisplay: false,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -239,7 +244,7 @@
               prop: "orgName",
               hide: true,
               disabled: true,
-              viewDisplay: false,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -559,6 +564,19 @@
           this.option.viewTitle = data.content;
         }
       });
+      if (this.dictReturnsStatus.length == 0){
+        getDictByCodes('returns_status').then(res => {
+          let data = res.data.data;
+          this.dictReturnsStatus = data;
+        })
+      }
+      if (this.dictBusinessType.length == 0){
+        getDictByCodes('business_type').then(res => {
+          let data = res.data.data;
+          this.dictBusinessType = data;
+        })
+      }
+
     },
     methods: {
       settingCallback(row){
@@ -685,18 +703,31 @@
         this.approveVisible = true;
         this.approveForm = row;
       },
+      getDictValueByLabel(dict, label){
+        for (let i = 0; i < dict.length; i++) {
+          let item = dict[i];
+          if (item.dictValue == label){
+            return item.dictKey;
+          }
+        }
+        return null;
+      },
       infoFormat(row){
-        row.isPublic = row.isPublic == '對公' ? 1 : 0;
         let arr = row.subBank.split(' ');
         row.subOrgNo = arr[0];
         row.subBank = arr[1];
+        /*row.isPublic = row.isPublic == '對公' ? 1 : 0;
         if (row.status == '退件'){
           row.status = '1';
         }else if (row.status == 'HOLD'){
           row.status = '2';
         }else if (row.status == '完成'){
           row.status = '3';
-        }
+        }*/
+        row.isPublic = this.getDictValueByLabel(this.dictBusinessType, row.isPublic);
+        row.status = this.getDictValueByLabel(this.dictReturnsStatus, row.status);
+        debugger
+
         /*let userInfoStr = localStorage.getItem("saber-userInfo");
         let userInfo = JSON.parse(userInfoStr);
         row.bankConfirmNo = userInfo.content.user_ehr;

src/components/confirmed/confirmed-sealhandover.vue

@@ -20,14 +20,14 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger"
+        <!--<el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
                    plain
                    :disabled="delBatchBtn"
                    v-if="permission.sealhandover_delete"
                    @click="handleDelete">刪 除
-        </el-button>
+        </el-button>-->
         <el-button type="success"
                    size="small"
                    icon="el-icon-search"
@@ -182,8 +182,7 @@
               span: 24,
               hide: true,
               disabled: true,
-              span: 24,
-              search: true,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -206,7 +205,7 @@
               },
               change: ({value, column}) => {
                 if (!value) return;
-                let dicData = this.findObject(this.option.column, 'orgNo').dicData;
+                let dicData = column.dicData;
                 dicData.forEach(item => {
                   if (item.orgNo == value){
                     this.form.orgName = item.deptName;
@@ -223,6 +222,22 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              type: "select",
+              filterable: true,
+              dicData: [],
+              props: {
+                label: "deptName",
+                value: "deptName"
+              },
+              change: ({value, column}) => {
+                if (!value) return;
+                let dicData = column.dicData;
+                dicData.forEach(item => {
+                  if (item.deptName == value){
+                    this.form.orgNo = item.orgNo;
+                  }
+                })
+              },
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -525,6 +540,7 @@
           }
         })
         this.findObject(this.option.column, "orgNo").dicData = dicData;
+        this.findObject(this.option.column, "orgName").dicData = dicData;
       });
       getStandardByCode("sealhandover").then(res => {
         const data = res.data.data;
@@ -540,6 +556,12 @@
       getCurrentDept().then(res => {
         const data = res.data.data;
         this.currentDept = data;
+
+        this.isManageUser = data.deptCategory == 1;
+        //控制字段顯隱
+        this.findObject(this.option.column, "bankNo").display = false;
+        this.findObject(this.option.column, "orgNo").display = this.isManageUser;
+        this.findObject(this.option.column, "orgName").span = this.isManageUser ? 12 : 24;
       })
     },
     methods: {

src/components/initiated/init-cardswallow.vue

@@ -172,7 +172,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              display: false,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -269,6 +270,8 @@
             {
               label: "發送支行機構號",
               prop: "sendOrgNo",
+              hide: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入發送支行機構號",

src/components/initiated/init-checklist.vue

@@ -89,6 +89,7 @@
     name: "init-checklist",
     data() {
       return {
+        isManageUser: false,
 
         titleDay: '',
         titleWeek: '',
@@ -146,7 +147,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              display: false,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -159,6 +161,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -169,6 +172,7 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              span: 24,
               rules: [{
                 required: true,
                 message: "請輸入機構號",

src/components/initiated/init-checkwarehouse.vue

@@ -87,6 +87,8 @@
         }
       };
       return {
+        isManageUser: false,
+
         title: "",
         attachBox: false,
         attachForm: {},
@@ -153,7 +155,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              search: false,
+              display: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -165,6 +168,7 @@
               label: "機構號",
               prop: "orgNo",
               hide: true,
+              display: false,
               disabled: true,
               rules: [{
                 required: true,
@@ -175,6 +179,7 @@
             {
               label: "機構名稱",
               prop: "orgName",
+              span: 24,
               disabled: true,
               rules: [{
                 required: true,
@@ -444,6 +449,12 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "更新時間",
+              prop: "updateTime",
+              addDisplay: false,
+              editDisplay: false,
+            }
           ]
         },
         data: []

src/components/initiated/init-goodsuse.vue

@@ -111,6 +111,8 @@
     components: {GoodsuseBalance, GoodsuseSure, SelectDialogUser, FlowSettings},
     data() {
       return {
+        isManageUser: false,
+
         balanceVisible: false,
         transferVisible: false,
         delBatchBtn: true,
@@ -155,7 +157,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              search: false,
+              display: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -168,6 +171,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -178,6 +182,7 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              span: 24,
               rules: [{
                 required: true,
                 message: "請輸入機構號",

src/components/initiated/init-keypwd.vue

@@ -20,14 +20,14 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger"
+        <!--<el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
                    :disabled="delBatchBtn"
                    plain
                    v-if="permission.keypwd_delete"
                    @click="handleDelete">刪 除
-        </el-button>
+        </el-button>-->
         <el-button type="success"
                    size="small"
                    icon="el-icon-search"
@@ -181,7 +181,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              display: false,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -195,6 +196,7 @@
               type: "select",
               hide: true,
               disabled: true,
+              display: true,
               filterable: true,
               dicData: [],
               props: {
@@ -203,7 +205,7 @@
               },
               change: ({value, column}) => {
                 if (!value) return;
-                let dicData = this.findObject(this.option.column, 'orgNo').dicData;
+                let dicData = column.dicData;
                 dicData.forEach(item => {
                   if (item.orgNo == value){
                     this.form.orgName = item.deptName;
@@ -220,6 +222,22 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              type: "select",
+              filterable: true,
+              dicData: [],
+              props: {
+                label: "deptName",
+                value: "deptName"
+              },
+              change: ({value, column}) => {
+                if (!value) return;
+                let dicData = column.dicData;
+                dicData.forEach(item => {
+                  if (item.deptName == value){
+                    this.form.orgNo = item.orgNo;
+                  }
+                })
+              },
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -357,7 +375,7 @@
                 trigger: "blur"
               }]
             },*/
-           /* {
+            /*{
               label: "數量",
               prop: "number",
               type: "number",
@@ -543,6 +561,7 @@
           }
         })
         this.findObject(this.option.column, "orgNo").dicData = dicData;
+        this.findObject(this.option.column, "orgName").dicData = dicData;
       });
 
       // this.initCurrentDeptAndKeepCategroy();
@@ -554,6 +573,10 @@
           this.currentDept = data;
           this.isManageUser = data.deptCategory == 1;
 
+          //控制字段顯隱
+          this.findObject(this.option.column, "bankNo").display = false;
+          this.findObject(this.option.column, "orgNo").display = this.isManageUser;
+          this.findObject(this.option.column, "orgName").span = this.isManageUser ? 12 : 24;
         });
       },
       turnInChange(value){

src/components/initiated/init-postchange.vue

@@ -355,6 +355,8 @@
     components: {SelectDialogUser, FlowSettings},
     data() {
       return {
+        isManageUser: false,
+
         dicts: [],
         transferVisible: false,
 
@@ -412,7 +414,7 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -589,6 +591,7 @@
               span: 24,
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入銀行號",
@@ -600,6 +603,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -609,6 +613,7 @@
             {
               label: "機構名稱",
               prop: "orgName",
+              span: 24,
               disabled: true,
               rules: [{
                 required: true,

src/components/initiated/init-returns.vue

@@ -126,12 +126,16 @@
   import {getStandardByCode} from "@/api/bank/handoverstandard";
   import ReturnsApproveBatch from "../../components/common/returns-approve-batch";
   import {getDictValue} from "../../api/system/dict";
+  import {getDictByCodes} from "../../api/system/dict";
 
   export default {
     name: "init-returns",
     components: {ReturnsApproveBatch, ReturnsIssue, FlowSettings, ReturnsApprove, ReturnsComfire},
     data() {
       return {
+        dictReturnsStatus: [],
+        dictBusinessType: [],
+
         personId: null,
         personNo: null,
         personName: null,
@@ -215,7 +219,8 @@
               prop: "bankNo",
               span: 24,
               hide: true,
-              search: true,
+              display: false,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -227,7 +232,7 @@
               label: "機構號",
               prop: "orgNo",
               hide: true,
-              viewDisplay: false,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -239,7 +244,7 @@
               prop: "orgName",
               hide: true,
               disabled: true,
-              viewDisplay: false,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -559,6 +564,19 @@
           this.option.viewTitle = data.content;
         }
       });
+      if (this.dictReturnsStatus.length == 0){
+        getDictByCodes('returns_status').then(res => {
+          let data = res.data.data;
+          this.dictReturnsStatus = data;
+        })
+      }
+      if (this.dictBusinessType.length == 0){
+        getDictByCodes('business_type').then(res => {
+          let data = res.data.data;
+          this.dictBusinessType = data;
+        })
+      }
+
     },
     methods: {
       settingCallback(row){
@@ -685,18 +703,30 @@
         this.approveVisible = true;
         this.approveForm = row;
       },
+      getDictValueByLabel(dict, label){
+        for (let i = 0; i < dict.length; i++) {
+          let item = dict[i];
+          if (item.dictValue == label){
+            return item.dictKey;
+          }
+        }
+        return null;
+      },
       infoFormat(row){
-        row.isPublic = row.isPublic == '對公' ? 1 : 0;
         let arr = row.subBank.split(' ');
         row.subOrgNo = arr[0];
         row.subBank = arr[1];
+        /*row.isPublic = row.isPublic == '對公' ? 1 : 0;
         if (row.status == '退件'){
           row.status = '1';
         }else if (row.status == 'HOLD'){
           row.status = '2';
         }else if (row.status == '完成'){
           row.status = '3';
-        }
+        }*/
+        row.isPublic = this.getDictValueByLabel(this.dictBusinessType, row.isPublic);
+        row.status = this.getDictValueByLabel(this.dictReturnsStatus, row.status);
+        debugger
 
         /*let userInfoStr = localStorage.getItem("saber-userInfo");
         let userInfo = JSON.parse(userInfoStr);

src/components/initiated/init-sealhandover.vue

@@ -20,14 +20,14 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger"
+        <!--<el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
                    plain
                    :disabled="delBatchBtn"
                    v-if="permission.sealhandover_delete"
                    @click="handleDelete">刪 除
-        </el-button>
+        </el-button>-->
         <el-button type="success"
                    size="small"
                    icon="el-icon-search"
@@ -182,8 +182,7 @@
               span: 24,
               hide: true,
               disabled: true,
-              span: 24,
-              search: true,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -206,7 +205,7 @@
               },
               change: ({value, column}) => {
                 if (!value) return;
-                let dicData = this.findObject(this.option.column, 'orgNo').dicData;
+                let dicData = column.dicData;
                 dicData.forEach(item => {
                   if (item.orgNo == value){
                     this.form.orgName = item.deptName;
@@ -223,6 +222,22 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              type: "select",
+              filterable: true,
+              dicData: [],
+              props: {
+                label: "deptName",
+                value: "deptName"
+              },
+              change: ({value, column}) => {
+                if (!value) return;
+                let dicData = column.dicData;
+                dicData.forEach(item => {
+                  if (item.deptName == value){
+                    this.form.orgNo = item.orgNo;
+                  }
+                })
+              },
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -525,6 +540,7 @@
           }
         })
         this.findObject(this.option.column, "orgNo").dicData = dicData;
+        this.findObject(this.option.column, "orgName").dicData = dicData;
       });
       getStandardByCode("sealhandover").then(res => {
         const data = res.data.data;
@@ -540,6 +556,12 @@
       getCurrentDept().then(res => {
         const data = res.data.data;
         this.currentDept = data;
+
+        this.isManageUser = data.deptCategory == 1;
+        //控制字段顯隱
+        this.findObject(this.option.column, "bankNo").display = false;
+        this.findObject(this.option.column, "orgNo").display = this.isManageUser;
+        this.findObject(this.option.column, "orgName").span = this.isManageUser ? 12 : 24;
       })
     },
     methods: {
@@ -710,7 +732,7 @@
           }
         }
         /*if (this.form.isTurnIn){
-          this.turnInChange(true)
+          // this.turnInChange(true)
         }*/
         if (type == 'edit' && this.form.sealType.indexOf('-') == -1){
           this.form.sealType = this.form.sealType + '-' + this.form.sealNo;

src/components/initiated/init-tellertrunk.vue

@@ -82,6 +82,8 @@
         }
       };
       return {
+        isManageUser: false,
+
         title: "",
         attachBox: false,
         attachForm: {},
@@ -146,7 +148,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              display: false,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -159,6 +162,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -168,6 +172,7 @@
             {
               label: "機構名稱",
               prop: "orgName",
+              span: 24,
               disabled: true,
               rules: [{
                 required: true,
@@ -460,6 +465,12 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "更新時間",
+              prop: "updateTime",
+              addDisplay: false,
+              editDisplay: false,
+            },
           ]
         },
         data: []

src/components/release/release-returns.vue

@@ -126,12 +126,16 @@
   import {getStandardByCode} from "@/api/bank/handoverstandard";
   import ReturnsApproveBatch from "../../components/common/returns-approve-batch";
   import {getDictValue} from "../../api/system/dict";
+  import {getDictByCodes} from "../../api/system/dict";
 
   export default {
     name: "release-returns",
     components: {ReturnsApproveBatch, ReturnsIssue, FlowSettings, ReturnsApprove, ReturnsComfire},
     data() {
       return {
+        dictReturnsStatus: [],
+        dictBusinessType: [],
+
         personId: null,
         personNo: null,
         personName: null,
@@ -215,7 +219,8 @@
               prop: "bankNo",
               span: 24,
               hide: true,
-              search: true,
+              display: false,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -227,7 +232,7 @@
               label: "機構號",
               prop: "orgNo",
               hide: true,
-              viewDisplay: false,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -239,7 +244,7 @@
               prop: "orgName",
               hide: true,
               disabled: true,
-              viewDisplay: false,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -559,6 +564,19 @@
           this.option.viewTitle = data.content;
         }
       });
+      if (this.dictReturnsStatus.length == 0){
+        getDictByCodes('returns_status').then(res => {
+          let data = res.data.data;
+          this.dictReturnsStatus = data;
+        })
+      }
+      if (this.dictBusinessType.length == 0){
+        getDictByCodes('business_type').then(res => {
+          let data = res.data.data;
+          this.dictBusinessType = data;
+        })
+      }
+
     },
     methods: {
       settingCallback(row){
@@ -685,18 +703,31 @@
         this.approveVisible = true;
         this.approveForm = row;
       },
+      getDictValueByLabel(dict, label){
+        for (let i = 0; i < dict.length; i++) {
+          let item = dict[i];
+          if (item.dictValue == label){
+            return item.dictKey;
+          }
+        }
+        return null;
+      },
       infoFormat(row){
-        row.isPublic = row.isPublic == '對公' ? 1 : 0;
         let arr = row.subBank.split(' ');
         row.subOrgNo = arr[0];
         row.subBank = arr[1];
+        /*row.isPublic = row.isPublic == '對公' ? 1 : 0;
         if (row.status == '退件'){
           row.status = '1';
         }else if (row.status == 'HOLD'){
           row.status = '2';
         }else if (row.status == '完成'){
           row.status = '3';
-        }
+        }*/
+        row.isPublic = this.getDictValueByLabel(this.dictBusinessType, row.isPublic);
+        row.status = this.getDictValueByLabel(this.dictReturnsStatus, row.status);
+        debugger
+
         /*let userInfoStr = localStorage.getItem("saber-userInfo");
         let userInfo = JSON.parse(userInfoStr);
         row.bankConfirmNo = userInfo.content.user_ehr;

src/components/tobeconfirm/tobeconfirm-cardswallow.vue

@@ -172,7 +172,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              display: false,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -269,6 +270,8 @@
             {
               label: "發送支行機構號",
               prop: "sendOrgNo",
+              hide: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入發送支行機構號",

src/components/tobeconfirm/tobeconfirm-goodsuse.vue

@@ -111,6 +111,8 @@
     components: {GoodsuseBalance, GoodsuseSure, SelectDialogUser, FlowSettings},
     data() {
       return {
+        isManageUser: false,
+
         balanceVisible: false,
         transferVisible: false,
         delBatchBtn: true,
@@ -155,7 +157,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              search: false,
+              display: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -168,6 +171,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -178,6 +182,7 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              span: 24,
               rules: [{
                 required: true,
                 message: "請輸入機構號",

src/components/tobeconfirm/tobeconfirm-keypwd.vue

@@ -20,14 +20,14 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger"
+        <!--<el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
                    :disabled="delBatchBtn"
                    plain
                    v-if="permission.keypwd_delete"
                    @click="handleDelete">刪 除
-        </el-button>
+        </el-button>-->
         <el-button type="success"
                    size="small"
                    icon="el-icon-search"
@@ -181,7 +181,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              display: false,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -195,6 +196,7 @@
               type: "select",
               hide: true,
               disabled: true,
+              display: true,
               filterable: true,
               dicData: [],
               props: {
@@ -203,7 +205,7 @@
               },
               change: ({value, column}) => {
                 if (!value) return;
-                let dicData = this.findObject(this.option.column, 'orgNo').dicData;
+                let dicData = column.dicData;
                 dicData.forEach(item => {
                   if (item.orgNo == value){
                     this.form.orgName = item.deptName;
@@ -220,6 +222,22 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              type: "select",
+              filterable: true,
+              dicData: [],
+              props: {
+                label: "deptName",
+                value: "deptName"
+              },
+              change: ({value, column}) => {
+                if (!value) return;
+                let dicData = column.dicData;
+                dicData.forEach(item => {
+                  if (item.deptName == value){
+                    this.form.orgNo = item.orgNo;
+                  }
+                })
+              },
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -543,6 +561,7 @@
           }
         })
         this.findObject(this.option.column, "orgNo").dicData = dicData;
+        this.findObject(this.option.column, "orgName").dicData = dicData;
       });
 
       // this.initCurrentDeptAndKeepCategroy();
@@ -554,6 +573,10 @@
           this.currentDept = data;
           this.isManageUser = data.deptCategory == 1;
 
+          //控制字段顯隱
+          this.findObject(this.option.column, "bankNo").display = false;
+          this.findObject(this.option.column, "orgNo").display = this.isManageUser;
+          this.findObject(this.option.column, "orgName").span = this.isManageUser ? 12 : 24;
         });
       },
       turnInChange(value){

src/components/tobeconfirm/tobeconfirm-postchange.vue

@@ -355,6 +355,8 @@
     components: {SelectDialogUser, FlowSettings},
     data() {
       return {
+        isManageUser: false,
+
         dicts: [],
         transferVisible: false,
 
@@ -412,7 +414,7 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -589,6 +591,7 @@
               span: 24,
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入銀行號",
@@ -600,6 +603,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -609,6 +613,7 @@
             {
               label: "機構名稱",
               prop: "orgName",
+              span: 24,
               disabled: true,
               rules: [{
                 required: true,

src/components/tobeconfirm/tobeconfirm-returns.vue

@@ -126,12 +126,16 @@
   import {getStandardByCode} from "@/api/bank/handoverstandard";
   import ReturnsApproveBatch from "../../components/common/returns-approve-batch";
   import {getDictValue} from "../../api/system/dict";
+  import {getDictByCodes} from "../../api/system/dict";
 
   export default {
     name: "tobeconfirm-returns",
     components: {ReturnsApproveBatch, ReturnsIssue, FlowSettings, ReturnsApprove, ReturnsComfire},
     data() {
       return {
+        dictReturnsStatus: [],
+        dictBusinessType: [],
+
         personId: null,
         personNo: null,
         personName: null,
@@ -215,7 +219,8 @@
               prop: "bankNo",
               span: 24,
               hide: true,
-              search: true,
+              display: false,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -227,7 +232,7 @@
               label: "機構號",
               prop: "orgNo",
               hide: true,
-              viewDisplay: false,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -239,7 +244,7 @@
               prop: "orgName",
               hide: true,
               disabled: true,
-              viewDisplay: false,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -559,6 +564,19 @@
           this.option.viewTitle = data.content;
         }
       });
+      if (this.dictReturnsStatus.length == 0){
+        getDictByCodes('returns_status').then(res => {
+          let data = res.data.data;
+          this.dictReturnsStatus = data;
+        })
+      }
+      if (this.dictBusinessType.length == 0){
+        getDictByCodes('business_type').then(res => {
+          let data = res.data.data;
+          this.dictBusinessType = data;
+        })
+      }
+
     },
     methods: {
       settingCallback(row){
@@ -685,18 +703,31 @@
         this.approveVisible = true;
         this.approveForm = row;
       },
+      getDictValueByLabel(dict, label){
+        for (let i = 0; i < dict.length; i++) {
+          let item = dict[i];
+          if (item.dictValue == label){
+            return item.dictKey;
+          }
+        }
+        return null;
+      },
       infoFormat(row){
-        row.isPublic = row.isPublic == '對公' ? 1 : 0;
         let arr = row.subBank.split(' ');
         row.subOrgNo = arr[0];
         row.subBank = arr[1];
+        /*row.isPublic = row.isPublic == '對公' ? 1 : 0;
         if (row.status == '退件'){
           row.status = '1';
         }else if (row.status == 'HOLD'){
           row.status = '2';
         }else if (row.status == '完成'){
           row.status = '3';
-        }
+        }*/
+        row.isPublic = this.getDictValueByLabel(this.dictBusinessType, row.isPublic);
+        row.status = this.getDictValueByLabel(this.dictReturnsStatus, row.status);
+        debugger
+
         /*let userInfoStr = localStorage.getItem("saber-userInfo");
         let userInfo = JSON.parse(userInfoStr);
         row.bankConfirmNo = userInfo.content.user_ehr;

src/components/tobeconfirm/tobeconfirm-sealhandover.vue

@@ -20,14 +20,14 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger"
+        <!--<el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
                    plain
                    :disabled="delBatchBtn"
                    v-if="permission.sealhandover_delete"
                    @click="handleDelete">刪 除
-        </el-button>
+        </el-button>-->
         <el-button type="success"
                    size="small"
                    icon="el-icon-search"
@@ -182,8 +182,7 @@
               span: 24,
               hide: true,
               disabled: true,
-              span: 24,
-              search: true,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -206,7 +205,7 @@
               },
               change: ({value, column}) => {
                 if (!value) return;
-                let dicData = this.findObject(this.option.column, 'orgNo').dicData;
+                let dicData = column.dicData;
                 dicData.forEach(item => {
                   if (item.orgNo == value){
                     this.form.orgName = item.deptName;
@@ -223,6 +222,22 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              type: "select",
+              filterable: true,
+              dicData: [],
+              props: {
+                label: "deptName",
+                value: "deptName"
+              },
+              change: ({value, column}) => {
+                if (!value) return;
+                let dicData = column.dicData;
+                dicData.forEach(item => {
+                  if (item.deptName == value){
+                    this.form.orgNo = item.orgNo;
+                  }
+                })
+              },
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -525,6 +540,7 @@
           }
         })
         this.findObject(this.option.column, "orgNo").dicData = dicData;
+        this.findObject(this.option.column, "orgName").dicData = dicData;
       });
       getStandardByCode("sealhandover").then(res => {
         const data = res.data.data;
@@ -540,6 +556,12 @@
       getCurrentDept().then(res => {
         const data = res.data.data;
         this.currentDept = data;
+
+        this.isManageUser = data.deptCategory == 1;
+        //控制字段顯隱
+        this.findObject(this.option.column, "bankNo").display = false;
+        this.findObject(this.option.column, "orgNo").display = this.isManageUser;
+        this.findObject(this.option.column, "orgName").span = this.isManageUser ? 12 : 24;
       })
     },
     methods: {
@@ -710,7 +732,7 @@
           }
         }
         /*if (this.form.isTurnIn){
-          this.turnInChange(true)
+          // this.turnInChange(true)
         }*/
         if (type == 'edit' && this.form.sealType.indexOf('-') == -1){
           this.form.sealType = this.form.sealType + '-' + this.form.sealNo;

src/views/bank/autodata.vue

@@ -31,13 +31,6 @@
                  @refresh-change="refreshChange"
                  @on-load="onLoad">
         <template slot="menuLeft">
-          <el-button type="danger"
-                     size="small"
-                     icon="el-icon-delete"
-                     plain
-                     v-if="deleteBatch"
-                     @click="handleDelete">刪 除
-          </el-button>
         </template>
 
         <template slot="fileForm" slot-scope="{row}">
@@ -50,10 +43,13 @@
 <!--          <select-dialog-user :id="approvePerson.id" :name="approvePerson.name" :ehr="approvePerson.ehr" :disabled="false" :callback="selectCallback"></select-dialog-user>-->
         </template>
 
-        <template slot-scope="{row}" slot="menu">
+        <template slot-scope="{row, index}" slot="menu">
+          <el-button size="small" class="el-button--text" v-if="userInfo.user_id == row.createUser && 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>
           <el-button type="text" icon="el-icon-download" size="small" v-if="row.file" @click="handleDownload(row)">下載</el-button>
-          <el-button type="text" icon="el-icon-check" size="small" v-if="approveSwitch == 1 && row.process > 0 && row.process < approveNum && userInfo.user_id == row.receiverId"
+          <el-button type="text" icon="el-icon-check" size="small" v-if="approveSwitch == 1 && ( (approveType == 1 && row.process > 0 && row.process <= approveNum) || approveType == 2 )  && row.receiverId.indexOf(userInfo.user_id) > -1 && userInfo.user_id != row.createUser"
                      @click.native="approveShow(row)">審批</el-button>
+
         </template>
       </avue-crud>
 
@@ -67,7 +63,10 @@
             </template>
 
             <template slot-scope="scope" slot="menuForm">
-              <el-button type="danger" size="small" v-if="bohuiBtn" icon="el-icon-close" @click="approveNo">駁回</el-button>
+              <el-button type="warning" size="small" v-if="bohuiBtn" icon="el-icon-close" @click="approveReject">退回</el-button>
+              <el-button type="danger" size="small"
+                         v-if="approveSwitch == 1 && approveType == 2"
+                         icon="el-icon-close" @click="approveNo">不通過</el-button>
             </template>
           </avue-form>
         </div>
@@ -77,7 +76,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, add, update, remove, approveYes, approveNo} from "@/api/bank/autodata";
+  import {getList, getDetail, add, update, remove, approveYes, approveNo, approveReject} from "@/api/bank/autodata";
   import {mapGetters} from "vuex";
   import {getSelectAndPermissionByDept} from "@/api/bank/autostruct";
   import {opStr2opObj} from "../../api/bank/autostruct";
@@ -120,7 +119,9 @@
           name: '',
           ehr: '',
         },
+        tableEditBtn: false,
         approveSwitch: false,
+        approveType: '',
         bohuiBtn: false,
         approveNum: 0,
         approveVisible: false,
@@ -231,6 +232,14 @@
       this.initTableList();
     },
     methods: {
+      formEdit(row, index){
+        let columns = this.option.column;
+        for (let i = 0; i < columns.length; i++) {
+          let item = columns[i];
+          item.editDisabled = false;
+        }
+        this.$refs.crud.rowEdit(row, index);
+      },
       approveYes(data, done){
         let row = this.deepClone(this.approveForm);
         delete row.createTime,delete row.createUser,delete row.createUserName;
@@ -246,6 +255,20 @@
         })
         done();
       },
+      approveReject(){
+        let row = this.deepClone(this.approveForm);
+        delete row.createTime,delete row.createUser,delete row.createUserName;
+        let form = this.beforeSave(row);
+        form.id = row.id, form.remark = row.remark;
+        approveReject(form).then(res => {
+          this.approveVisible = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "退回成功!"
+          });
+        })
+      },
       approveNo(){
         let row = this.deepClone(this.approveForm);
         delete row.createTime,delete row.createUser,delete row.createUserName;
@@ -256,7 +279,7 @@
           this.onLoad(this.page);
           this.$message({
             type: "success",
-            message: "駁回成功!"
+            message: "審批成功!"
           });
         })
       },
@@ -310,14 +333,16 @@
         this.show = false;
         let tableStruct = this.getItemById(value);
         this.approveSwitch = tableStruct.approveSwitch;
+        this.approveType = tableStruct.approveType;
         this.approveNum = tableStruct.num;
         let option = opStr2opObj(tableStruct.columns);
         option.addBtn = tableStruct.canWrite;
         _this.deleteBatch = tableStruct.isManageRole;
         option.delBtn = tableStruct.isManageRole;
         option.excelBtn = tableStruct.isManageRole;
-        option.editBtn = tableStruct.isManageRole;
+        option.editBtn = false;
         option.viewBtn = true;
+        this.tableEditBtn = tableStruct.approveSwitch == 1;
         option.searchMenuSpan = 6;
         option.column.forEach((item, index) => {
           item.search = index >= 3 && index < 7 && item.type != 'title';
@@ -369,17 +394,20 @@
         let n = 1;
         for(let i = 0; i < keys.length; i++){
           let item = {};
-          if (keys[i].indexOf("$") == 0 || keys[i] == ("id") || keys[i].indexOf("createTime") != -1 || keys[i].indexOf("createUser") != -1 || keys[i].indexOf("receiverName") != -1 || keys[i].indexOf("remark") != -1){
+          if (keys[i].indexOf("$") == 0 || keys[i] == ("id") || keys[i] == "createTime" || keys[i]=="createUser" || keys[i]=="createDept" || keys[i]=="receiverId" || keys[i]=="receiverName"
+            || keys[i]=="receiverNo" || keys[i]=="approveId" || keys[i]=="approveName" || keys[i]=="approveNo" || keys[i]=="remark" || keys[i] == "process" || keys[i] == "key"
+            || keys[i] == "processStatus" || keys[i] == "approveHistory"){
           }else{
             item['' + keys[i]] = row[''+keys[i]];
             form['params'+(n++)] = JSON.stringify(item);
           }
-
         }
         form.tableId = this.value;
-        form.receiverId = this.approvePerson.id;
-        form.receiverName = this.approvePerson.name;
-        form.receiverNo = this.approvePerson.ehr;
+        if (this.approvePerson.id && this.approvePerson.name && this.approvePerson.ehr){
+          form.receiverId = this.approvePerson.id;
+          form.receiverName = this.approvePerson.name;
+          form.receiverNo = this.approvePerson.ehr;
+        }
         return form;
       },
       rowSave(row, done, loading) {
@@ -399,11 +427,15 @@
       },
       rowUpdate(row, index, done, loading) {
         let formTem = this.deepClone(row);
-        delete formTem.$index,delete formTem.createDept,delete formTem.createTime,delete formTem.createUser;
+        delete formTem.$index,delete formTem.createDept,delete formTem.createTime,delete formTem.createUser,delete formTem.createUserName;
       // ,delete formTem.id
         let form = this.beforeSave(formTem);
         form.id = row.id;
+        let columns = this.option.column;
         update(form).then(() => {
+          columns.forEach(item => {
+            item.editDisabled = true;
+          })
           this.onLoad(this.page);
           this.$message({
             type: "success",
@@ -463,9 +495,9 @@
         let data = this.form;
         if (data.file){
           let fileName = data.file.split("/").pop();
-          data.name = fileName;
+          // data.name = fileName;
           this.attachForm.attachFile = [
-            {label: data.name, value: fileName}
+            {label: fileName, value: fileName}
           ];
         }
 
@@ -535,12 +567,14 @@
           let row = data[i];
           let form = {};
           form.id = row.id, form.createUser = row.createUser,form.createUserName = row.createUserName, form.createTime = row.createTime, form.createDept = row.createDept;
-          // delete row.id,
-            delete row.createUser, delete row.createUserName, delete row.createTime, delete row.createDept;
+          form.processStatus = row.processStatus, form.createUser = row.createUser,form.createUserName = row.createUserName, form.createTime = row.createTime, form.createDept = row.createDept;
+          delete row.processStatus, delete row.createUser, delete row.createUserName, delete row.createTime, delete row.createDept;
           form.receiverId = row.receiverId, form.receiverNo = row.receiverNo, form.receiverName = row.receiverName;
-          // this.approvePerson.id = row.receiverId, this.approvePerson.ehr = row.receiverNo, this.approvePerson.name = row.receiverName;
           delete row.receiverId, delete row.receiverNo, delete row.receiverName;
           form.process = row.process, form.remark = row.remark, form.approveId = row.approveId, form.approveName = row.approveName, form.approveNo = row.approveNo;
+          delete row.process, delete row.remark, delete row.approveId, delete row.approveName, delete row.approveNo;
+          form.approveHistory = row.approveHistory;
+          delete row.key, delete row.approveHistory;
           let keys = Object.keys(row);
           for (let j = 0; j < keys.length; j++) {
             let key = keys[j];
@@ -568,6 +602,7 @@
           const data = res.data.data;
           this.page.total = data.total;
           this.data = this.initData(data.records);
+          console.log(this.data)
           this.loading = false;
           this.selectionClear();
         });

src/views/bank/cardswallow.vue

@@ -172,7 +172,7 @@
               hide: true,
               disabled: true,
               display: false,
-              search: true,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -269,6 +269,8 @@
             {
               label: "發送支行機構號",
               prop: "sendOrgNo",
+              hide: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入發送支行機構號",

src/views/bank/checklist.vue

@@ -146,7 +146,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              display: false,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -159,6 +160,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -169,6 +171,7 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              span: 24,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -457,14 +460,6 @@
           this.titleMonth = data.content;
         }
       });
-      getCurrentDept().then(res => {
-        const data =  res.data.data;
-        this.isManageUser = data.deptCategory == 1;
-        //控制字段顯隱
-        this.findObject(this.option.column, "bankNo").display = this.isManageUser;
-        this.findObject(this.option.column, "orgNo").display = this.isManageUser;
-        this.findObject(this.option.column, "orgName").span = this.isManageUser ? 12 : 24;
-      });
     },
     methods: {
       handleDownload(){

src/views/bank/checkwarehouse.vue

@@ -154,7 +154,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              search: false,
+              display: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -166,6 +167,7 @@
               label: "機構號",
               prop: "orgNo",
               hide: true,
+              display: false,
               disabled: true,
               rules: [{
                 required: true,
@@ -176,6 +178,7 @@
             {
               label: "機構名稱",
               prop: "orgName",
+              span: 24,
               disabled: true,
               rules: [{
                 required: true,
@@ -428,22 +431,18 @@
               prop: "fillingDate",
               addDisplay: false,
               editDisplay: false,
-              rules: [{
-                required: true,
-                message: "請輸入填報時間",
-                trigger: "blur"
-              }]
             },
             {
               label: "填報人",
               prop: "fillingPerson",
               addDisplay: false,
               editDisplay: false,
-              rules: [{
-                required: true,
-                message: "請輸入填報人",
-                trigger: "blur"
-              }]
+            },
+            {
+              label: "更新時間",
+              prop: "updateTime",
+              addDisplay: false,
+              editDisplay: false,
             },
           ]
         },
@@ -483,14 +482,6 @@
           this.option.column.splice(0,1)
         }
       });
-      getCurrentDept().then(res => {
-        const data =  res.data.data;
-        this.isManageUser = data.deptCategory == 1;
-        //控制字段顯隱
-        this.findObject(this.option.column, "bankNo").display = this.isManageUser;
-        this.findObject(this.option.column, "orgNo").display = this.isManageUser;
-        this.findObject(this.option.column, "orgName").span = this.isManageUser ? 12 : 24;
-      });
     },
     methods: {
       fileDownload(row){

src/views/bank/goodsuse-balance.vue

@@ -78,7 +78,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              // search: true,
+              search: false,
+              display: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -91,6 +92,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -100,6 +102,7 @@
             {
               label: "機構名稱",
               prop: "orgName",
+              span: 24,
               disabled: true,
               rules: [{
                 required: true,

src/views/bank/goodsuse.vue

@@ -156,7 +156,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              search: false,
+              display: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -169,6 +170,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -179,6 +181,7 @@
               label: "機構名稱",
               prop: "orgName",
               disabled: true,
+              span: 24,
               rules: [{
                 required: true,
                 message: "請輸入機構號",

src/views/bank/keypwd-keep.vue

@@ -95,7 +95,7 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,

src/views/bank/keypwd.vue

@@ -20,14 +20,14 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger"
+        <!--<el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
                    :disabled="delBatchBtn"
                    plain
                    v-if="permission.keypwd_delete"
                    @click="handleDelete">刪 除
-        </el-button>
+        </el-button>-->
         <el-button type="success"
                    size="small"
                    icon="el-icon-search"
@@ -181,7 +181,7 @@
               hide: true,
               disabled: true,
               display: false,
-              search: true,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,

src/views/bank/postchange.vue

@@ -413,7 +413,7 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -590,6 +590,7 @@
               span: 24,
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入銀行號",
@@ -601,6 +602,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -610,6 +612,7 @@
             {
               label: "機構名稱",
               prop: "orgName",
+              span: 24,
               disabled: true,
               rules: [{
                 required: true,
@@ -956,15 +959,6 @@
         })*/
         this.initForm();
       })
-
-      getCurrentDept().then(res => {
-        const data =  res.data.data;
-        this.isManageUser = data.deptCategory == 1;
-        //控制字段顯隱
-        this.findObject(this.option.column, "bankNo").display = this.isManageUser;
-        this.findObject(this.option.column, "orgNo").display = this.isManageUser;
-        this.findObject(this.option.column, "orgName").span = this.isManageUser ? 12 : 24;
-      });
     },
     mounted() {
       // this.initForm();

src/views/bank/returns.vue

@@ -219,7 +219,7 @@
               span: 24,
               hide: true,
               display: false,
-              search: true,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,

src/views/bank/sealhandover-keep.vue

@@ -83,7 +83,7 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,

src/views/bank/sealhandover.vue

@@ -20,14 +20,14 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger"
+        <!--<el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
                    plain
                    :disabled="delBatchBtn"
                    v-if="permission.sealhandover_delete"
                    @click="handleDelete">刪 除
-        </el-button>
+        </el-button>-->
         <el-button type="success"
                    size="small"
                    icon="el-icon-search"
@@ -181,8 +181,7 @@
               span: 24,
               hide: true,
               disabled: true,
-              span: 24,
-              search: true,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,

src/views/bank/tellertrunk.vue

@@ -147,7 +147,8 @@
               span: 24,
               hide: true,
               disabled: true,
-              search: true,
+              display: false,
+              search: false,
               searchSpan: 4,
               rules: [{
                 required: true,
@@ -160,6 +161,7 @@
               prop: "orgNo",
               hide: true,
               disabled: true,
+              display: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -169,6 +171,7 @@
             {
               label: "機構名稱",
               prop: "orgName",
+              span: 24,
               disabled: true,
               rules: [{
                 required: true,
@@ -461,6 +464,12 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "更新時間",
+              prop: "updateTime",
+              addDisplay: false,
+              editDisplay: false,
+            },
           ]
         },
         data: []
@@ -499,14 +508,6 @@
           this.option.column.splice(0,1)
         }
       });
-      getCurrentDept().then(res => {
-        const data =  res.data.data;
-        this.isManageUser = data.deptCategory == 1;
-        //控制字段顯隱
-        this.findObject(this.option.column, "bankNo").display = this.isManageUser;
-        this.findObject(this.option.column, "orgNo").display = this.isManageUser;
-        this.findObject(this.option.column, "orgName").span = this.isManageUser ? 12 : 24;
-      });
     },
     methods: {
       fileDownload(row){

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

@@ -908,10 +908,10 @@
               label: "發送支行",
               prop: "sendBank",
             },
-            {
+            /*{
               label: "發送支行機構號",
               prop: "sendOrgNo",
-            },
+            },*/
             {
               label: "卡號",
               prop: "cardNo",