From a7237ffe6c1e7a45245734c6a93f19ec43d795a6 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 19 Jul 2022 10:33:29 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=9A=84=E7=BC=B4=E8=B4=B9=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/AuditProofModule.vue              | 151 +++++++++++-------
 1 file changed, 89 insertions(+), 62 deletions(-)

diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue
index bc7981c..a25ccdd 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue
@@ -17,9 +17,25 @@
     <a-form :form="form">
       <h3 class="title">凭证信息</h3>
       <div class="basic-info-div">
-        <a-form-item label="缴费金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <div>{{ proofInfo.amountReceived }}元</div>
-        </a-form-item>
+        <!--标协会员项目的缴费 显示-->
+        <template v-if="model.projectType === 5 || model.projectType === 6 ">
+          <a-form-item label="会员缴费金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <div>{{ proofInfo.memberPaymentAmount || ''}}<span v-if="!!proofInfo.memberPaymentAmount">元</span></div>
+          </a-form-item>
+          <a-form-item label="证书缴费金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <div>{{ proofInfo.certificatePaymentAmount || '' }}<span v-if="!!proofInfo.certificatePaymentAmount">元</span></div>
+          </a-form-item>
+          <a-form-item label="其他缴费金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <div>{{ proofInfo.otherPaymentAmount || ''}}<span v-if="!!proofInfo.otherPaymentAmount">元</span></div>
+          </a-form-item>
+        </template>
+        <!--其他项目的显示 -->
+        <template v-else>
+          <a-form-item label="缴费金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <div>{{ proofInfo.amountReceived }}元</div>
+          </a-form-item>
+        </template>
+
 
         <a-form-item label="缴费日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <div>{{ proofInfo.paymentDate }}</div>
@@ -27,23 +43,24 @@
         <a-form-item label="申请人" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <div>{{ proofInfo.applicantName }}</div>
         </a-form-item>
-<!--        <div class="info-item">-->
-<!--          <label>缴费金额：</label>-->
-<!--          <div>{{ proofInfo.amountReceived }}元</div>-->
-<!--        </div>-->
-<!--        <div class="info-item">-->
-<!--          <label>缴费日期：</label>-->
-<!--          <div>{{ proofInfo.paymentDate }}</div>-->
-<!--        </div>-->
-<!--        <div class="info-item">-->
-<!--          <label>申请人：</label>-->
-<!--          <div>{{ proofInfo.applicantName }}</div>-->
-<!--        </div>-->
+        <!--        <div class="info-item">-->
+        <!--          <label>缴费金额：</label>-->
+        <!--          <div>{{ proofInfo.amountReceived }}元</div>-->
+        <!--        </div>-->
+        <!--        <div class="info-item">-->
+        <!--          <label>缴费日期：</label>-->
+        <!--          <div>{{ proofInfo.paymentDate }}</div>-->
+        <!--        </div>-->
+        <!--        <div class="info-item">-->
+        <!--          <label>申请人：</label>-->
+        <!--          <div>{{ proofInfo.applicantName }}</div>-->
+        <!--        </div>-->
         <!-- 标协会员、证书的缴费凭证类型根据paymentMethod字段决定：1--图片；2--pdf；3--没有凭证 -->
         <!-- proofType处理过的缴费凭证类型：img--图片；pdf--pdf；none--无缴费凭证 -->
-<!--        <div class="info-item">-->
-        <a-form-item class="proof-form-item" :label="proofType==='pdf' ? '打包协议' : '缴费凭证'" :labelCol="labelCol" :wrapperCol="wrapperCol">
-<!--          <label>{{proofType==='pdf' ? '打包协议' : '缴费凭证'}}：</label>-->
+        <!--        <div class="info-item">-->
+        <a-form-item class="proof-form-item" :label="proofType==='pdf' ? '打包协议' : '缴费凭证'" :labelCol="labelCol"
+                     :wrapperCol="wrapperCol">
+          <!--          <label>{{proofType==='pdf' ? '打包协议' : '缴费凭证'}}：</label>-->
           <div class="proof-img" v-if="proofType === 'img'">
             <template v-if="proofInfo.proof && proofInfo.proof !== ''">
               <div class="proof-img-item" v-for="(item, index) in proofInfo.proof.split(',')" :key="index">
@@ -56,7 +73,7 @@
           </div>
           <span v-if="proofType==='none'">无</span>
         </a-form-item>
-<!--        </div>-->
+        <!--        </div>-->
         <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-textarea
             placeholder="请输入备注"
@@ -67,7 +84,8 @@
         </a-form-item>
       </div>
       <!-- 当前的缴费凭证是否是标协会员、证书缴费 时展示 付款信息，用户财务人员核实 -->
