From bf8b6115d74f076a7e8fd2a60a4445abc6a382b0 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 22 Mar 2024 15:22:24 +0800
Subject: [PATCH] =?UTF-8?q?[fix=2082948]=20=E6=89=93=E5=8C=85=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E=E5=90=8E-=E5=88=B0=E8=B4=A6?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=9A=84=E5=88=97=E8=A1=A8=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tools/StatusSlot.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/tools/StatusSlot.vue b/src/components/tools/StatusSlot.vue
index 4cacc3d..237d25e 100644
--- a/src/components/tools/StatusSlot.vue
+++ b/src/components/tools/StatusSlot.vue
@@ -24,6 +24,7 @@ import half from '../../assets/imgs/half.png'
 import error from '../../assets/imgs/error.png'
 // 获得当前行数据的方法，默认写的是 普通项目获得数据的方法，其他模块需要以传参的方式修改相应的方法
 import { queryCommonProjectById } from '../../api/incomePaymentsApi'
+import { ProjectTypeEnums } from '@/enums/commonEnums'
 
 export default {
   name: 'StatusSlot',
@@ -80,8 +81,9 @@ export default {
   computed: {
     // eslint-disable-next-line vue/return-in-computed-property
     status() {
-      // 如果有打包字段 && 当前列不是打包列 && 当前行是打包为"是"
-      if (this.packField && this.statusKey !== 'pack' && this.statuObj[this.packField] === 1) {
+      // 非打包项目，其他项目如果被打包，就除了打包列全部置灰
+      // 如果有打包字段 && 当前列不是打包列 && 当前行是打包为"是" && 当前项目不是打包项目
+      if (this.packField && this.statusKey !== 'pack' && this.statuObj[this.packField] === 1 && this.statuObj.projectType !== ProjectTypeEnums.PACK_PRO.value) {
         return zero
       }
       if (this.statuObj.amountReceivable === '0.00' || this.statuObj.receivableAmount === '0.00') {