修復

src/components/common/returns-approve-batch.vue

@@ -23,7 +23,7 @@
           printBtn: false,
           emptyBtn: false,
           column: [
-            {
+            /*{
               label: "接辦行經辦",
               prop: "handlingBank",
               rules: [{
@@ -40,7 +40,7 @@
                 message: "请输入接辦行覆核",
                 trigger: "blur"
               }]
-            },
+            },*/
             {
               label: "跟進情況",
               prop: "handlingStatus",

src/views/bank/checklist.vue

@@ -170,18 +170,6 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: "核對日期",
-              prop: "checkDate",
-              type: "datetime",
-              format: "yyyy-MM-dd",
-              valueFormat: "yyyy-MM-dd",
-              rules: [{
-                required: true,
-                message: "请输入核對日期",
-                trigger: "blur"
-              }]
-            },
             {
               label: "核對日期",
               prop: "checkDateRange",
@@ -225,6 +213,29 @@
                 }
                 return result;
               },
+              change: ({value}) => {
+                if (!value || value.length == 0) return;
+                let arr = [];
+                let itemArr = [];
+                if (this.cycle == "day"){
+                  itemArr = this.dayItem;
+                }
+                if (this.cycle == "week"){
+                  itemArr = this.weekItem;
+                }
+                if (this.cycle == "month"){
+                  itemArr = this.monthItem;
+                }
+
+                for (let i = 0; i < itemArr.length; i++) {
+                  let item = itemArr[i];
+                  if (item.dictKey.indexOf(value) != -1){
+                    arr.push(item)
+                  }
+                }
+                this.findObject(this.option.column, 'item').dicData = arr;
+                delete this.form.item;
+              },
               rules: [{
                 required: true,
                 message: "请输入分類",
@@ -239,6 +250,7 @@
               search: true,
               // searchSpan: 4,
               searchMultiple: true,
+              dicData: [],
               // dicUrl: "/api/blade-system/dict/dictionary?code=check_item",
               props:{
                 label: "dictValue",
@@ -263,7 +275,7 @@
                 trigger: "blur"
               }]
             },
-            {
+            /* {
               label: "核對內容/標準",
               prop: "content",
               type: "select",
@@ -290,7 +302,7 @@
                 trigger: "blur"
               }]
             },
-            {
+           {
               label: "已核對",
               prop: "isChecked",
               formslot: true,
@@ -299,6 +311,18 @@
                 message: "請勾選已核對",
                 trigger: "blur"
               }]
+            },*/
+            {
+              label: "核對日期",
+              prop: "checkDate",
+              type: "datetime",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              rules: [{
+                required: true,
+                message: "请输入核對日期",
+                trigger: "blur"
+              }]
             },
             {
               label: "核對人",
@@ -435,18 +459,18 @@
 
         if (this.cycle == 'day'){
           this.findObject(this.option.column, 'type').dicData = this.dayType;
-          this.findObject(this.option.column, 'item').dicData = this.dayItem;
-          this.findObject(this.option.column, 'content').dicData = this.dayContent;
+          // this.findObject(this.option.column, 'item').dicData = this.dayItem;
+          // this.findObject(this.option.column, 'content').dicData = this.dayContent;
         }
         if (this.cycle == 'week'){
           this.findObject(this.option.column, 'type').dicData = this.weekType;
-          this.findObject(this.option.column, 'item').dicData = this.weekItem;
-          this.findObject(this.option.column, 'content').dicData = this.weekContent;
+          // this.findObject(this.option.column, 'item').dicData = this.weekItem;
+          // this.findObject(this.option.column, 'content').dicData = this.weekContent;
         }
         if (this.cycle == 'month'){
           this.findObject(this.option.column, 'type').dicData = this.monthType;
-          this.findObject(this.option.column, 'item').dicData = this.monthItem;
-          this.findObject(this.option.column, 'content').dicData = this.monthContent;
+          // this.findObject(this.option.column, 'item').dicData = this.monthItem;
+          // this.findObject(this.option.column, 'content').dicData = this.monthCoRntent;
         }
 
         this.onLoad(this.page);
@@ -482,9 +506,9 @@
               this.monthItem.push(item)
             }
           }
-          this.findObject(this.option.column, 'item').dicData = this.dayItem;
+          // this.findObject(this.option.column, 'item').dicData = this.dayItem;
         })