-      <template v-if="model.projectType && (model.projectType.toString() === '5' || model.projectType.toString() === '6')">
+      <template
+        v-if="model.projectType && (model.projectType.toString() === '5' || model.projectType.toString() === '6')">
         <h3 class="title">付款信息</h3>
         <div class="pay-info-div">
           <a-row>
@@ -79,7 +97,7 @@
                   v-decorator="['invoiceRequirements',{ rules: validatorRules.invoiceRequirements.rules, initialValue:proofInfo.invoiceRequirements, validateTrigger: 'change'},]"
                   :trigger-change="true"
                   dictCode="invoice_type"
-                  placeholder="请选择发票" />
+                  placeholder="请选择发票"/>
               </a-form-item>
             </a-col>
           </a-row>
@@ -182,10 +200,16 @@
 
 <script>
 import pick from 'lodash.pick'
-import { postAction } from '../../../../api/manage'
+import {postAction} from '../../../../api/manage'
 import Vue from 'vue'
-import { USER_INFO } from '../../../../store/mutation-types'
-import { getLastProofInfo, getStanderMemberLastProofInfo, getCertificateLastProofInfo, incomingUpdatePayment, incomingUpdateCertificate } from '../../../../api/incomePaymentsApi'
+import {USER_INFO} from '../../../../store/mutation-types'
+import {
+  getLastProofInfo,
+  getStanderMemberLastProofInfo,
+  getCertificateLastProofInfo,
+  incomingUpdatePayment,
+  incomingUpdateCertificate
+} from '../../../../api/incomePaymentsApi'
 import PreviewFile from '../../../../components/jero/PreviewFile.vue'
 import PreviewImgModal from '@/components/PreviewImgModal'
 
