修復

src/api/bank/autostruct.js

@@ -56,7 +56,7 @@ export const opStr2opObj = (optionStr) => {
   // str.replace(/\s*/g,"")
   let optionObj = JSON.parse(optionStr, (k,v)=>{
     if(k == 'change'){
-      return eval('"' + v + '"')
+      return eval(v)
     }
     return v
   })

src/components/common/cardswallow-comfirm.vue

@@ -61,7 +61,6 @@
             {
               label: "機構號",
               prop: "orgNo",
-              hide: true,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -71,7 +70,6 @@
             {
               label: "機構名稱",
               prop: "orgName",
-              disabled: true,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -136,11 +134,11 @@
               }]
             },
             {
-              label: "本行機/他行機",
+              label: "其他",
               prop: "machine",
               rules: [{
                 required: true,
-                message: "請輸入本行機/他行機",
+                message: "請輸入其他",
                 trigger: "blur"
               }]
             },

src/components/common/cardswallow-issue.vue

@@ -67,7 +67,7 @@
               disabled: true,
             },
             {
-              label: "本行機/他行機",
+              label: "其他",
               prop: "machine",
               disabled: true,
             },

src/components/confirmed/confirmed-cardswallow.vue

@@ -149,9 +149,9 @@
         },
         selectionList: [],
         option: {
-          addTitle: '新增【自助設備吞沒卡處理】',
-          editTitle: '編輯【自助設備吞沒卡處理】',
-          viewTitle: '查看【自助設備吞沒卡處理】',
+          addTitle: '新增【自助設備吞卡資料】',
+          editTitle: '編輯【自助設備吞卡資料】',
+          viewTitle: '查看【自助設備吞卡資料】',
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -295,11 +295,11 @@
               }]
             },
             {
-              label: "本行機/他行機",
+              label: "其他",
               prop: "machine",
               rules: [{
                 required: true,
-                message: "請輸入本行機/他行機",
+                message: "請輸入其他",
                 trigger: "blur"
               }]
             },
@@ -596,7 +596,7 @@
           }
         }
         this.$Export.excel({
-          title: "自助設備吞沒卡處理" || new Date().getTime(),
+          title: "自助設備吞卡資料" || new Date().getTime(),
           columns: columns,
           data: data
         });

src/components/initiated/init-cardswallow.vue

@@ -147,9 +147,9 @@
         },
         selectionList: [],
         option: {
-          addTitle: '新增【自助設備吞沒卡處理】',
-          editTitle: '編輯【自助設備吞沒卡處理】',
-          viewTitle: '查看【自助設備吞沒卡處理】',
+          addTitle: '新增【自助設備吞卡資料】',
+          editTitle: '編輯【自助設備吞卡資料】',
+          viewTitle: '查看【自助設備吞卡資料】',
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -293,11 +293,11 @@
               }]
             },
             {
-              label: "本行機/他行機",
+              label: "其他",
               prop: "machine",
               rules: [{
                 required: true,
-                message: "請輸入本行機/他行機",
+                message: "請輸入其他",
                 trigger: "blur"
               }]
             },
@@ -594,7 +594,7 @@
           }
         }
         this.$Export.excel({
-          title: "自助設備吞沒卡處理" || new Date().getTime(),
+          title: "自助設備吞卡資料" || new Date().getTime(),
           columns: columns,
           data: data
         });

src/components/initiated/init-tellertrunk.vue

@@ -290,22 +290,22 @@
             },
 
             {
-              label: "本單位持有現金/重空櫃員數量",
+              label: "本單位持有現金櫃員數量",
               prop: "holdingNumberUnit",
               type: "number",
               rules: [{
                 required: true,
-                message: "請輸入本單位持有現金/重空櫃員數量",
+                message: "請輸入本單位持有現金櫃員數量",
                 trigger: "blur"
               }]
             },
             {
-              label: "本次檢查持有現金/重空櫃員數量",
+              label: "本次檢查持有現金櫃員數量",
               prop: "holdingNumberCheck",
               type: "number",
               rules: [{
                 required: true,
-                message: "請輸入本次檢查持有現金/重空櫃員數量",
+                message: "請輸入本次檢查持有現金櫃員數量",
                 trigger: "blur"
               }]
             },

src/components/release/release-cardswallow.vue

@@ -148,11 +148,11 @@
               }]
             },
             {
-              label: "本行機/他行機",
+              label: "其他",
               prop: "machine",
               rules: [{
                 required: true,
-                message: "請輸入本行機/他行機",
+                message: "請輸入其他",
                 trigger: "blur"
               }]
             },

