fangq 4 năm trước cách đây
mục cha
commit
86cbb0596b

+ 0 - 1
packages/config/ueditor.vue

@@ -139,7 +139,6 @@ export default {
       this.generateRule()
     },
     'data.options.oss': function (val) {
-      debugger
       if (val == 'ali') this.data.options.qiniu = {}
       else if (val == 'qiniu') this.data.options.ali = {}
     }

+ 0 - 1
src/components/common/flow-settings.vue

@@ -73,7 +73,6 @@
     },
     methods: {
       test1(){
-        debugger
       },
       test2(){
         this.name = ''

+ 0 - 1
src/components/initiated/init-checklist.vue

@@ -679,7 +679,6 @@
         }
         if (["edit", "view"].includes(type)) {
           this.form.isChecked = this.form.isChecked == 1;
-          debugger
           /*getDetail(this.form.id).then(res => {
             this.form = res.data.data;
           });*/

+ 16 - 5
src/views/bank/checklist.vue

@@ -224,15 +224,16 @@
                 label: "dictValue",
                 value: "dictKey",
               },
-              focus: ({value, column}) => {
+              /*focus: ({value, column}) => {
                 let $type = this.findObject(this.option.column, 'type');
-                let dicData = $type.dicData;
+                let dicData = this.dayType;
                 $type.dicData = [];
-                dicData.forEach(item => {
+                debugger
+                /!*dicData.forEach(item => {
                   item.disabled = ["edit", "add"].includes(this.type) && item.isSealed == 1;
-                })
+                })*!/
                 $type.dicData = dicData;
-              },
+              },*/
               change: ({value}) => {
                 console.log("change-" + this.type)
                 if (!value || value.length == 0) return;
@@ -686,8 +687,18 @@
           /*getDetail(this.form.id).then(res => {
             this.form = res.data.data;
           });*/
+        }
 
+        if (["edit", "add"].includes(type)) {
+          let $type = this.findObject(this.option.column, 'type');
+          let dicData = $type.dicData;
+          $type.dicData = [];
+          dicData.forEach(item => {
+            item.disabled = ["edit", "add"].includes(this.type) && item.isSealed == 1;
+          })
+          $type.dicData = dicData;
         }
+
         this.form.title = '添加'
         done();
       },

+ 22 - 22
src/views/bank/checkwarehouse.vue

@@ -137,28 +137,6 @@
               type: 'text',
               span: 24
             },
-            {
-              label: "填報時間",
-              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: "bankNo",
@@ -434,6 +412,28 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "填報時間",
+              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"
+              }]
+            },
           ]
         },
         data: []

+ 0 - 1
src/views/bank/goodsuse-balance.vue