-        getDictionary({code: 'check_content_normal'}).then(res => {
+        /*getDictionary({code: 'check_content_normal'}).then(res => {
           let data = res.data.data;
           for (let i = 0; i < data.length; i++) {
             let item = data[i];
@@ -499,7 +523,7 @@
             }
           }
           this.findObject(this.option.column, 'content').dicData = this.dayContent;
-        })
+        })*/
       },
       rowSave(row, done, loading) {
         row.isChecked = !row.isChecked ? 0 : 1;

src/views/bank/checkwarehouse.vue

@@ -39,9 +39,9 @@
         <el-button type="text" icon="el-icon-download" size="small" v-if="permission.checkwarehouse_download_file && row.enclosure" @click="fileDownload(row)">附件下載</el-button>
       </template>
 
-      <template slot="checkPersonNameForm">
+     <!-- <template slot="checkPersonNameForm">
         <select-dialog-user :name="form.checkPersonName" :ehr="form.checkPersonNo" :disabled="false" :callback="selectCallback"></select-dialog-user>
-      </template>
+      </template>-->
 
       <template slot="enclosureForm" slot-scope="{row}">
         <avue-form ref="form" :option="attachOption" v-model="attachForm" :upload-after="uploadAfter" :upload-error="uploadError" :upload-delete="uploadDelete" :upload-preview="uploadPreview">
@@ -241,7 +241,7 @@
               type: "select",
               search: true,
               searchSpan: 4,
-              searchMultiple: true,
+              multiple: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=unit_type",
               props:{
                 label: "dictValue",
@@ -252,7 +252,7 @@
                 return res.data;
               },
               change: ({value, column}) => {
-                if (!value) return;
+                /*if (!value) return;
                 let $nameOut = this.findObject(this.option.column, 'checkPersonNameOut');
                 $nameOut.display = value != '1';
                 let $noOut = this.findObject(this.option.column, 'checkPersonNoOut');
@@ -263,7 +263,7 @@
                 $no.display = value == '1';
                 $no.disabled = value == '1';
                 if (!this.form.checkResult) return;
-                /*let $remark = this.findObject(this.option.column, 'remark');
+                let $remark = this.findObject(this.option.column, 'remark');
                 if (value == '1' && this.form.checkResult == '1'){
                   $remark.rules[0].required = false;
                 }else{
@@ -285,6 +285,9 @@
                 label: "dictValue",
                 value: "dictKey",
               },
+              multiple: true,
+              search: true,
+              searchSpan: 4,
               dicFormatter: (res) => {
                 res.data.forEach(item => {item.disabled = item.isSealed == 1;})
                 return res.data;
@@ -301,7 +304,7 @@
               type: "select",
               search: true,
               searchSpan: 4,
-              searchMultiple: true,
+              multiple: true,
               dicUrl: "/api/blade-system/dict/dictionary?code=check_content_warehouse",
               props:{
                 label: "dictValue",
@@ -349,31 +352,9 @@
             {
               label: "查庫人員",
               prop: "checkPersonName",
-              formslot: true,
-              rules: [{
-                required: true,
-                message: "请输入查庫人員姓名",
-                trigger: "change"
-              }]
-            },
-            {
-              label: "查庫人員工號",
-              prop: "checkPersonNo",
-              disabled: true,
-              rules: [{
-                required: true,
-                message: "请输入查庫人員工號",
-                trigger: "blur"
-              }]
-            },
-
-            {
-              label: "查庫人員姓名",
-              prop: "checkPersonNameOut",
-              hide: true,
-              viewDisplay: false,
-              addDisplay: false,
-              editDisplay: false,
+              // formslot: true,
+              type: "array",
+              span: 12,
               rules: [{
                 required: true,
                 message: "请输入查庫人員姓名",
@@ -382,14 +363,12 @@
             },
             {
               label: "查庫人員工號或身份證後四位",
-              prop: "checkPersonNoOut",
-              hide: true,
-              viewDisplay: false,
-              addDisplay: false,
-              editDisplay: false,
+              prop: "checkPersonNo",
+              type: "array",
+              span: 12,
               rules: [{
                 required: true,
-                message: "查庫人員工號或身份證後四位",
+                message: "请输入查庫人員工號或身份證後四位",
                 trigger: "blur"
               }]
             },
@@ -501,12 +480,10 @@
         this.form.checkPersonName = value.name;
       },
       rowSave(row, done, loading) {
-        if (row.checkUnit == 1 && !!row.checkPersonNameOut && !!row.checkPersonNoOut){
-          row.checkPersonName = row.checkPersonNameOut;
-          row.checkPersonNo = row.checkPersonNoOut;
-        }
-       /* row.checkContent = row.checkContent.join();
-        row.checkPurpose = row.checkPurpose.join();*/
+
+        row.checkUnit = row.checkUnit.join();
+        row.checkPurpose = row.checkPurpose.join();
+        row.checkContent = row.checkContent.join();
         add(row).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -520,12 +497,9 @@
         });
       },
       rowUpdate(row, index, done, loading) {
-        if (row.checkUnit == 1 && !!row.checkPersonNameOut && !!row.checkPersonNoOut){
-          row.checkPersonName = row.checkPersonNameOut;
-          row.checkPersonNo = row.checkPersonNoOut;
-        }
-        /*row.checkContent = row.checkContent.join();
-        row.checkPurpose = row.checkPurpose.join();*/
+        row.checkUnit = row.checkUnit.join();
+        row.checkPurpose = row.checkPurpose.join();
+        row.checkContent = row.checkContent.join();
         update(row).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -608,12 +582,6 @@
         this.onLoad(this.page);
       },
       searchChange(params, done) {
-        if (params.checkUnit){
-          params.checkUnit = params.checkUnit.join();
-        }
-        if (params.checkContent){
-          params.checkContent = params.checkContent.join();
-        }
         if (params.orgNos){
           params.orgNostr = params.orgNos.join();
           params.orgNos = '';
@@ -653,6 +621,7 @@
           data.records.forEach(item => {
             item.checkPurpose = item.checkPurpose.split(',');
             item.checkContent = item.checkContent.split(',');
+            item.checkUnit = item.checkUnit.split(',');
           })
 
           this.data = data.records;

src/views/bank/returns.vue

@@ -701,11 +701,10 @@
             this.form = res.data.data;
           });*/
           if (type == "view"){
-            debugger
-            this.findObject(this.option.column, "bankRemark").viewDisplay = this.form.process == 3;
-            this.findObject(this.option.column, "bankConfirmNo").viewDisplay = this.form.process == 3;
-            this.findObject(this.option.column, "bankConfirmName").viewDisplay = this.form.process == 3;
-            this.findObject(this.option.column, "bankConfirmTime").viewDisplay = this.form.process == 3;
+            this.findObject(this.option.column, "bankRemark").viewDisplay = this.form.process == 4;
+            this.findObject(this.option.column, "bankConfirmNo").viewDisplay = this.form.process == 4;
+            this.findObject(this.option.column, "bankConfirmName").viewDisplay = this.form.process == 4;
+            this.findObject(this.option.column, "bankConfirmTime").viewDisplay = this.form.process == 4;
           }
         }
         done();

