From 1f6f8d00ed6a61049739821d13e494acf93eb5d4 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 1 Sep 2021 10:56:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81=E6=8F=92?=
 =?UTF-8?q?=E6=A7=BD=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tools/StatusSlot.vue           | 71 ++++++++++---------
 .../memberManage/SafeguardMemberList.vue      |  8 ++-
 2 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue
index 82651fa..9b4e5e1 100644
--- a/src/components/tools/StatusSlot.vue
+++ b/src/components/tools/StatusSlot.vue
@@ -1,62 +1,67 @@
 <template>
   <div>
-    <!--应收金额为 0 到账 开票 邮寄 显示zero-->
-    <img v-if="status === 0" src=".././../assets/imgs/zero.png"/>
-    <!--完成 -->
-    <img v-if="status === 1" src=".././../assets/imgs/finished.png"/>
-    <!--进行一半-->
-    <img v-if="status === 2" src=".././../assets/imgs/half.png"/>
-<!--    &lt;!&ndash;没有&ndash;&gt;-->
-    <img v-if="status === 3" src=".././../assets/imgs/error.png" @click="s"/>
-<!--    <slot :name="name">{{name}}</slot>-->
+    <img :src="status" @click="s"/>
   </div>
 </template>
 
 <script>
+import zero from '../../assets/imgs/zero.png'
+import finished from '../../assets/imgs/finished.png'
+import half from '../../assets/imgs/half.png'
+import error from '../../assets/imgs/error.png'
+
 export default {
   name: "StatusSlot",
   props: {
+    /*
+    *  表格行对象
+    * */
     statuObj: {
       type: Object,
       required: false
     },
     /*
-    *  0 代表是打包 和需要发票
-    *  1 代表其他三个
+    *  false 代表是打包 和需要发票
+    *  true 代表其他三个
     * */
     statusType: {
-      type: Number,
-      required: false
+      type: Boolean,
+      required: false,
+      default:false
     },
     /*
     *  具体的状态值
     * */
-    statusNo:{
+    statusNo: {
       type: Number,
       required: false
-    },
-    // name:{
-    //   type:Number,
-    // }
+    }
   },
   computed: {
     status() {
-      // 应收金额为 0 到账 开票 邮寄 显示zero
-      if (this.statuObj.amountReceivable === 0 || this.statuObj.amountReceivable < 0  ) {
-        return 0
-      } else {
-        // 应收金额不为0
-        // 未完成
-        if(this.statusNo === 0){
-          return 3
+      if (this.statuObj.amountReceivable === 0) {
+        if(this.statusType){
+          // 应收金额为0  未到账 未邮寄 未开票的状态
+          return zero
+        }else {
+          // 应收金额为0  打包 与需要开票的状态
+          if(this.statusNo === 0 ){
+            return error
+          }else if(this.statusNo === 1){
+            return finished
+          }else if(this.statusNo == 2){
+            return half
+          }
         }
-        // 完成
-        if(this.statusNo === 1){
-          return 1
-        }
-        // 一半
-        if(this.statusNo === 2){
-          return 2
+
+      }else {
+        // 应收金额不为0 都正常判断
+        if(this.statusNo === 0 ){
+          return error
+        }else if(this.statusNo === 1){
+          return finished
+        }else if(this.statusNo == 2){
+          return half
         }
       }
     }
diff --git a/src/views/incomePayments/memberManage/SafeguardMemberList.vue b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
index d743845..795c1f4 100644
--- a/src/views/incomePayments/memberManage/SafeguardMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardMemberList.vue
@@ -93,6 +93,10 @@
         </template>
 
         <template slot="status" slot-scope="text,record">
+          <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
+        </template>
+
+        <template slot="status-pack" slot-scope="text,record">
           <status-slot :statu-obj="record" :status-no="text"></status-slot>
         </template>
 
@@ -167,13 +171,13 @@ export default {
           title: '打包',
           align: "center",
           dataIndex: 'pack',
-          scopedSlots: {customRender: 'status'}
+          scopedSlots: {customRender: 'status-pack'}
         },
         {
           title: '需要发票',
           align: "center",
           dataIndex: 'needInvoice',
-          scopedSlots: {customRender: 'status'}
+          scopedSlots: {customRender: 'status-pack'}
         },
         {
           title: '到账',