修復-字典搜索-表单分开，封存影响

src/components/initiated/init-checklist.vue

@@ -64,10 +64,10 @@
       </template>
 
       <template slot="titleForm" slot-scope="{row, index}">
-        <div v-html="title" style="white-space: pre-line;color: red;font-width: bold;"></div>
+        <div v-html="title" style="white-space: pre-line;color: red;font-weight: bold;"></div>
       </template>
       <template slot="titleLabel" slot-scope="{row, index}">
-        <span style="color: red;font-width: bold;">注意事項：</span>
+        <span style="color: red;font-weight: bold;">注意事項：</span>
       </template>
 
     </avue-crud>

src/components/initiated/init-checkwarehouse.vue

@@ -52,10 +52,10 @@
       </template>
 
       <template slot="titleForm" slot-scope="{row, index}">
-        <div v-html="title" style="white-space: pre-line;color: red;font-width: bold;"></div>
+        <div v-html="title" style="white-space: pre-line;color: red;font-weight: bold;"></div>
       </template>
       <template slot="titleLabel" slot-scope="{row, index}">
-        <span style="color: red;font-width: bold;">注意事項：</span>
+        <span style="color: red;font-weight: bold;">注意事項：</span>
       </template>
 
     </avue-crud>

src/components/initiated/init-keypwd.vue

@@ -61,10 +61,10 @@
       </template>
 
       <template slot="titleForm" slot-scope="{row, index}">
-        <div v-html="title" style="white-space: pre-line;color: red;font-width: bold;"></div>
+        <div v-html="title" style="white-space: pre-line;color: red;font-weight: bold;"></div>
       </template>
       <template slot="titleLabel" slot-scope="{row, index}">
-        <span style="color: red;font-width: bold;">注意事項：</span>
+        <span style="color: red;font-weight: bold;">注意事項：</span>
       </template>
 
     </avue-crud>

src/components/initiated/init-sealhandover.vue

@@ -62,10 +62,10 @@
       </template>
 
       <template slot="titleForm" slot-scope="{row, index}">
-        <div v-html="title" style="white-space: pre-line;color: red;font-width: bold;"></div>
+        <div v-html="title" style="white-space: pre-line;color: red;font-weight: bold;"></div>
       </template>
       <template slot="titleLabel" slot-scope="{row, index}">
-        <span style="color: red;font-width: bold;">注意事項：</span>
+        <span style="color: red;font-weight: bold;">注意事項：</span>
       </template>
 
       <template slot="isTurnIn" slot-scope="{row, index}">

src/components/initiated/init-tellertrunk.vue

@@ -48,10 +48,10 @@
       </template>
 
       <template slot="titleForm" slot-scope="{row, index}">
-        <div v-html="title" style="white-space: pre-line;color: red;font-width: bold;"></div>
+        <div v-html="title" style="white-space: pre-line;color: red;font-weight: bold;"></div>
       </template>
       <template slot="titleLabel" slot-scope="{row, index}">
-        <span style="color: red;font-width: bold;">注意事項：</span>
+        <span style="color: red;font-weight: bold;">注意事項：</span>
       </template>
 
     </avue-crud>

src/views/bank/cardswallow.vue

@@ -337,9 +337,6 @@
               prop: "sendStatus",
               type: "select",
               display: false,
-              search: true,
-              searchSpan: 4,
-              searchMultiple: true,
               // dataType: "string",
               dicUrl: `/api/blade-system/dict/dictionary?code=send_status`,
               props: {
@@ -356,6 +353,22 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "發送狀態",
+              prop: "sendStatusSearch",
+              type: "select",
+              display: false,
+              hide: true,
+              search: true,
+              searchSpan: 4,
+              searchMultiple: true,
+              // dataType: "string",
+              dicUrl: `/api/blade-system/dict/dictionary?code=send_status`,
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+            },
             {
               label: "備註",
               prop: "remark",
@@ -644,8 +657,8 @@
           params.sendDateRange = null;
         }
 
