Merge remote-tracking branch 'origin/承诺客户周一处理的问题' into screen_20230523

src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue

@@ -160,6 +160,9 @@
                v-has="'incomePaymentAndInvoiving:invoicing'">开票</a>
             <!--   确认收入项目--- 普通项目、工作组项目、资料网员 项目 可以确认收入 报名状态是 待审核的时候 不能确认收入？-->
             <a v-has="'incomePaymentAndInvoiving:confirmPayment'" @click="confirmPayment(record)">确认收入</a>
+            <!--工作组项目、普通项目、资料网员项目可以修改发票信息-->
+            <a  v-has="'packProject:changeInvoiceInfo'" @click="changeInvoiceInfo(record)" :disabled="Number(record.projectType) !== ProjectTypeEnums.GENERAL_PRO.value && Number(record.projectType) !== ProjectTypeEnums.GROUP_PRO.value && Number(record.projectType) !== ProjectTypeEnums.MEMBER_PRO.value">开票类型</a>
+
           </span>
         </a-table>
       </div>
@@ -208,6 +211,16 @@
       :project-type="selectProjectType"
       :visible.sync="confirmStageVisible"
     ></confirm-stage-module>
+
+    <!--修改开票类型-->
+    <invoice-info-change-module
+      ref="changeInvoiceInfo"
+      :project-id="selectProjectId"
+      :project-type="selectProjectType"
+      @ok="modalFormOk"
+    >
+    </invoice-info-change-module>
+
   </div>
 </template>
 
@@ -229,13 +242,14 @@ import AuditModal from '@views/incomePayments/meetManage/modules/AuditModal'
 import ConfirmStageModule from './modules/ConfirmStageModule'
 import {getPayConfirmList} from '../../../api/incomePaymentsApi'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
+import InvoiceInfoChangeModule from '../../packManagement/modules/InvoiceInfoChangeModule'
 
 // 项目类型 数据字典 的定义 和数据库的保持一致
 const ProjectTypeEnums = {
   GENERAL_PRO: {name: '普通项目', value: 1},
   GROUP_PRO: {name: '工作组项目', value: 2},
   MEETING_PRO: {name: '会议项目', value: 3},
-  MEMBER_PRO: {name: '会员项目', value: 4},
+  MEMBER_PRO: {name: '资料网员', value: 4},
   STANDARD_MEMBER_PRO: {name: '标协会员项目', value: 5},
   STANDARD_CERTIFICATE_PRO: {name: '标协证书项目', value: 6},
 }
@@ -255,7 +269,8 @@ export default {
     BatchInvoicingModule,
     AuditProofModule,
     AuditModal,
-    ConfirmStageModule
+    ConfirmStageModule,
+    InvoiceInfoChangeModule
   },
   mixins: [JeroListMixin],
   data() {
@@ -369,7 +384,7 @@ export default {
           dataIndex: 'action',
           align: 'center',
           fixed: 'right',
-          width: 250,
+          width: 300,
           scopedSlots: {customRender: 'action'}
         }
       ],
@@ -581,6 +596,20 @@ export default {
         }
         return
       }
+    },
+    /**
+     * 开票类型-修改开票类型，只有工作组项目、普通项目、资料网员项目可以修改
+     * @param record
+     */
+    changeInvoiceInfo(record) {
+      // 二次判断
+      if (Number(record.projectType) !== ProjectTypeEnums.GENERAL_PRO.value && Number(record.projectType) !== ProjectTypeEnums.GROUP_PRO.value && Number(record.projectType) !== ProjectTypeEnums.MEMBER_PRO.value) return
+      this.selectProjectType = record.projectType
+      this.selectProjectId = record.id
+      record.companyId = record.chargeCompanyId
+      // this.confirmStageVisible = true
+      this.$refs.changeInvoiceInfo.open(record)
+
     }
   }
 }

src/views/packManagement/PackProjectMaintenance.vue

@@ -616,6 +616,8 @@ export default {
      * @param record
      */
     changeInvoiceInfo(record) {
+      // 二次判断
+      if (Number(record.projectType) !== ProjectTypeEnums.GENERAL_PRO.value && Number(record.projectType) !== ProjectTypeEnums.GROUP_PRO.value && Number(record.projectType) !== ProjectTypeEnums.MEMBER_PRO.value) return
       this.selectProjectType = record.projectType
       this.selectProjectId = record.id
       record.companyId = this.companyDataById.companyId