src/components/tobeconfirm/tobeconfirm-cardswallow.vue

@@ -149,9 +149,9 @@
         },
         selectionList: [],
         option: {
-          addTitle: '新增【自助設備吞沒卡處理】',
-          editTitle: '編輯【自助設備吞沒卡處理】',
-          viewTitle: '查看【自助設備吞沒卡處理】',
+          addTitle: '新增【自助設備吞卡資料】',
+          editTitle: '編輯【自助設備吞卡資料】',
+          viewTitle: '查看【自助設備吞卡資料】',
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -295,11 +295,11 @@
               }]
             },
             {
-              label: "本行機/他行機",
+              label: "其他",
               prop: "machine",
               rules: [{
                 required: true,
-                message: "請輸入本行機/他行機",
+                message: "請輸入其他",
                 trigger: "blur"
               }]
             },
@@ -596,7 +596,7 @@
           }
         }
         this.$Export.excel({
-          title: "自助設備吞沒卡處理" || new Date().getTime(),
+          title: "自助設備吞卡資料" || new Date().getTime(),
           columns: columns,
           data: data
         });

src/views/bank/autodata.vue

@@ -121,7 +121,17 @@
         let _this = this;
         this.show = false;
         let table = this.getItemById(value);
-        this.option = opStr2opObj(table.columns);
+        let option = opStr2opObj(table.columns);
+        option.viewBtn = true;
+        option.column.forEach(item => {
+          if (item.dicUrl){
+            item.dicFormatter = (res) => {
+              res.data.forEach(item => {item.disabled = item.isSealed == 1;})
+              return res.data;
+            };
+          }
+        })
+        this.option = option;
         setTimeout(() => {
           _this.show = true;
           _this.onLoad(this.page)
@@ -138,12 +148,18 @@
         }
       },
       beforeSave(row){
+        debugger
         let  keys = Object.keys(row);
         let form = {}
+        let n = 1;
         for(let i = 0; i < keys.length; i++){
           let item = {};
-          item['' + keys[i]] = row[''+keys[i]];
-          form['params'+(i+1)] = JSON.stringify(item);
+          if (keys[i].indexOf("$") == 0){
+          }else{
+            item['' + keys[i]] = row[''+keys[i]];
+            form['params'+(n++)] = JSON.stringify(item);
+          }
+
         }
         form.tableId = this.value;
         return form;

src/views/bank/autostruct.vue

@@ -101,6 +101,7 @@
             {
               label: "列結構",
               prop: "columns",
+              hide: true,
               type: "textarea",
               span: 24,
               rules: [{

src/views/bank/cardswallow.vue

@@ -79,7 +79,7 @@
       </avue-form>
     </el-dialog>
 
-    <el-dialog title="資訊確認"
+    <el-dialog title="信息分解"
                append-to-body
                :visible.sync="temVisible"
                :fullscreen="true"
@@ -148,9 +148,9 @@
         },
         selectionList: [],
         option: {
-          addTitle: '新增【自助設備吞沒卡處理】',
-          editTitle: '編輯【自助設備吞沒卡處理】',
-          viewTitle: '查看【自助設備吞沒卡處理】',
+          addTitle: '新增【自助設備吞卡資料】',
+          editTitle: '編輯【自助設備吞卡資料】',
+          viewTitle: '查看【自助設備吞卡資料】',
           height:'auto',
           calcHeight: 30,
           tip: false,
@@ -294,11 +294,11 @@
               }]
             },
             {
-              label: "本行機/他行機",
+              label: "其他",
               prop: "machine",
               rules: [{
                 required: true,
-                message: "請輸入本行機/他行機",
+                message: "請輸入其他",
                 trigger: "blur"
               }]
             },
@@ -595,7 +595,7 @@
           }
         }
         this.$Export.excel({
-          title: "自助設備吞沒卡處理" || new Date().getTime(),
+          title: "自助設備吞卡資料" || new Date().getTime(),
           columns: columns,
           data: data
         });

src/views/bank/goodsuse.vue

@@ -68,7 +68,7 @@
         <el-button size="small" class="el-button--text" v-if="permission.goodsuse_view" @click="$refs.crud.rowView(row, index)"><i class="el-icon-view"></i> 查 看</el-button>
         <el-button size="small" class="el-button--text" v-if="permission.goodsuse_edit && row.process == 2 && userInfo.user_id == row.createUser" @click="$refs.crud.rowEdit(row, index)"><i class="el-icon-edit"></i> 編 輯</el-button>
         <el-button size="small" class="el-button--text" v-if="permission.goodsuse_delete && row.process == 2 && userInfo.user_id == row.createUser" @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