-        if (params.sendStatus){
-          params.sendStatus = params.sendStatus.join();
+        if (params.sendStatusSearch){
+          params.sendStatus = params.sendStatusSearch.join();
         }
 
         this.query = params;

src/views/bank/checklist.vue

@@ -16,6 +16,7 @@
                :page.sync="page"
                :permission="permissionList"
                :before-open="beforeOpen"
+               :before-close="beforeClose"
                v-model="form"
                ref="crud"
                @row-update="rowUpdate"
@@ -64,10 +65,10 @@
       </template>
 
       <template slot="titleForm" slot-scope="{row, index}">
-        <div v-html="title" style="white-space: pre-line;color: red;font-width: bold;"></div>
+        <div v-html="title" style="white-space: pre-line;color: red;font-weight: bold;"></div>
       </template>
       <template slot="titleLabel" slot-scope="{row, index}">
-        <span style="color: red;font-width: bold;">注意事項：</span>
+        <span style="color: red;font-weight: bold;">注意事項：</span>
       </template>
 
     </avue-crud>
@@ -93,6 +94,7 @@
         titleMonth: '',
 
         title: "",
+        type: "",
         cycle: "day",
         dayType: [],
         dayItem: [],
@@ -222,20 +224,17 @@
                 label: "dictValue",
                 value: "dictKey",
               },