src/views/report/reportlist.vue

@@ -293,7 +293,7 @@ export default {
       this.findObject(this.option.column, 'dateRange').search = tab.name == 'day';
       this.findObject(this.option.column, 'week').search = tab.name == 'week';
       this.findObject(this.option.column, 'month').search = tab.name == 'month';
-
+      console.log(tab.name)
       this.onLoad(this.page);
     },
     beforeOpen(done, type) {
@@ -355,6 +355,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
+      delete this.query.cycle;
       params.cycle = this.cycle;
       getReport(Object.assign(params, this.query)).then(res => {
         const data = res.data.data;

src/views/wel/index.vue

@@ -33,8 +33,8 @@
                   >
                     <template slot="status" slot-scope="{row, index}">
                       <div align="center">
-                        <i v-if="row.status" style="width:20px;height:20px;border-radius:50%;background-color:green;display: block"></i>
-                        <i v-if="!row.status" style="width:20px;height:20px;border-radius:50%;background-color:red;display: block"></i>
+                        <i v-if="row.checked > 0" style="width:20px;height:20px;border-radius:50%;background-color:green;display: block"></i>
+                        <i v-if="!row.checked > 0" style="width:20px;height:20px;border-radius:50%;background-color:red;display: block"></i>
                       </div>
                     </template>
                   </avue-crud>
@@ -50,8 +50,8 @@
                   >
                     <template slot="status" slot-scope="{row, index}">
                       <div align="center">
-                        <i v-if="row.status" style="width:20px;height:20px;border-radius:50%;background-color:green;display: block"></i>
-                        <i v-if="!row.status" style="width:20px;height:20px;border-radius:50%;background-color:red;display: block"></i>
+                        <i v-if="row.checked > 0" style="width:20px;height:20px;border-radius:50%;background-color:green;display: block"></i>
+                        <i v-if="!row.checked > 0" style="width:20px;height:20px;border-radius:50%;background-color:red;display: block"></i>
                       </div>
                     </template>
                   </avue-crud>
@@ -67,8 +67,8 @@
                   >
                     <template slot="status" slot-scope="{row, index}">
                       <div align="center">
-                        <i v-if="row.status" style="width:20px;height:20px;border-radius:50%;background-color:green;display: block"></i>
-                        <i v-if="!row.status" style="width:20px;height:20px;border-radius:50%;background-color:red;display: block"></i>
+                        <i v-if="row.checked > 0" style="width:20px;height:20px;border-radius:50%;background-color:green;display: block"></i>
+                        <i v-if="!row.checked > 0" style="width:20px;height:20px;border-radius:50%;background-color:red;display: block"></i>
                       </div>
                     </template>
                   </avue-crud>
@@ -91,7 +91,7 @@
 <script>
   import {mapGetters} from "vuex";
   import {getMyInitiated, getToBoReleased, getToBeConfirmed, getMyConfirmation} from "@/api/bank/home";
-  import {getHomeCount} from "../../api/bank/home";
+  import {getHomeCount, getReport} from "../../api/bank/home";
   import {getList} from "@/api/bank/checklist";
   import {getTopMenu, getRoutes} from '@/api/system/menu'
 
@@ -408,7 +408,7 @@
             },
             {
               label: "最近核對時間",
-              prop: "updateTime",
+              prop: "checkDate",
               type: "datetime",
             },
           ],
@@ -443,7 +443,7 @@
             },
             {
               label: "最近核對時間",
-              prop: "updateTime",
+              prop: "checkDate",
               type: "datetime",
             },
           ],
