update 打包字段为"是"其他全部置灰

src/components/tools/StatusSlot.vue

@@ -58,7 +58,7 @@ export default {
       required: false
     },
     // 当前需要转换key的属性, 悬浮显示实际具体内容信息时需要
-    // paymentRecord 来款 confirm-确认收入  mail -- 邮寄 bill--开票
+    // paymentRecord 来款 confirm-确认收入  mail -- 邮寄 bill--开票; pack--打包
     statusKey: {
       type: String,
       required: false,
@@ -69,11 +69,21 @@ export default {
       type: Function,
       required: false,
       default: queryCommonProjectById
+    },
+    // 打包的字段 如果打包,其他的字段全部置灰 如果为空,不做判断
+    packField: {
+      type: String,
+      required: false,
+      default: 'pack'
     }
   },
   computed: {
     // eslint-disable-next-line vue/return-in-computed-property
     status() {
+      // 如果有打包字段 && 当前列不是打包列 && 当前行是打包为"是"
+      if (this.packField && this.statusKey !== 'pack' && this.statuObj[this.packField] === 1) {
+        return zero
+      }
       if (this.statuObj.amountReceivable === '0.00' || this.statuObj.receivableAmount === '0.00') {
         if (this.statusType) {
           // 待确收金额为0  未到账 未邮寄 未开票的状态

src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue

@@ -81,7 +81,13 @@
           <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-key="pack"></status-slot>
+        </template>
+
+        <!--需要发票-->
+        <template slot="status-needInvoice" slot-scope="text,record">
           <status-slot :statu-obj="record" :status-no="text"></status-slot>
         </template>
       </a-table>
@@ -208,7 +214,7 @@ export default {
           title: '需要发票',
           align: 'center',
           dataIndex: 'needInvoice',
-          scopedSlots: { customRender: 'status-pack' },
+          scopedSlots: { customRender: 'status-needInvoice' },
           width: 80
         },
         {

src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue

@@ -64,7 +64,13 @@
                 <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-key="pack"></status-slot>
+              </template>
+
+              <!--需要发票-->
+              <template slot="status-needInvoice" slot-scope="text,record">
                 <status-slot :statu-obj="record" :status-no="text"></status-slot>
               </template>
             </a-table>
@@ -98,7 +104,13 @@
                 <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-key="pack"></status-slot>
+              </template>
+
+              <!--需要发票-->
+              <template slot="status-needInvoice" slot-scope="text,record">
                 <status-slot :statu-obj="record" :status-no="text"></status-slot>
               </template>
             </a-table>
@@ -261,7 +273,7 @@ export default {
           title: '需要发票',
           align: 'center',
           dataIndex: 'invoiceRequirements',
-          scopedSlots: {customRender: 'status-pack'},
+          scopedSlots: {customRender: 'status-needInvoice'},
           width: 80,
         },
         {

src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue

@@ -92,7 +92,13 @@
           <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-key="pack"></status-slot>
+        </template>
+
+        <!--需要发票-->
+        <template slot="status-needInvoice" slot-scope="text,record">
           <status-slot :statu-obj="record" :status-no="text"></status-slot>
         </template>
       </a-table>
@@ -237,7 +243,7 @@ export default {
           align: 'center',
           width: 80,
           dataIndex: 'needInvoice',
-          scopedSlots: { customRender: 'status-pack' }
+          scopedSlots: { customRender: 'status-needInvoice' }
         }, {
           title: '到账',
           align: 'center',

src/views/draftingGroup/DraftingGroupMemberUnitMaintenance.vue

@@ -129,25 +129,6 @@
                         @click="openDetailModal(record)"></j-ellipsis>
           </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-bill" slot-scope="text,record">
-            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
-          </template>
-
-          <!--          邮寄-->
-          <template slot="status-mail" slot-scope="text,record">
-            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
-          </template>
-
-          <template slot="status-pack" slot-scope="text,record">
-            <status-slot :statu-obj="record" :status-no="text"></status-slot>
-          </template>
-
           <template slot="text" slot-scope="text">
             <a-tooltip>
               <template slot="title">{{ text }}</template>
@@ -176,7 +157,6 @@
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import {getDraftingGroupById} from '@api/incomePaymentsApi'
-import StatusSlot from '../../components/tools/StatusSlot'
 import ProjectDetailModal from '../../components/ProjectDetailModal'
 import DraftingGroupMemberUnitModule from './modules/DraftingGroupMemberUnitModule'
 import Vue from 'vue'
@@ -194,7 +174,6 @@ export default {
   components: {
     DraftingGroupMemberUnitCheckModule,
     PageHeaderTitle,
-    StatusSlot,
     ProjectDetailModal,
     DraftingGroupMemberUnitModule,
     PreviewFile

src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue

@@ -151,7 +151,13 @@
             <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
           </template>
 
+          <!--打包-->
           <template slot="status-pack" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" status-key="pack"></status-slot>
+          </template>
+
+          <!--需要发票-->
+          <template slot="status-needInvoice" slot-scope="text,record">
             <status-slot :statu-obj="record" :status-no="text"></status-slot>
           </template>
 
@@ -368,7 +374,7 @@ export default {
           align: 'center',
           width: 80,
           dataIndex: 'needInvoice',
-          scopedSlots: {customRender: 'status-pack'}
+          scopedSlots: {customRender: 'status-needInvoice'}
         }, {
           title: '到账',
           align: 'center',

src/views/incomePayments/meetManage/Attendance.vue

@@ -354,7 +354,13 @@
             <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-key="pack"></status-slot>
+          </template>
+
+          <!--需要发票-->
+          <template slot="status-needInvoice" slot-scope="text,record">
             <status-slot :statu-obj="record" :status-no="text"></status-slot>
           </template>
 
@@ -528,7 +534,7 @@ export default {
           align: 'center',
           dataIndex: 'needInvoice',
           width: 100,
-          scopedSlots: { customRender: 'status-pack' }
+          scopedSlots: { customRender: 'status-needInvoice' }
         },
         {
           title: '到账',

src/views/incomePayments/memberManage/CertificateMaintenanceList.vue

@@ -114,7 +114,13 @@
             ></status-slot>
           </template>
 
-          <template slot="status-pack" slot-scope="text, record">
+          <!--打包-->
+          <template slot="status-pack" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" status-key="pack"></status-slot>
+          </template>
+
+          <!--需要发票-->
+          <template slot="status-needInvoice" slot-scope="text,record">
             <status-slot :statu-obj="record" :status-no="text"></status-slot>
           </template>
 
@@ -225,7 +231,7 @@ export default {
           title: '需要发票',
           align: 'center',
           dataIndex: 'invoiceRequirements',
-          scopedSlots: { customRender: 'status-pack' },
+          scopedSlots: { customRender: 'status-needInvoice' },
         },
         {
           title: '到账',

src/views/incomePayments/memberManage/SafeguardMemberList.vue

@@ -140,7 +140,13 @@
           <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
         </template>
 
+        <!--打包-->
         <template slot="status-pack" slot-scope="text,record">
+          <status-slot :statu-obj="record" :status-no="text" status-key="pack"></status-slot>
+        </template>
+
+        <!--需要发票-->
+        <template slot="status-needInvoice" slot-scope="text,record">
           <status-slot :statu-obj="record" :status-no="text"></status-slot>
         </template>
 
@@ -243,7 +249,7 @@ export default {
           align: 'center',
           width: 80,
           dataIndex: 'needInvoice',
-          scopedSlots: {customRender: 'status-pack'}
+          scopedSlots: {customRender: 'status-needInvoice'}
         },
         {
           title: '到账',

src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue

@@ -167,7 +167,13 @@
           ></status-slot>
         </template>
 
-        <template slot="status-pack" slot-scope="text, record">
+        <!--打包-->
+        <template slot="status-pack" slot-scope="text,record">
+          <status-slot :statu-obj="record" :status-no="text" status-key="pack"></status-slot>
+        </template>
+
+        <!--需要发票-->
+        <template slot="status-needInvoice" slot-scope="text,record">
           <status-slot :statu-obj="record" :status-no="text"></status-slot>
         </template>
 
@@ -322,7 +328,7 @@ export default {
           title: '需要发票',
           align: 'center',
           dataIndex: 'invoiceRequirements',
-          scopedSlots: { customRender: 'status-pack' },
+          scopedSlots: { customRender: 'status-needInvoice' },
         },
         {
           title: '到账',

src/views/packManagement/PackCompanyList.vue

@@ -67,7 +67,7 @@
             <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
           </template>
           <!-- 需要发票 -->
-          <template slot="status-pack" slot-scope="text,record">
+          <template slot="status-needInvoice" slot-scope="text,record">
             <status-slot :statu-obj="record" :status-no="text"></status-slot>
           </template>
           <!--        项目名称-->
@@ -231,7 +231,7 @@ const defaultTableColumns = [
     align: 'center',
     width: 80,
     dataIndex: 'needInvoice',
-    scopedSlots: { customRender: 'status-pack' }
+    scopedSlots: { customRender: 'status-needInvoice' }
   },
   {
     title: '到账',

src/views/packManagement/modules/PackProjectSelectProjectModule.vue

@@ -77,6 +77,12 @@
           <template slot="status-pack" slot-scope="text,record">
             <status-slot :statu-obj="record" :status-no="text"></status-slot>
           </template>
+          <!--          确认收入 -->
+          <template slot="status-confirm" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="confirm"
+                         :get-info-func="getPayConfirmList"></status-slot>
+          </template>
+
         </a-table>
       </div>
     </a-spin>
@@ -88,7 +94,7 @@
 import { JeroListMixin } from '../../../mixins/JeroListMixin'
 import JYearDate from '../../../components/jero/JYearDate'
 import StatusSlot from '../../../components/tools/StatusSlot'
-import { addPackProject } from '../../../api/incomePaymentsApi'
+import {addPackProject, getPayConfirmList} from '../../../api/incomePaymentsApi'
 
 export default {
   name: 'PackProjectSelectProjectModule',
@@ -193,11 +199,11 @@ export default {
           dataIndex: 'makeInvoice',
           scopedSlots: { customRender: 'status' }
         }, {
-          title: '邮寄',
+          title: '确收',
           align: 'center',
           width: 80,
-          dataIndex: 'mail',
-          scopedSlots: { customRender: 'status' }
+          dataIndex: 'affirmIncome',
+          scopedSlots: { customRender: 'status-confirm' }
         }
       ],
       disableMixinCreated: true,
@@ -207,6 +213,7 @@ export default {
     }
   },
   methods: {
+    getPayConfirmList,
     handleOk() {
       if (this.confirmLoading) {
         return

src/views/projectManagement/GeneralProjectManagement.vue

@@ -125,7 +125,13 @@
             <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
           </template>
 
+          <!--打包-->
           <template slot="status-pack" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" status-key="pack"></status-slot>
+          </template>
+
+          <!--需要发票-->
+          <template slot="status-needInvoice" slot-scope="text,record">
             <status-slot :statu-obj="record" :status-no="text"></status-slot>
           </template>
 
@@ -247,7 +253,7 @@ export default {
           align: 'center',
           width: 80,
           dataIndex: 'needInvoice',
-          scopedSlots: { customRender: 'status-pack' }
+          scopedSlots: { customRender: 'status-needInvoice' }
         }, {
           title: '到账',
           align: 'center',

src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue

@@ -174,7 +174,13 @@
             <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
           </template>
 
+          <!--打包-->
           <template slot="status-pack" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" status-key="pack"></status-slot>
+          </template>
+
+          <!--需要发票-->
+          <template slot="status-needInvoice" slot-scope="text,record">
             <status-slot :statu-obj="record" :status-no="text"></status-slot>
           </template>
 
@@ -375,7 +381,7 @@ export default {
           fixed: 'right',
           width: 80,
           dataIndex: 'needInvoice',
-          scopedSlots: { customRender: 'status-pack' }
+          scopedSlots: { customRender: 'status-needInvoice' }
         }, {
           title: '到账',
           align: 'center',