-        <el-button size="mini " type="primary" plain v-if="permission.goodsuse_confirm && row.process == 2 && row.personNo == userInfo.user_ehr" @click="form = row, sureVisible = true">去確認</el-button>
+        <el-button size="small" class="el-button--text" v-if="permission.goodsuse_confirm && row.process == 2 && row.personNo == userInfo.user_ehr" @click="form = row, sureVisible = true"> 確 認</el-button>
       </template>
     </avue-crud>
 

src/views/bank/handoverstandard.vue

@@ -111,7 +111,7 @@
                   label: "新開戶退件登記表", value: "returns"
                 },
                 {
-                  label: "自助設備吞沒卡處理", value: "cardswallow"
+                  label: "自助設備吞卡資料", value: "cardswallow"
                 },
                 {
                   label: "信息發佈", value: "message"
@@ -190,7 +190,7 @@
           label: "新開戶退件登記表", value: "returns"
         },
         {
-          label: "自助設備吞沒卡處理", value: "cardswallow"
+          label: "自助設備吞卡資料", value: "cardswallow"
         },
         {
           label: "信息發佈", value: "message"

src/views/bank/keypwd.vue

@@ -49,9 +49,9 @@
         <el-button size="small" class="el-button--text" v-if="permission.keypwd_delete && userInfo.user_id == row.createUser" @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
       </template>
 
-      <template slot="receiverNameForm">
+      <!--<template slot="receiverNameForm">
         <select-dialog-user :name="form.receiverName" :ehr="form.receiverNo" :disabled="disabeldReceiver" :callback="selectCallback"></select-dialog-user>
-      </template>
+      </template>-->
       <template slot="handoverPersonNameForm">
         <select-dialog-user :name="form.handoverPersonName" :ehr="form.handoverPersonNo" :disabled="disabeldHandover" :callback="handoverSelectCallback"></select-dialog-user>
       </template>
@@ -186,7 +186,7 @@
               },
               searchslot: true,
               change: ({value, column}) => {
-                if (!value || this.type == 'view' || this.type == 'edit') return;
+                if (!value || this.type == 'view' || this.form.category == value) return;
                 getByCategoryAndType(value, this.form.orgNo).then(res => {
                   const data = res.data.data;
                   let $handoverNo = this.findObject(this.option.column, 'handoverPersonNo');
@@ -314,11 +314,11 @@
             {
               label: "接收人",
               prop: "receiverName",
+              disabled: true,
               search: true,
-              // searchPlaceholder: "保管人",
-              // searchTip: "保管人",
               searchSpan: 4,
-              formslot:  true,
+              // formslot:  true,
+              disabled:  true,
               rules: [{
                 required: true,
                 message: "請輸入接收人員工號",
@@ -585,7 +585,8 @@
       beforeOpen(done, type) {
         this.type = type;
         if (type === 'add'){
-          let userInfo = localStorage.getItem("saber-userInfo");
+          this.form.receiverNo = this.userInfo.user_ehr;
+          this.form.receiverName = this.userInfo.user_name;
           this.form.number = 1;
           this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
           getCurrentDept().then(res => {

src/views/bank/sealhandover.vue

@@ -49,9 +49,9 @@
         <el-button size="small" class="el-button--text" v-if="permission.sealhandover_delete && userInfo.user_id == row.createUser" @click="$refs.crud.rowDel(row, index)"><i class="el-icon-delete"></i> 刪 除</el-button>
       </template>
 
-      <template slot="receiverNameForm">
+      <!--<template slot="receiverNameForm">
         <select-dialog-user :name="form.receiverName" :ehr="form.receiverNo" :disabled="receiverDisabled" :callback="selectCallback"></select-dialog-user>
-      </template>
+      </template>-->
       <template slot="handoverPersonNameForm">
         <select-dialog-user :name="form.handoverPersonName" :ehr="form.handoverPersonNo" :disabled="true" :callback="handoverSelectCallback"></select-dialog-user>
       </template>
@@ -205,6 +205,33 @@
                 res.data.forEach(item => {item.disabled = item.isSealed == 1;})
                 return res.data;
               },
+              change: ({value, column}) => {
+                if (!value ||!this.form.sealNo || this.type == 'view') return;
+                getByNoAndType(this.form.sealNo, value, this.form.orgNo).then(res => {
+                  const data = res.data.data;
+                  let $handoverNo = this.findObject(this.option.column, 'handoverPersonNo');
+                  if (Object.keys(data).length == 0){
+                    // $handoverNo.disabled = false;
+                    this.form.handoverPersonNo = '';
+                    delete this.form.handoverPersonName;
+                    this.receiverDisabled = false;
+                  } else {
+                    // $handoverNo.disabled = true;
+                    // 編輯時，若記錄為自己，則跳過
+                    if (this.form.id == data.id){
+                      return;
+                    }
+                    if (data.isTurnIn == 1){
+                      this.$message.warning("此印章已上繳，請重新選擇！");
+                      this.receiverDisabled = true;
+                    }else{
+                      this.receiverDisabled = false;
+                    }
+                    this.form.handoverPersonNo = data.receiverNo;
+                    this.form.handoverPersonName = data.receiverName;
+                  }
+                });
+              },
               rules: [{
                 required: true,
                 message: "請輸入印章類型",
@@ -218,8 +245,7 @@
               searchSpan: 4,
               searchslot: true,
               change: ({value, column}) => {
-                if (!value || this.type == 'view') return;
-
+                if (!value ||!this.form.sealType || this.type == 'view') return;
                 getByNoAndType(value, this.form.sealType, this.form.orgNo).then(res => {
                   const data = res.data.data;
                   let $handoverNo = this.findObject(this.option.column, 'handoverPersonNo');
@@ -317,11 +343,10 @@
             {
               label: "接收人",
               prop: "receiverName",
+              disabled: true,
               search: true,
-              searchPlaceholder: "保管人",
-              searchTip: "保管人",
               searchSpan: 4,
-              formslot: true,
+              // formslot: true,
               rules: [{
                 required: true,
                 message: "請輸入接收人姓名",
@@ -428,6 +453,8 @@
     },
     methods: {
       turnInChange(value){
+        this.form.receiverNo = value == true ? null : this.userInfo.user_ehr;
+        this.form.receiverName = value == true ? null : this.userInfo.user_name;
         this.findObject(this.option.column, "receiverNo").rules[0].required = !value;
         this.findObject(this.option.column, "receiverName").rules[0].required = !value;
         this.receiverDisabled = !!value;
@@ -545,7 +572,8 @@
       beforeOpen(done, type) {
         this.type = type;
         if (type === 'add'){
-          let userInfo = localStorage.getItem("saber-userInfo");
+          this.form.receiverNo = this.userInfo.user_ehr;
+          this.form.receiverName = this.userInfo.user_name;
           this.form.number = 1;
           this.form.handoverDate = dateFormat(new Date(), "yyyy-MM-dd hh:mm");
           getCurrentDept().then(res => {

src/views/bank/tellertrunk.vue

@@ -289,22 +289,22 @@
             },
 
             {
-              label: "本單位持有現金/重空櫃員數量",
+              label: "本單位持有現金櫃員數量",
               prop: "holdingNumberUnit",
               type: "number",
               rules: [{
                 required: true,
-                message: "請輸入本單位持有現金/重空櫃員數量",
+                message: "請輸入本單位持有現金櫃員數量",
                 trigger: "blur"
               }]
             },
             {
-              label: "本次檢查持有現金/重空櫃員數量",
+              label: "本次檢查持有現金櫃員數量",
               prop: "holdingNumberCheck",
               type: "number",
               rules: [{
                 required: true,
-                message: "請輸入本次檢查持有現金/重空櫃員數量",
+                message: "請輸入本次檢查持有現金櫃員數量",
                 trigger: "blur"
               }]
             },

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

@@ -89,7 +89,7 @@
                   label: "新開戶退件登記表", value: "returns"
                 },
                 {
-                  label: "自助設備吞沒卡處理", value: "cardswallow"
+                  label: "自助設備吞卡資料", value: "cardswallow"
                 },
                 {
                   label: "信息發佈", value: "message"
@@ -485,13 +485,13 @@
 
             },
             {
-              label: "本單位持有現金/重空櫃員數量",
+              label: "本單位持有現金櫃員數量",
               prop: "holdingNumberUnit",
               type: "number",
 
             },
             {
-              label: "本次檢查持有現金/重空櫃員數量",
+              label: "本次檢查持有現金櫃員數量",
               prop: "holdingNumberCheck",
               type: "number",
 
@@ -877,7 +877,7 @@
           ]
         }],
         cardswallowGroup: [{
-          label: "自助設備吞沒卡處理",
+          label: "自助設備吞卡資料",
           column: [
             {
               label: "機構號",
@@ -921,7 +921,7 @@
               prop: "cardSerialNo",
             },
             {
-              label: "本行機/他行機",
+              label: "其他",
               prop: "machine",
             },
             {

src/views/desk/confirmed.vue

@@ -11,7 +11,7 @@
       <el-tab-pane v-if="permission.returns_view" label="新開戶退件登記表">
         <confirmed-returns></confirmed-returns>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.cardswallow_view" label="自助設備吞沒卡處理">
+      <el-tab-pane v-if="permission.cardswallow_view" label="自助設備吞卡資料">
         <confirmed-cardswallow></confirmed-cardswallow>
       </el-tab-pane>
     </el-tabs>

src/views/desk/initiated.vue

@@ -27,7 +27,7 @@
       <el-tab-pane v-if="permission.returns_view" label="新開戶退件登記表">
         <init-returns></init-returns>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.cardswallow_view" label="自助設備吞沒卡處理">
+      <el-tab-pane v-if="permission.cardswallow_view" label="自助設備吞卡資料">
         <init-cardswallow></init-cardswallow>
       </el-tab-pane>
       <el-tab-pane v-if="permission.message_view" label="信息發佈">

src/views/desk/mynotice.vue

@@ -166,7 +166,7 @@
                   label: "新開戶退件登記表", value: "returns"
                 },
                 {
-                  label: "自助設備吞沒卡處理", value: "cardswallow"
+                  label: "自助設備吞卡資料", value: "cardswallow"
                 },
                 {
                   label: "信息發佈", value: "message"

src/views/desk/notice.vue

@@ -138,7 +138,7 @@
               }]
             },*/
             {
-              label: "業務流程",
+              label: "表單名稱",
               prop: "code",
               type: "select",
               addDisplay: false,
@@ -176,7 +176,7 @@
                   label: "新開戶退件登記表", value: "returns"
                 },
                 {
-                  label: "自助設備吞沒卡處理", value: "cardswallow"
+                  label: "自助設備吞卡資料", value: "cardswallow"
                 },
                 {
                   label: "信息發佈", value: "message"

src/views/desk/tobeconfirm.vue

@@ -10,7 +10,7 @@
       <el-tab-pane v-if="permission.returns_view" label="新開戶退件登記表">
         <tobeconfirm-returns></tobeconfirm-returns>
       </el-tab-pane>
-      <el-tab-pane v-if="permission.cardswallow_view" label="自助設備吞沒卡處理">
+      <el-tab-pane v-if="permission.cardswallow_view" label="自助設備吞卡資料">
         <tobeconfirm-cardswallow></tobeconfirm-cardswallow>
       </el-tab-pane>
     </el-tabs>

src/views/desk/toberelease.vue

@@ -4,7 +4,7 @@
       <el-tab-pane v-if="permission.returns_view" label="新開戶退件登記表">
         <release-returns></release-returns>
       </el-tab-pane>
-     <!-- <el-tab-pane v-if="permission.cardswallow_view" label="自助設備吞沒卡處理">
+     <!-- <el-tab-pane v-if="permission.cardswallow_view" label="自助設備吞卡資料">
         <init-cardswallow></init-cardswallow>
         <release-cardswallow></release-cardswallow>
       </el-tab-pane>-->

src/views/report/userlog.vue

@@ -143,7 +143,7 @@
                   label: "新開戶退件登記表", value: "returns"
                 },
                 {
-                  label: "自助設備吞沒卡處理", value: "cardswallow"
+                  label: "自助設備吞卡資料", value: "cardswallow"
                 },
                 {
                   label: "信息發佈", value: "message"

src/views/wel/index.vue

@@ -377,11 +377,11 @@
       getMyInitiated().then(res => {
         const initiatedCount = res.data.data;
         this.optionFront.data[0].count = initiatedCount;
-        // this.optionBackgr.data[4].count = initiatedCount;
+        this.optionBackgr.data[1].count = initiatedCount;
       })
       getToBoReleased().then(res => {
         const tobeReleaseCount = res.data.data;
-        // this.optionBackgr.data[5].count = tobeReleaseCount;
+        this.optionBackgr.data[2].count = tobeReleaseCount;
       });
       getToBeConfirmed().then(res => {
         const tobeConfirmedCount = res.data.data;