修復

src/components/common/returns-issue.vue

@@ -79,7 +79,7 @@
                 trigger: "blur"
               }]
             },
-            {
+            /*{
               label: "序號",
               prop: "serialNo",
               disabled: true,
@@ -88,7 +88,7 @@
                 message: "請輸入序號",
                 trigger: "blur"
               }]
-            },
+            },*/
             {
               label: "支行",
               prop: "subBank",

src/views/bank/returns.vue

@@ -49,7 +49,7 @@
                    @click="handleDownload">下載
         </el-button>
         <el-button type="primary" size="small" :disabled="issueBatchBtn" v-if="permission.returns_issue" @click="issueBatch">批量發佈</el-button>
-        <el-button type="primary" size="small" :disabled="approveBatchBtn" v-if="permission.returns_approve" @click="approveBatch"><i class="el-icon-check"></i>批量確認</el-button>
+        <el-button type="primary" size="small" v-if="permission.returns_approve" @dblclick="approveBatch(true)" @click="approveBatch(false)"><i class="el-icon-check"></i>批量確認</el-button>
       </template>
 
       <template slot="menu" slot-scope="{row, index}">
@@ -176,6 +176,8 @@
               label: "業務類型",
               prop: "isPublic",
               type: "select",
+              hide: true,
+              viewDisplay: false,
               dataType: "string",
               dicUrl: `/api/blade-system/dict/dictionary?code=business_type`,
               props: {
@@ -197,6 +199,7 @@
               prop: "isPublicSearch",
               type: "select",
               hide: true,
+              display: false,
               search: true,
               searchSpan: 4,
               dataType: "string",
@@ -223,6 +226,7 @@
               label: "機構號",
               prop: "orgNo",
               hide: true,
+              viewDisplay: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -234,6 +238,7 @@
               prop: "orgName",
               hide: true,
               disabled: true,
+              viewDisplay: false,
               rules: [{
                 required: true,
                 message: "請輸入機構號",
@@ -643,21 +648,37 @@
           })
 
       },
-      approveBatch(){
-        this.$refs.crud.toggleSelection();
-        let toApproveArr = [];
-        for (let i = 0; i < this.data.length; i++) {
-          let item = this.data[i];
-          if (item.process == 3){
-            toApproveArr.push(item)
+      approveBatch(isDbclick){
+        if (this.selectionList.length > 0){
+          if (this.approveBatchBtn){
+            //选中的必须都为待确认信息
+            this.$message.warning("選中的必須都為待確認信息！");
+            return;
+          }else{
+            this.approveBatchVisible = true;
+          }
+        }else {
+          this.$refs.crud.toggleSelection();
+          let toApproveArr = [];
+          for (let i = 0; i < this.data.length; i++) {
+            let item = this.data[i];
+            if (item.process == 3){
+              toApproveArr.push(item)
+            }
+          }
+          if (toApproveArr.length  == 0){
+            this.$message.warning("當前頁沒有符合條件的記錄！")
+            return;
+          }
+          this.$refs.crud.toggleSelection(toApproveArr);
+          if (isDbclick){
+            this.approveBatchVisible = true;
           }
         }
-        if (toApproveArr.length  == 0){
-          this.$message.warning("當前頁沒有符合條件的記錄！")
-          return;
-        }
-        this.$refs.crud.toggleSelection(toApproveArr);
-        this.approveBatchVisible = true;
+
+
+
+
       },
       approve(row, index){
         this.approveVisible = true;
@@ -811,15 +832,15 @@
             let item = list[i];
             delFlag = delFlag && item.process <= 2 && ((item.personId && item.personId.indexOf(this.userInfo.user_id) != -1) || item.createUser == this.userInfo.user_id);
             issueFlag = issueFlag && item.process == 2  && (item.personId && item.personId.indexOf(this.userInfo.user_id) != -1);
-            approveFlag = approveFlag && item.process == 3;
+            approveFlag = approveFlag && item.process == 3 && this.permission.returns_approve;
           }
           this.delBatchBtn = !delFlag;
           this.issueBatchBtn = !issueFlag;
-          // this.approveBatchBtn = !approveFlag;
+          this.approveBatchBtn = !approveFlag;
         }else{
           this.delBatchBtn = true;
           this.issueBatchBtn = true;
-          // this.approveBatchBtn = true;
+          this.approveBatchBtn = true;
         }
       },
       selectionClear() {