From bb8fa37451ba02333b94278ddf464c79e6ba7d01 Mon Sep 17 00:00:00 2001
From: "songnan.zhang" <songnan.zhang@ccwin-in.com>
Date: Sat, 25 Dec 2021 08:05:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pg-fis/basedate/m100Online/ScrapMB.vue    |  5 ++-
 .../pg-fis/basedate/m100Online/ScrapZHB.vue   | 34 +++++++++----------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
index ecdff526..d300b26a 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
@@ -297,7 +297,10 @@ export default {
       dialogTableVisible: false,
       zflist: null,
       zuofei: [],
-      getRowKeys: (row) => {
+      getRowKeys:
+      
+      
+      (row) => {
         return row.id; //这里看这一行中需要根据哪个属性值是id
       },
       expands: [], //只展开一行放入当前行id
diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
index 6d80af76..4256dae6 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
@@ -201,7 +201,11 @@
       </div>
     </div>
     <div>
-      <el-dialog title="作废信息" append-to-body="true" :visible.sync="dialogTableVisible">
+      <el-dialog
+        title="作废信息"
+        append-to-body="true"
+        :visible.sync="dialogTableVisible"
+      >
         <el-table :data="zflist">
           <el-table-column
             property="billNum"
@@ -240,7 +244,7 @@
           ></el-table-column>
         </el-table>
         <div slot="footer" class="dialog-footer">
-         <el-button type="text" @click="dialogTableVisible = false"
+          <el-button type="text" @click="dialogTableVisible = false"
             >取消</el-button
           >
           <el-button type="primary" @click="handleDelete">确 认</el-button>
@@ -295,8 +299,9 @@ export default {
     };
     return {
       crmType: "M100Online-MB",
-      dialogTableVisible :false,
-        zflist:null,
+      dialogTableVisible: false,
+      zuofei: [],
+      zflist: null,
       getRowKeys: (row) => {
         return row.id; //这里看这一行中需要根据哪个属性值是id
       },
@@ -566,20 +571,14 @@ export default {
           this.listQuery
         )
         .then((response) => {
-          response.items.forEach((item)=>{
-            if(item.printType == 0)
-            {
+          response.items.forEach((item) => {
+            if (item.printType == 0) {
               item.printType = "正常打印";
-            }
-            else if(item.printType == 1)
-            {
+            } else if (item.printType == 1) {
               item.printType = "重打";
-            }
-            else
-            {
+            } else {
               item.printType = "补打";
             }
-
           });
           this.list = response.items;
           this.totalCount = response.totalCount;
@@ -680,7 +679,7 @@ export default {
         })
         .catch(() => {});
     },
-     //作废详情页确认按钮
+    //作废详情页确认按钮
     handleDelete() {
       //debugger;
       let params = this.zuofei;
@@ -698,10 +697,9 @@ export default {
             type: "success",
             duration: 2000,
           });
-          
         });
-          this.dialogTableVisible = false;
-          this.getList();
+      this.dialogTableVisible = false;
+      this.getList();
     },
     //作废操作，支持批量操作-门板
     // handleDelete(row) {