@@ -479,7 +479,7 @@
             },
             {
               label: "最近核對時間",
-              prop: "updateTime",
+              prop: "checkDate",
               type: "datetime",
             },
           ],
@@ -550,7 +550,13 @@
       },
       onLoadDay(page, params = {}){
         params.cycle = "day";
-        getList(page.currentPage, page.pageSize, params).then(res => {
+        getReport(Object.assign(params, this.pageDay)).then(res => {
+          const data = res.data.data;
+          this.dataDay = data;
+          this.loading = false;
+          this.selectionClear();
+        });
+        /*getList(page.currentPage, page.pageSize, params).then(res => {
           const data = res.data.data;
           let list = data.records;
           for (let i = 0; i < list.length; i++) {
@@ -568,11 +574,17 @@
           }
           this.pageDay.total = data.total;
           this.dataDay = list;
-        });
+        });*/
       },
       onLoadWeek(page, params = {}){
         params.cycle = "week";
-        getList(page.currentPage, page.pageSize, params).then(res => {
+        getReport(Object.assign(params, this.pageWeek)).then(res => {
+          const data = res.data.data;
+          this.dataWeek = data;
+          this.loading = false;
+          this.selectionClear();
+        });
+        /*getList(page.currentPage, page.pageSize, params).then(res => {
           const data = res.data.data;
           let list = data.records;
           for (let i = 0; i < list.length; i++) {
@@ -590,14 +602,15 @@
           }
           this.pageWeek.total = data.total;
           this.dataWeek = list;
-        });
+        });*/
       },
       onLoadMonth(page, params = {}){
         params.cycle = "month";
-        getList(page.currentPage, page.pageSize, params).then(res => {
+        getReport(Object.assign(params, this.pageMonth)).then(res => {
           const data = res.data.data;
-          this.pageMonth.total = data.total;
-          this.dataMonth = data.records;
+          this.dataMonth = data;
+          this.loading = false;
+          this.selectionClear();
         });
       },
     },