@@ -207,7 +231,7 @@ const wrapperPayCol = {
 
 export default {
   name: 'AuditProofModule',
-  components: { PreviewFile, PreviewImgModal },
+  components: {PreviewFile, PreviewImgModal},
   data() {
     return {
       title: '来款信息',
@@ -219,24 +243,24 @@ export default {
       labelCol,
       wrapperCol,
       labelPayCol: {
-        xs: { span: 24 },
-        sm: { span: 8 }
+        xs: {span: 24},
+        sm: {span: 8}
       },
       wrapperPayCol: {
-        xs: { span: 24 },
-        sm: { span: 16 }
+        xs: {span: 24},
+        sm: {span: 16}
       },
       validatorRules: {
         reviewerName: {
-          rules: [{ required: true, message: '请输入审核人' }],
+          rules: [{required: true, message: '请输入审核人'}],
           validateTrigger: 'blur'
         },
         paymentStatus: {
-          rules: [{ required: true, message: '请选择审核状态' }],
+          rules: [{required: true, message: '请选择审核状态'}],
           validateTrigger: 'blur'
         },
         reviewInstructions: {
-          rules: [{ required: true, message: '请输入说明' }],
+          rules: [{required: true, message: '请输入说明'}],
           validateTrigger: 'blur'
         },
         invoiceRequirements: {
@@ -247,14 +271,14 @@ export default {
         //   会员发票信息的回显
         headerName: {
           rules: [
-            { required: true, message: '请输入付款单位发票抬头', validateTrigger: 'blur' },
-            { min: 1, max: 50, message: '长度不超过50个字符' }
+            {required: true, message: '请输入付款单位发票抬头', validateTrigger: 'blur'},
+            {min: 1, max: 50, message: '长度不超过50个字符'}
           ],
           validateTrigger: 'blur'
         },
         taxNumber: {
           rules: [
-            { required: true, message: '请输入社会统一代码/税号', validateTrigger: 'blur' },
+            {required: true, message: '请输入社会统一代码/税号', validateTrigger: 'blur'},
             {
               pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/,
               message: '请输入15位、18位的社会统一代码/税号'
@@ -263,10 +287,10 @@ export default {
           validateTrigger: 'blur'
 
         },
-        invoiceAddress: { rules: [{ required: true, message: '请输入单位地址' }], validateTrigger: 'blur' },
-        invoicePhone: { rules: [{ required: true, validator: this.handleInvoicePhoneCheck }], validateTrigger: 'blur' },
-        depositBank: { rules: [{ required: true, message: '请输入开户银行' }], validateTrigger: 'blur' },
-        bankAccount: { rules: [{ required: true, message: '请输入银行账户' }], validateTrigger: 'blur' }
+        invoiceAddress: {rules: [{required: true, message: '请输入单位地址'}], validateTrigger: 'blur'},
+        invoicePhone: {rules: [{required: true, validator: this.handleInvoicePhoneCheck}], validateTrigger: 'blur'},
+        depositBank: {rules: [{required: true, message: '请输入开户银行'}], validateTrigger: 'blur'},
+        bankAccount: {rules: [{required: true, message: '请输入银行账户'}], validateTrigger: 'blur'}
       },
       // 项目缴费凭证信息
       proofInfo: {},
@@ -282,19 +306,19 @@ export default {
     }
   },
   methods: {
-   async open(record) {
-     if(record.projectType.toString() === '5' || record.projectType.toString() === '6') {
-       // 会员缴费、证书缴费 模态框调整宽度
-       this.width = 1000
-       this.labelCol = labelPayCol
-       this.wrapperCol = wrapperPayCol
-     } else {
-       this.labelCol = labelCol
-       this.wrapperCol = wrapperCol
-       this.width = 600
-     }
+    async open(record) {
+      if (record.projectType.toString() === '5' || record.projectType.toString() === '6') {
+        // 会员缴费、证书缴费 模态框调整宽度
+        this.width = 1000
+        this.labelCol = labelPayCol
+        this.wrapperCol = wrapperPayCol
+      } else {
+        this.labelCol = labelCol
+        this.wrapperCol = wrapperCol
+        this.width = 600
+      }
       let flag = await this.getProofInfo(record)
-      if(!flag){
+      if (!flag) {
         this.$message.warn('项目已审核')
         return
       }
@@ -314,7 +338,7 @@ export default {
      * @param record
      */
     getProofType(record) {
-      if (record.projectType && (record.projectType.toString() === '5' || record.projectType.toString() === '6'))  {
+      if (record.projectType && (record.projectType.toString() === '5' || record.projectType.toString() === '6')) {
         if (this.proofInfo.paymentMethod.toString() === '1') {
           this.proofType = 'img'
           return
@@ -349,7 +373,7 @@ export default {
         } else {
           httpMethod = getLastProofInfo
         }
-        return  new Promise(resolve => {
+        return new Promise(resolve => {
           httpMethod(param).then(res => {
             if (res.success && res.result !== '无数据') {
               this.proofInfo = res.result || {}
@@ -360,7 +384,7 @@ export default {
                 this.proofInfo.paymentDate = res.result.submissionTime
                 this.proofInfo.applicantName = res.result.liaisonMan
                 this.currentSelectInvoiceType = Number(res.result.invoiceRequirements)
-                if(this.currentSelectInvoiceType) {
+                if (this.currentSelectInvoiceType) {
                   this.invoiceRequirementsFlag = false
                 } else {
                   this.invoiceRequirementsFlag = true
@@ -371,7 +395,7 @@ export default {
               }
               this.getProofType(record)
               resolve(true)
-            }else{
+            } else {
               resolve(false)
             }
           })
@@ -384,7 +408,7 @@ export default {
         let request = projectType === 5 && incomingUpdatePayment || incomingUpdateCertificate
         let isSuccess = false
         request(params).then(res => {
-          if(res.success) {
+          if (res.success) {
             isSuccess = true
           } else {
             this.$message.warn(res.message)
@@ -410,9 +434,9 @@ export default {
           const formData = Object.assign(this.proofInfo, values)
           console.log(formData)
           // 标协会员缴费、证书缴费 需要先调用 编辑的接口，编辑成功后在调用审核的接口
-          if(this.proofInfo.projectType + '' === '5' || this.proofInfo.projectType + '' === '6') {
+          if (this.proofInfo.projectType + '' === '5' || this.proofInfo.projectType + '' === '6') {
             let updateResult = await this.updateMemberPaymentInfo(formData, Number(this.proofInfo.projectType))
-            if(!updateResult) {
+            if (!updateResult) {
               setTimeout(() => {
                 this.confirmLoading = false
               }, 1000)
@@ -458,7 +482,7 @@ export default {
      * 缴费凭证 src
      */
     proofSrc(imgId) {
-      return `${ window._CONFIG['domianURL'] }/sys/common/download/${ imgId }`
+      return `${window._CONFIG['domianURL']}/sys/common/download/${imgId}`
     },
     /**
      * 预览缴费凭证
@@ -538,13 +562,15 @@ h3.title::before {
     color: black;
   }
 }
+
 // 将缴费凭证的图片部分提出
 .proof-img {
   display: flex;
-  width:calc(100% - 4rem);
+  width: calc(100% - 4rem);
 
   &-item {
     width: 50%;
+
     img {
       max-width: 100%;
       max-height: 150px;
@@ -552,9 +578,10 @@ h3.title::before {
     }
   }
 }
+
 // 修改缴费基础信息的样式
-.basic-info-div{
-  /deep/.ant-form-item:not(.proof-form-item){
+.basic-info-div {
+  /deep/ .ant-form-item:not(.proof-form-item) {
     margin-bottom: 0;
   }
 }