待经办自定义列添加全选

src/model/Trnrel/Event.js

@@ -86,7 +86,7 @@ export default {
             this.$notify.error({ title: '错误', message: '服务请求失败！' });
         }
     },
-    async onHandle(idx,row) {
+    async onHandle(idx, row) {
 
 
         let viewurl = "/review/ditopn";
@@ -94,7 +94,7 @@ export default {
         let pageId = this.model.pageId;
         debugger;
 
-        this.$router.push({path:viewurl,query:{routeParams: {process: "1", commitFlag: "1"},trn:row['INR'],idx:idx,pageId:pageId}});
+        this.$router.push({ path: viewurl, query: { routeParams: { process: "1", commitFlag: "1" }, trn: row['INR'], idx: idx, pageId: pageId } });
 
     },
 
@@ -103,8 +103,8 @@ export default {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
-        }).then(async ()=>{
-            const selIds = [idx+1]; //rowno选中行
+        }).then(async () => {
+            const selIds = [idx + 1]; //rowno选中行
             const selDst = "trncorco.trnstm" //列表对应后台模型中的stream
 
             let params = { selDst: selDst, selIds: selIds };
@@ -115,16 +115,16 @@ export default {
 
                 let errorMsg = "";
                 let fieldErrorsFlag = (JSON.stringify(rtnmsg.fieldErrors) == "{}");
-                if(!fieldErrorsFlag){
+                if (!fieldErrorsFlag) {
                     let errorMsgkey = "";
                     let errorMsgVal = "";
                     for (const key in rtnmsg.fieldErrors) {
                         errorMsgkey = key;
                         errorMsgVal = rtnmsg.fieldErrors[key];
                     }
-                    errorMsg = errorMsgkey+':'+errorMsgVal;
-                    this.$notify.error({title: '错误',message: '复核失败！错误信息['+errorMsg+']'});
-                }else{
+                    errorMsg = errorMsgkey + ':' + errorMsgVal;
+                    this.$notify.error({ title: '错误', message: '复核失败！错误信息[' + errorMsg + ']' });
+                } else {
                     this.$notify({
                         title: '成功',
                         message: '复核成功',
@@ -142,18 +142,18 @@ export default {
             else {
                 let errorMsg = "";
                 let fieldErrorsFlag = (JSON.stringify(rtnmsg.fieldErrors) == "{}");
-                if(!fieldErrorsFlag){
+                if (!fieldErrorsFlag) {
                     let errorMsgkey = "";
                     let errorMsgVal = "";
                     for (const key in rtnmsg.fieldErrors) {
                         errorMsgkey = key;
                         errorMsgVal = rtnmsg.fieldErrors[key];
                     }
-                    errorMsg = errorMsgkey+':'+errorMsgVal;
-                }else if(rtnmsg.respMsg){
+                    errorMsg = errorMsgkey + ':' + errorMsgVal;
+                } else if (rtnmsg.respMsg) {
                     errorMsg = rtnmsg.respMsg;
                 }
-                this.$notify.error({title: '错误',message: '复核失败！错误信息['+errorMsg+']'});
+                this.$notify.error({ title: '错误', message: '复核失败！错误信息[' + errorMsg + ']' });
             }
 
 
@@ -355,20 +355,29 @@ export default {
         // })
         // }
         const res = await this.executeRule("searow")
-        const arr=[];
+        const arr = [];
         res.data.trncorco_trnstm.rows.forEach(element => {
-            switch(element.charAt(0)){
+            switch (element.charAt(0)) {
                 case 'W':
-                      arr.push("Waiting"+element.substring(1));
+                    arr.push("Waiting" + element.substring(1));
                     break;
                 case 'C':
-                      arr.push("Correct"+element.substring(1));
+                    arr.push("Correct" + element.substring(1));
                     break;
                 case 'P':
-                      arr.push("Picked up" + element.substring(1))  ;
+                    arr.push("Picked up" + element.substring(1));
                     break;
                 case 'N':
-                      arr.push("Rejected" + element.substring(1))  ;
+                    arr.push("Rejected" + element.substring(1));
+                    break;
+                case 'E':
+                    arr.push("Entered" + element.substring(1));
+                    break;
+                case 'X':
+                    arr.push("External" + element.substring(1));
+                    break;
+                case 'M':
+                    arr.push("Closed" + element.substring(1));
                     break;
                 default:
                     arr.push(element);
@@ -377,7 +386,7 @@ export default {
         });
         that.$refs.inftrnps.stmData.data = arr;
         this.model.trncorco.trnstm = res.data.trncorco_trnstm;
-        if(res.data.trncorco_trnstm.rows.length == 0){
+        if (res.data.trncorco_trnstm.rows.length == 0) {
             this.$notify({
                 title: '成功',
                 message: '搜索完毕，无满足条件记录',

src/views/Business/Sptsel/Menu.vue

@@ -332,30 +332,20 @@
       append-to-body
     >
       <el-form-item label-width="0">
-        <el-checkbox v-model="setColumn.column1.value">交易代码</el-checkbox>
-        <el-checkbox v-model="setColumn.column2.value">业务编号</el-checkbox>
-        <el-checkbox v-model="setColumn.column3.value">交易名称</el-checkbox>
-        <el-checkbox v-model="setColumn.column4.value">状态</el-checkbox>
-        <el-checkbox v-model="setColumn.column5.value">报文类型</el-checkbox>
-        <el-checkbox v-model="setColumn.column6.value">对方银行BIC</el-checkbox>
-        <el-checkbox v-model="setColumn.column7.value">创建时间</el-checkbox>
-        <el-checkbox v-model="setColumn.column8.value">币种</el-checkbox>
-        <el-checkbox v-model="setColumn.column9.value">金额</el-checkbox>
-        <el-checkbox v-model="setColumn.column10.value">创建人</el-checkbox>
-        <el-checkbox v-model="setColumn.column11.value"
-          >当前操作柜员</el-checkbox
+        <el-checkbox-group v-model="columnGroup" @change="handleColumnChange">
+        <el-checkbox
+          v-for="item in setColumn"
+          :key="item.label"
+          :label="item.index"
+          >{{ item.label }}</el-checkbox
         >
-        <el-checkbox v-model="setColumn.column12.value">当前组别</el-checkbox>
-        <el-checkbox v-model="setColumn.column13.value"
-          >上次操作柜员</el-checkbox
-        >
-        <el-checkbox v-model="setColumn.column14.value">来源</el-checkbox>
-        <el-checkbox v-model="setColumn.column15.value">提示</el-checkbox>
-        <el-checkbox v-model="setColumn.column16.value">信息提示</el-checkbox>
+        </el-checkbox-group>
       </el-form-item>
       <span slot="footer">
-        <el-checkbox class="cbClass" v-model="selectAll" @change="setAll">全选</el-checkbox>
-        <el-button type="primary" @click="setColumnEvent">保存</el-button>
+        <el-checkbox class="cbClass" :indeterminate="isIndeterminate" v-model="selectAll" @change="setAll"
+          >全选</el-checkbox
+        >
+        <el-button type="primary" @click="saveColumnEvent">保存</el-button>
       </span>
     </el-dialog>
     <!-- <el-row style="margin-top: 2rem">
@@ -420,6 +410,7 @@ export default {
       setColumnFlg: false,
       saveColumnFlg: true,
       selectAll: true,
+      isIndeterminate: false,
       transactionStatus: {
         busiNo: "",
         modTimes: 0,
@@ -428,24 +419,8 @@ export default {
         earnCount: 0,
         earnAmt: 0,
       },
-      setColumn: {
-        column1: { index: 1, value: true },
-        column2: { index: 2, value: true },
-        column3: { index: 3, value: true },
-        column4: { index: 4, value: true },
-        column5: { index: 5, value: true },
-        column6: { index: 6, value: true },
-        column7: { index: 7, value: true },
-        column8: { index: 8, value: true },
-        column9: { index: 9, value: true },
-        column10: { index: 10, value: true },
-        column11: { index: 11, value: true },
-        column12: { index: 12, value: true },
-        column13: { index: 13, value: true },
-        column14: { index: 14, value: true },
-        column15: { index: 15, value: true },
-        column16: { index: 16, value: true },
-      },
+      setColumn: [],
+      columnGroup: [],
       stmData: {
         columns: [
           '4 1 "交易代码" 70 ',
@@ -489,6 +464,7 @@ export default {
     // await this.handleSearch()
     // this.$store.commit("setTaskList", {key: "sptsel", val: this.stmData.data.length})
   },
+
   methods: {
     sourceChangeEvent(val) {
       this.sourceData.forEach((s) => {
@@ -501,29 +477,30 @@ export default {
     clounmSetting() {
       this.setColumnFlg = true;
     },
-    setColumnEvent() {
+    saveColumnEvent() {
       this.setColumnFlg = false;
       this.saveColumnFlg = false;
-      const arr = [];
-      for (const o in this.setColumn) {
-        if (this.setColumn[o].value) {
-          arr.push(this.stmData.columns[this.setColumn[o].index - 1]);
-        }
-      }
-      this.saveColumns = arr;
+      this.saveColumns = this.setColumn.filter(item=>item.value).map(item=>this.stmData.columns[item.index]);
+    },
+    setAll(val) {
+      this.columnGroup = val ?  this.setColumn.map((item)=>{return item.index}) : [];
+      this.isIndeterminate = false;
     },
-    setAll() {
-      for (const o in this.setColumn) {
-        if (this.selectAll) {
-          this.setColumn[o].value = true;
-        } else {
-          this.setColumn[o].value = false;
-        }
-      }
+    handleColumnChange() {
+      this.selectAll = this.setColumn.length===this.columnGroup.length;
+      this.isIndeterminate = this.columnGroup.length>0 && this.columnGroup.length<this.setColumn.length;
     },
     ...Event,
   },
-  created: function () {},
+  created: function () {
+    this.setColumn = this.stmData.columns.map((item,index)=>{
+      let begIdx = item.indexOf('"')
+      let endIdx = item.indexOf('"',begIdx+1)
+      let label = item.substring(begIdx+1,endIdx)
+      return {label,value:true,index}
+    })
+    this.columnGroup = this.setColumn.map((item)=>{return item.index})
+  },
 };
 </script>
 <style scoped>
@@ -531,7 +508,7 @@ export default {
   width: 60px;
   font-size: 13px;
 }
-.cbClass>>> .el-checkbox__label {
+.cbClass >>> .el-checkbox__label {
   width: 30px;
   font-size: 13px;
   padding-left: 5px;

src/views/Business/Trnrel/Inftrnps.vue

@@ -549,7 +549,7 @@ export default {
           '9 7 "签名要求" 70',
           '2 8 "签名状态" 70',
           '16 9 "经办柜员" 70',
-          '0 10 "业务状态" 70',
+          '0 10 "业务状态" 80',
           '15 11 "业务机构" 120',
         ],
         data: [],