-              dicFormatter: (res) => {
-                let result = [];
-                let data = res.data;
-                let cycle = this.cycle;
-                for (let i = 0; i < data.length; i++) {
-                  let item = data[i];
-                  item.disabled = item.isSealed == 1;
-                  if (item.dictKey.indexOf(cycle) != -1){
-                    result.push(item)
-                  }
-                }
-                return result;
+              focus: ({value, column}) => {
+                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;
               },
               change: ({value}) => {
+                console.log("change-" + this.type)
                 if (!value || value.length == 0) return;
                 // 有值，打開核對項目下拉選
                 this.findObject(this.option.column, "item").disabled = false;
@@ -296,19 +295,14 @@
                 label: "dictValue",
                 value: "dictKey",
               },
-              dicFormatter: (res) => {
-                let result = [];
-                let data = res.data;
-                let cycle = this.cycle;
-                for (let i = 0; i < data.length; i++) {
-                  let item = data[i];
-                  item.disabled = item.isSealed == 1;
-                  if (item.dictKey.indexOf(cycle) != -1){
-                    result.push(item)
-                  }
-                }
-                return result;
-
+              focus: ({value, column}) => {
+                let $item = this.findObject(this.option.column, 'item');
+                let dicData = $item.dicData;
+                $item.dicData = [];
+                dicData.forEach(item => {
+                  item.disabled = ["edit", "add"].includes(this.type) && item.isSealed == 1;
+                })
+                $item.dicData = dicData;
               },
               rules: [{
                 required: true,
@@ -546,6 +540,7 @@
           let data = res.data.data;
           for (let i = 0; i < data.length; i++) {
             let item = data[i];
+            // item.disabled = item.isSealed == 1;
             if (item.dictKey.indexOf('day') != -1){
               this.dayType.push(item)
             }
@@ -562,6 +557,7 @@
           let data = res.data.data;
           for (let i = 0; i < data.length; i++) {
             let item = data[i];
+            // item.disabled = item.isSealed == 1;
             if (item.dictKey.indexOf('day') != -1){
               this.dayItem.push(item)
             }
@@ -660,7 +656,14 @@
             this.$refs.crud.toggleSelection();
           });
       },
+      beforeClose(done,type){
+        this.type = '123'
+        console.log('beforeClose')
+        done();
+      },
       beforeOpen(done, type) {
+        this.type = type;
+        console.log("beforeOpen"+this.type)
         this.form.title = '添加'
         this.findObject(this.option.column, "item").disabled = true;
         if (type === 'add'){

src/views/bank/checkwarehouse.vue

@@ -52,10 +52,10 @@
       </template>
 
       <template slot="titleForm" slot-scope="{row, index}">
-        <div v-html="title" style="white-space: pre-line;color: red;font-width: bold;"></div>
+        <div v-html="title" style="white-space: pre-line;color: red;font-weight: bold;"></div>
       </template>
       <template slot="titleLabel" slot-scope="{row, index}">
-        <span style="color: red;font-width: bold;">注意事項：</span>
+        <span style="color: red;font-weight: bold;">注意事項：</span>
       </template>
 
     </avue-crud>
@@ -259,8 +259,6 @@
               label: "檢查單位",
               prop: "checkUnit",
               type: "select",
-              search: true,
-              searchSpan: 4,
               multiple: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=unit_type",
               props:{
@@ -271,25 +269,6 @@
                 res.data.forEach(item => {item.disabled = item.isSealed == 1;})
                 return res.data;
               },
-              change: ({value, column}) => {
-                /*if (!value) return;
-                let $nameOut = this.findObject(this.option.column, 'checkPersonNameOut');
-                $nameOut.display = value != '1';
-                let $noOut = this.findObject(this.option.column, 'checkPersonNoOut');
-                $noOut.display = value != '1';
-                let $name = this.findObject(this.option.column, 'checkPersonName');
-                $name.display = value == '1';
-                let $no = this.findObject(this.option.column, 'checkPersonNo');
-                $no.display = value == '1';
-                $no.disabled = value == '1';
-                if (!this.form.checkResult) return;
-                let $remark = this.findObject(this.option.column, 'remark');
-                if (value == '1' && this.form.checkResult == '1'){
-                  $remark.rules[0].required = false;
-                }else{
-                  $remark.rules[0].required = true;
-                }*/
-              },
               rules: [{
                 required: true,
                 message: "請輸入檢查單位",
@@ -306,8 +285,6 @@
                 value: "dictKey",
               },
               multiple: true,
-              search: true,
-              searchSpan: 4,
               dicFormatter: (res) => {
                 res.data.forEach(item => {item.disabled = item.isSealed == 1;})
                 return res.data;
@@ -322,8 +299,6 @@
               label: "檢查內容",
               prop: "checkContent",
               type: "select",
-              search: true,
-              searchSpan: 4,
               multiple: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=check_content_warehouse",
               props:{
@@ -340,6 +315,48 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "檢查單位",
+              prop: "checkUnitSearch",
+              type: "select",
+              search: true,
+              hide: true,
+              display: false,
+              searchSpan: 4,
+              dicUrl: "/api/blade-system/dict/dictionary?code=unit_type",
+              props:{
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
+            {
+              label: "檢查目的",
+              prop: "checkPurposeSearch",
+              type: "select",
+              dicUrl: "/api/blade-system/dict/dictionary?code=check_purpose",
+              props:{
+                label: "dictValue",
+                value: "dictKey",
+              },
+              search: true,
+              searchSpan: 4,
+              hide: true,
+              display: false,
+            },
+            {
+              label: "檢查內容",
+              prop: "checkContentSearch",
+              type: "select",
+              search: true,
+              hide: true,
+              display: false,
+              searchSpan: 4,
+              dicUrl: "/api/blade-system/dict/dictionary?code=check_content_warehouse",
+              props:{
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
             {
               label: "核對結果",
               prop: "checkResult",
@@ -592,6 +609,7 @@
           });
       },
       beforeOpen(done, type) {
+        this.type = type;
         this.attachForm = {};
         this.attachOption.column[0].disabled = type == 'view';
         if (type === 'add'){
@@ -633,6 +651,15 @@
           params.checkTime_begin = params.checkTimeRange[0], params.checkTime_end = params.checkTimeRange[1];
           params.checkTimeRange = null;
         }
+        if (params.checkUnitSearch){
+          params.checkUnit = params.checkUnitSearch;
+        }
+        if (params.checkPurposeSearch){
+          params.checkPurpose = params.checkPurposeSearch;
+        }
+        if (params.checkContentSearch){
+          params.checkContent = params.checkContentSearch;
+        }
 
         this.query = params;
         this.page.currentPage = 1;

src/views/bank/goodsuse.vue

@@ -234,9 +234,11 @@
             },
             {
               label: "憑證/實物種類",
-              prop: "type",
+              prop: "typeSearch",
               type: "select",
               search: true,
+              hide: true,
+              display: false,
               searchSpan: 4,
               searchMultiple: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=voucher_type",
@@ -244,6 +246,16 @@
                 label: "dictValue",
                 value: "dictKey"
               },
+            },
+            {
+              label: "憑證/實物種類",
+              prop: "type",
+              type: "select",
+              dicUrl: "/api/blade-system/dict/dictionary?code=voucher_type",
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
               dicFormatter: (res) => {
                 res.data.forEach(item => {item.disabled = item.isSealed == 1;})
                 return res.data;
@@ -764,8 +776,8 @@
           params.orgNostr = params.orgNos.join();
           params.orgNos = '';
         }
-        if (params.type){
-          params.type = params.type.join();
+        if (params.typeSearch){
+          params.type = params.typeSearch.join();
         }
 
         this.query = params;

src/views/bank/keypwd-keep.vue

@@ -32,7 +32,7 @@
       </template>
 
       <template slot-scope="{disabled,size}" slot="categorySearch">
-        <avue-input-tree :check-strictly="true" multiple v-model="search.category" placeholder="請選擇內容" type="tree" :dic="typeList" :props="props"></avue-input-tree>
+        <avue-input-tree :check-strictly="false" multiple v-model="search.category" placeholder="請選擇內容" type="tree" :dic="typeList" :props="props"></avue-input-tree>
       </template>
 
 

src/views/bank/keypwd.vue

@@ -61,10 +61,10 @@
       </template>
 
       <template slot="titleForm" slot-scope="{row, index}">
-        <div v-html="title" style="white-space: pre-line;color: red;font-width: bold;"></div>
+        <div v-html="title" style="white-space: pre-line;color: red;font-weight: bold;"></div>
       </template>
       <template slot="titleLabel" slot-scope="{row, index}">
-        <span style="color: red;font-width: bold;">注意事項：</span>
+        <span style="color: red;font-weight: bold;">注意事項：</span>
       </template>
 
     </avue-crud>

src/views/bank/returns.vue

@@ -176,8 +176,6 @@
               label: "業務類型",
               prop: "isPublic",
               type: "select",
-              search: true,
-              searchSpan: 4,
               dataType: "string",
               dicUrl: `/api/blade-system/dict/dictionary?code=business_type`,
               props: {
@@ -194,6 +192,19 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "業務類型",
+              prop: "isPublicSearch",
+              type: "select",
+              search: true,
+              searchSpan: 4,
+              dataType: "string",
+              dicUrl: `/api/blade-system/dict/dictionary?code=business_type`,
+              props: {
+                label: "dictValue",
+                value: "dictKey"
+              },
+            },
             {
               label: "銀行號",
               prop: "bankNo",
@@ -781,6 +792,9 @@ debugger
         if (params.customerName){
           params.customerName = params.customerName.trim()
         }
+        if (params.isPublicSearch){
+          params.isPublic = params.isPublicSearch;
+        }
 
         this.query = params;
         this.page.currentPage = 1;

src/views/bank/sealhandover-keep.vue

@@ -119,10 +119,11 @@
               props:{
                 label: "dictValue",
                 value: "dictKey",
-              },dicFormatter: (res) => {
+              },
+              /*dicFormatter: (res) => {
                 res.data.forEach(item => {item.disabled = item.isSealed == 1;})
                 return res.data;
-              },
+              },*/
               search: true,
               searchMultiple: true,
               rules: [{

src/views/bank/sealhandover.vue

@@ -62,10 +62,10 @@
       </template>
 
       <template slot="titleForm" slot-scope="{row, index}">
-        <div v-html="title" style="white-space: pre-line;color: red;font-width: bold;"></div>
+        <div v-html="title" style="white-space: pre-line;color: red;font-weight: bold;"></div>
       </template>
       <template slot="titleLabel" slot-scope="{row, index}">
-        <span style="color: red;font-width: bold;">注意事項：</span>
+        <span style="color: red;font-weight: bold;">注意事項：</span>
       </template>
 
       <template slot="isTurnIn" slot-scope="{row, index}">
@@ -186,9 +186,6 @@
               props:{
                 label: "dictValue",
                 value: "dictKey",
-              },dicFormatter: (res) => {
-                res.data.forEach(item => {item.disabled = item.isSealed == 1;})
-                return res.data;
               },
               search: true,
               hide: true,

src/views/bank/tellertrunk.vue

@@ -48,10 +48,10 @@
       </template>
 
       <template slot="titleForm" slot-scope="{row, index}">
-        <div v-html="title" style="white-space: pre-line;color: red;font-width: bold;"></div>
+        <div v-html="title" style="white-space: pre-line;color: red;font-weight: bold;"></div>
       </template>
       <template slot="titleLabel" slot-scope="{row, index}">
-        <span style="color: red;font-width: bold;">注意事項：</span>
+        <span style="color: red;font-weight: bold;">注意事項：</span>
       </template>
 
     </avue-crud>
@@ -206,8 +206,6 @@
               label: "檢查單位",
               prop: "checkUnit",
               type: "select",
-              search: true,
-              searchSpan: 4,
               multiple: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=unit_type",
               props:{
@@ -248,8 +246,6 @@
               label: "檢查內容",
               prop: "checkContent",
               type: "select",
-              search: true,
-              searchSpan: 4,
               multiple: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=check_content_tellertrunk",
               props:{
@@ -278,6 +274,46 @@
                 trigger: "blur"
               }]
             },
+            {
+              label: "檢查單位",
+              prop: "checkUnitSearch",
+              type: "select",
+              search: true,
+              hide: true,
+              display: false,
+              searchSpan: 4,
+              dicUrl: "/api/blade-system/dict/dictionary?code=unit_type",
+              props:{
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
+            {
+              label: "檢查內容",
+              prop: "checkContentSearch",
+              type: "select",
+              search: true,
+              searchSpan: 4,
+              hide: true,
+              display: false,
+              dicUrl: "/api/blade-system/dict/dictionary?code=check_content_tellertrunk",
+              props:{
+                label: "dictValue",
+                value: "dictKey",
+              },
+            },
+            {
+              label: "檢查時間開始",
+              prop: "checkTimeBegin",
+              type: "datetime",
+              format: "yyyy-MM-dd HH:mm",
+              valueFormat: "yyyy-MM-dd HH:mm",
+              rules: [{
+                required: true,
+                message: "請輸入檢查時間開始",
+                trigger: "blur"
+              }]
+            },
             {
               label: "檢查時間結束",
               prop: "checkTimeEnd",
@@ -634,11 +670,11 @@
         this.onLoad(this.page);
       },
       searchChange(params, done) {
-        if (params.checkUnit){
-          params.checkUnit = params.checkUnit.join();
+        if (params.checkUnitSearch){
+          params.checkUnit = params.checkUnitSearch;
         }
-        if (params.checkContent){
-          params.checkContent = params.checkContent.join();
+        if (params.checkContentSearch){
+          params.checkContent = params.checkContentSearch;
         }
         if (params.orgNos){
           params.orgNostr = params.orgNos.join();