@@ -348,7 +348,6 @@
         this.loading = true;
         getBalanceList().then(res => {
           const data = res.data.data;
-          debugger
           this.data = data;
           this.loading = false;
           this.selectionClear();

+ 0 - 2
src/views/bank/goodsuse.vue

@@ -599,7 +599,6 @@
         });
       },
       transferCallback(row){
-        debugger
         if (this.selectionList && this.selectionList.length > 0 && this.selectionList[0].personNo == row.ehr){
           this.$message.warning("移交人不能為原審批人,請重新選擇!")
           return;
@@ -802,7 +801,6 @@
       selectionClear() {
         let token = JSON.parse(localStorage.getItem('saber-token'))
         let dd = dateFormat(new Date(token.datetime))
-        debugger
         this.selectionList = [];
         this.$refs.crud.toggleSelection();
       },

+ 2 - 2
src/views/bank/keypwd-keep.vue

@@ -32,7 +32,7 @@
       </template>
 
       <template slot-scope="{disabled,size}" slot="categorySearch">
-        <avue-input-tree :check-strictly="false" multiple v-model="search.category" placeholder="請選擇內容" type="tree" :dic="typeList" :props="props"></avue-input-tree>
+        <avue-input-tree :check-strictly="false" v-model="search.category" placeholder="請選擇內容" type="tree" :dic="typeList" :props="props"></avue-input-tree>
       </template>
 
 
@@ -149,7 +149,7 @@
               prop: "category",
               search: true,
               checkStrictly: true,
-              multiple: true,
+              // multiple: true,
               dataType: "string",
               type: "tree",
               // dicUrl: "/api/blade-system/dict/dictionary?code=key_type",

+ 4 - 3
src/views/bank/keypwd.vue

@@ -51,10 +51,10 @@
       </template>
 
       <template slot="receiverNameForm">
-        <select-dialog-user :name="form.receiverName" :ehr="form.receiverNo" :disabled="disabeldReceiver" :callback="selectCallback"></select-dialog-user>
+        <select-dialog-user :id="form.receiverId" :name="form.receiverName" :ehr="form.receiverNo" :disabled="disabeldReceiver" :callback="selectCallback"></select-dialog-user>
       </template>
       <template slot="handoverPersonNameForm">
-        <select-dialog-user :name="form.handoverPersonName" :ehr="form.handoverPersonNo" :disabled="disabeldHandover" :callback="handoverSelectCallback"></select-dialog-user>
+        <select-dialog-user :id="form.handoverPersonId" :name="form.handoverPersonName" :ehr="form.handoverPersonNo" :disabled="disabeldHandover" :callback="handoverSelectCallback"></select-dialog-user>
       </template>
 
       <template slot-scope="{disabled,size}" slot="categorySearch">
@@ -489,7 +489,6 @@
               });
             })
         }else{
-          debugger
           this.downLoadData(this.selectionList, false)
         }
       },
@@ -564,6 +563,7 @@
         this.form.receiverName = value.name;
       },
       rowSave(row, done, loading) {
+        row.isTurnIn = !row.isTurnIn ? 0 : 1;
         add(row).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -577,6 +577,7 @@
         });
       },
       rowUpdate(row, index, done, loading) {
+        row.isTurnIn = !row.isTurnIn ? 0 : 1;
         update(row).then(() => {
           this.onLoad(this.page);
           this.$message({

+ 2 - 2
src/views/bank/sealhandover.vue

@@ -52,10 +52,10 @@
 
       <template slot="receiverNameForm">
         <div v-if="!hasOrgNo">
-          <select-dialog-user :name="form.receiverName" :ehr="form.receiverNo" :disabled="receiverDisabled" :callback="selectCallback"></select-dialog-user>
+          <select-dialog-user :id="form.receiverId" :name="form.receiverName" :ehr="form.receiverNo" :disabled="receiverDisabled" :callback="selectCallback"></select-dialog-user>
         </div>
         <div v-if="hasOrgNo">
-          <select-dialog-user v-if="hasOrgNo" :name="form.receiverName" :ehr="form.receiverNo" :disabled="receiverDisabled" :has-org-no="hasOrgNo" :callback="selectCallback"></select-dialog-user>
+          <select-dialog-user v-if="hasOrgNo" :id="form.receiverId" :name="form.receiverName" :ehr="form.receiverNo" :disabled="receiverDisabled" :has-org-no="hasOrgNo" :callback="selectCallback"></select-dialog-user>
         </div>
       </template>
       <!--<template slot="handoverPersonNameForm">

+ 0 - 1
src/views/desk/notice.vue

@@ -218,7 +218,6 @@
                   // $deptId.multiple = true;
                   $deptId.checkStrictly = false;
                 }
-                debugger
                 $targetIds.rules[0].required = value == "3";
               },
             },

+ 0 - 1
src/views/system/user.vue

@@ -932,7 +932,6 @@
         this.onLoad(this.page);
       },
       searchChange(params, done) {
-        debugger
         this.query = params;
         this.page.currentPage = 1;
         this.onLoad(this.page, params);