[update] 审核；bug修改

src/api/incomePaymentsApi.js

@@ -97,8 +97,12 @@ const getUserByDepartCode = (param) => getAction('/statistics/allProjectStatisti
 const cancellationContract = (param) => postAction('/contract/payIncomeContract/cancellation', param)
 // 支出合同--作废
 const cancellationExpenditureContract = (param) => postAction('/contract/paySpendingContract/cancellation', param)
-// 到账开票审核缴费凭证时获取最新一条缴费信息
+// 到账开票审核缴费凭证时获取最新一条缴费信息（普通项目、工作组项目、资料网员）
 const getLastProofInfo = (param) => getAction('/paymentCheck/payPaymentCheck/getLastRecord', param)
+// 到账开票审核缴费凭证时获取最新一条缴费信息（标协会员）
+const getStanderMemberLastProofInfo = (param) => getAction('/paymentCheck/payPaymentCheck/getTbMemberProject', param)
+// 到账开票审核缴费凭证时获取最新一条缴费信息（标协证书）
+const getCertificateLastProofInfo = (param) => getAction('/paymentCheck/payPaymentCheck/getTbCertificatePayment', param)
 
 export {
   getWorkingGroupById,
@@ -149,5 +153,7 @@ export {
   cancellationContract,
   councilPublishRemind,
   cancellationExpenditureContract,
-  getLastProofInfo
+  getLastProofInfo,
+  getStanderMemberLastProofInfo,
+  getCertificateLastProofInfo
 }

src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue

@@ -430,8 +430,8 @@ export default {
      * @param record
      */
     auditProof(record) {
-      // 普通项目、工作组项目、会员项目使用新写的审核逻辑
-      if (record.projectType === 1 || record.projectType === 2 || record.projectType === 4) {
+      // 普通项目、工作组项目、会员项目、标协证书、标协会员使用新写的审核逻辑
+      if (!!record.projectType && record.projectType !== 3) {
         this.$refs.auditProof.title = '审核缴费凭证'
         this.$refs.auditProof.open(record)
         return

src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue

@@ -237,7 +237,7 @@ export default {
   &-content {
     padding-right: 20px;
     word-break: break-all;
-    white-space: nowrap;
+    white-space: pre-wrap;
     font-size: 14px;
     font-family: NotoSansHans, NotoSansHans-Light;
     color: #4D4D4D;
@@ -245,7 +245,7 @@ export default {
     &-money {
       color: #D40505;
       word-break: break-all;
-      white-space: nowrap;
+      white-space: pre-wrap;
     }
   }
 

src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue

@@ -29,11 +29,17 @@
           <label>申请人：</label>
           <div>{{ proofInfo.applicantName }}</div>
         </div>
+        <!-- 标协会员、证书的缴费凭证类型根据paymentMethod字段决定：1--图片；2--pdf；3--没有凭证 -->
+        <!-- proofType处理过的缴费凭证类型：img--图片；pdf--pdf；none--无缴费凭证 -->
         <div class="info-item">
           <label>缴费凭证：</label>
-          <div class="proof-img">
+          <div class="proof-img" v-if="proofType === 'img'">
             <img :src="proofSrc(proofInfo.proof)">
           </div>
+          <div v-if="proofType==='pdf'">
+            <preview-file :fileId="proofInfo.proof"></preview-file>
+          </div>
+          <span v-if="proofType==='none'">无</span>
         </div>
         <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-textarea
@@ -78,10 +84,12 @@ import pick from 'lodash.pick'
 import { postAction } from '../../../../api/manage'
 import Vue from 'vue'
 import { USER_INFO } from '../../../../store/mutation-types'
-import { getLastProofInfo } from '../../../../api/incomePaymentsApi'
+import { getLastProofInfo, getStanderMemberLastProofInfo, getCertificateLastProofInfo } from '../../../../api/incomePaymentsApi'
+import PreviewFile from '../../../../components/jero/PreviewFile.vue'
 
 export default {
   name: 'AuditProofModule',
+  components: { PreviewFile },
   data() {
     return {
       title: '来款信息',
@@ -116,7 +124,9 @@ export default {
       proofInfo: {},
       // 是否显示说明
       showInstructions: false,
-      auditUrl: '/paymentCheck/payPaymentCheck/check'
+      auditUrl: '/paymentCheck/payPaymentCheck/check',
+      // 缴费凭证的类型，默认为img，标协会员、证书根据paymentMethod字段决定：1--图片；2--pdf；3--没有凭证
+      proofType: 'img'
     }
   },
   methods: {
@@ -133,15 +143,57 @@ export default {
         this.form.setFieldsValue(pick(this.model, 'reviewerName'))
       })
     },
+    /**
+     * 获取缴费凭证类型
+     * @param record
+     */
+    getProofType(record) {
+      if (record.projectType && (record.projectType.toString() === '5' || record.projectType.toString() === '6'))  {
+        if (this.proofInfo.paymentMethod === '1') {
+          this.proofType = 'img'
+          return
+        }
+        if (this.proofInfo.paymentMethod === '2') {
+          this.proofType = 'pdf'
+          return
+        }
+        if (this.proofInfo.paymentMethod === '3') {
+          this.proofType = 'none'
+          return
+        }
+      } else {
+        this.proofType = 'img'
+      }
+    },
     /**
      * 获取项目缴费凭证相关信息
      * @param record
      */
     getProofInfo(record) {
       if (record && record.id) {
-        getLastProofInfo({ projectId: record.id }).then(res => {
+        let param = {
+          projectId: record.id
+        }
+        let httpMethod
+        // 标协会员、证书和普通项目、工作组项目、资料网员使用的接口不一致
+        if (record.projectType.toString() === '5') {
+          httpMethod = getStanderMemberLastProofInfo
+        } else if (record.projectType.toString() === '6') {
+          httpMethod = getCertificateLastProofInfo
+        } else {
+          httpMethod = getLastProofInfo
+        }
+        httpMethod(param).then(res => {
           if (res.success) {
             this.proofInfo = res.result
+            // 标协会员、证书的缴费凭证文件、缴费金额、缴费日期、申请人字段和普通项目、工作组项目、资料网员的不一致
+            if (record.projectType.toString() === '5' || record.projectType.toString() === '6') {
+              this.proofInfo.proof = res.result.paymentRecord
+              this.proofInfo.amountReceived = res.result.paidAmount
+              this.proofInfo.paymentDate = res.result.submissionTime
+              this.proofInfo.applicantName = res.result.liaisonMan
+            }
+            this.getProofType(record)
           }
         })
       }

src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue

@@ -48,7 +48,7 @@
 import JDate from '../../../../components/tools/JDate'
 import pick from 'lodash.pick'
 import { money } from '../../../../utils/validate'
-import { addPayBill, addPaymentPhase, editAmountPhase, editPayBill } from '../../../../api/incomePaymentsApi'
+import { addPayBill, editPayBill } from '../../../../api/incomePaymentsApi'
 import { addZero } from '../../../../utils/util'
 import { getContactsById } from '../../../../api/api'
 

src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue

@@ -229,12 +229,14 @@ export default {
   &-content {
     padding-right: 20px;
     word-break: break-all;
+    white-space: pre-wrap;
     font-size: 14px;
     font-family: NotoSansHans, NotoSansHans-Light;
     color: #4D4D4D;
 
     &-money {
       color: #D40505;
+      white-space: pre-wrap;
     }
   }
 }