From 2b70b18fea4bc81f401575d66ae665790bcb7fed Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 4 Nov 2021 16:39:59 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[bug]=20=E5=8D=95=E4=B8=AA=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=E8=81=94=E7=B3=BB=E4=BA=BA=E5=9C=B0=E5=9D=80=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arriveAndInvoicing/modules/InvoicingModule.vue            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue
index 52cdccd..f6034f8 100644
--- a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue
@@ -118,6 +118,7 @@ export default {
         }
       },
       postalCode: '', // 邮寄联系人邮编
+      contactAddress: '' // 邮寄联系人地址
     }
   },
   methods: {
@@ -137,6 +138,7 @@ export default {
     getMailContactPostalCode() {
       getContactsById({id: this.mailContactsId}).then(res => {
         this.postalCode = res.result.postalCode
+        this.contactAddress = res.result.contactAddress
       })
     },
     handleOk() {
@@ -150,6 +152,8 @@ export default {
           values.projectName = this.projectName
           values.contactId = this.mailContactsId
           values.postalCode = this.postalCode
+          values.contactAddress = this.contactAddress
+          console.log(values)
           const formData = Object.assign(this.model, values)
           console.log('表单提交数据', formData)
           let okHttpMethod

From 6ba96e815187312efb073a9fed69e2943b5acc1f Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 4 Nov 2021 17:57:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=B8=85=E9=99=A4=E4=B9=8B=E5=89=8D=E7=9A=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProjectDetailModal.vue | 41 ++++++---------------------
 1 file changed, 8 insertions(+), 33 deletions(-)

diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index e15202c..0ad1eb9 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -267,37 +267,6 @@ import { queryCommonProjectById } from '@api/incomePaymentsApi'
 import JEllipsis from '@comp/jero/JEllipsis'
 import PreviewFile from './jero/PreviewFile'
 // import {getAction} from "@api/manage";
-const paymentInfoList = [
-  {
-    id: 1001,
-    year: '2021',
-    money: '200'
-  },
-  {
-    id: 1002,
-    year: '2021',
-    money: '200'
-  },
-  {
-    id: 1003,
-    year: '2021',
-    money: '200'
-  }
-]
-const logisticsInfoList = [
-  {
-    id: '01',
-    person: '张三',
-    time: '2021年10月21',
-    money: '200',
-    piaoNo: '123456',
-    projects: ['项目一', '项目二', '项目三'],
-    postPerson: '李四',
-    postTime: '2021年10月21',
-    emsOrSF: 'EMS',
-    postNo: '123456'
-  }
-]
 const columns = [
   {
     title: '开票人',
@@ -372,9 +341,9 @@ export default {
       contactsInfo: {},
       columns,
       // 到账信息
-      paymentInfoList,
+      paymentInfoList:[],
       // 开票邮寄信息
-      logisticsInfoList
+      logisticsInfoLis:[],
     }
   },
   computed: {},
@@ -407,6 +376,12 @@ export default {
       })
     },
     handleCancel() {
+      // 清除之前的信息
+      this.basicInfo = {}
+      this.enterpriseInfo = {}
+      this.contactsInfo = {}
+      this.paymentInfoList = []
+      this.logisticsInfoLis = []
       this.visible = false
     },
     /*

From 43074faf484559b8b64c80eaa584099179f2d35f Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 4 Nov 2021 18:06:35 +0800
Subject: [PATCH 3/4] =?UTF-8?q?[bug]=20=E6=A0=87=E5=8D=8F=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E7=9A=84=E9=82=AE=E5=AF=84=E6=89=93=E5=8D=B0=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/incomePaymentsApi.js           |  5 ++++-
 src/views/mailManagement/PrintPage.vue | 22 +++++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 6b4c035..ff83b2c 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -86,6 +86,8 @@ const aduitExpenditureContract = (param) => postAction('/contract/paySpendingCon
 const archiveExpenditureContract = (param) => postAction('/contract/paySpendingContract/archive', param)
 // 获取全部收入合同（通过企业id查询列表）
 const getAllRevenueContract = (param) => getAction('/contract/payIncomeContract/queryByCompanyId', param)
+// 打印获取邮寄联系人信息接口，传票据邮寄列表id
+const getPrintPostContactByMailId = (param) => getAction('/mail/payMailBill/print', param)
 
 export {
   getWorkingGroupById,
@@ -130,5 +132,6 @@ export {
   getIsAssociatedProject,
   aduitExpenditureContract,
   archiveExpenditureContract,
-  getAllRevenueContract
+  getAllRevenueContract,
+  getPrintPostContactByMailId
 }
diff --git a/src/views/mailManagement/PrintPage.vue b/src/views/mailManagement/PrintPage.vue
index ec4ce3a..abccc1b 100644
--- a/src/views/mailManagement/PrintPage.vue
+++ b/src/views/mailManagement/PrintPage.vue
@@ -33,6 +33,7 @@
 <script>
 import Vue from 'vue'
 import { USER_INFO } from '../../store/mutation-types'
+import { getPrintPostContactByMailId } from '../../api/incomePaymentsApi'
 
 export default {
   name: 'PrintPage',
@@ -56,13 +57,24 @@ export default {
     this.userInfo = Vue.ls.get(USER_INFO)
     // 从路由参数获取项目信息
     this.mailDetail = JSON.parse(this.$route.query.record)
-    console.log(this.mailDetail)
-  },
-  mounted() {
-    // 打印
-    this.print()
+    // 数据中没有邮编或地址信息，调用接口
+    if (!this.mailDetail.contactAddress || !this.mailDetail.postalCode) {
+      this.getPostContactDetail(this.mailDetail.id)
+    }
   },
   methods: {
+    getPostContactDetail(id) {
+      getPrintPostContactByMailId({id: id}).then(res => {
+        console.log(res)
+        this.mailDetail.contactAddress = res.result.contactAddress
+        this.mailDetail.postalCode = res.result.postalCode
+        console.log(this.mailDetail)
+        this.$nextTick(() => {
+          // 打印
+          this.print()
+        })
+      })
+    },
     /**
      * 打印
      */

From b5186a1e2a0e1f84c4c053fa890e482b560cc390 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 4 Nov 2021 18:11:26 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8F=82=E4=BC=9A=E4=BA=BA=E4=BC=9A=E8=AE=AE=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/AddMeetingPerson.vue              | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
index 9fccb96..b949b06 100644
--- a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
+++ b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
@@ -90,7 +90,7 @@
               <a-radio-group v-decorator="['payMode',validatorRules.payMode]" @change="changePayMode">
                 <a-radio :value="1">汇款</a-radio>
                 <a-radio :value="2">线上缴费</a-radio>
-                <a-radio :value="3" disabled>打包</a-radio>
+                <a-radio :value="3">打包</a-radio>
               </a-radio-group>
             </a-form-item>
           </a-col>
@@ -176,6 +176,7 @@ import JDate from '@comp/tools/JDate'
 import pick from 'lodash.pick'
 import {getContactsById} from '@api/api'
 import {postcode} from '@/utils/validate'
+import {validateStandard} from '@api/incomeMeetingApi'
 
 
 export default {
@@ -274,6 +275,8 @@ export default {
       selectContact: null,
       // 会议金额
       meetingCosts: '',
+      // 参会单位
+      selectedCompanyName: ''
 
     }
   },
@@ -289,6 +292,7 @@ export default {
         id: record.signedCompanyId,
         companyName: record.signedCompanyTemporaryName
       }
+      this.selectedCompanyName = record.signedCompanyTemporaryName
       // 姓名的默认显示
       this.contractInfo.companyContactId = record.signedContactsId
       // 通过联系人id获取手机号
@@ -348,13 +352,17 @@ export default {
     * 选择会议
     * */
     selectMeeting(val) {
-      console.log(val)
-      if (val.meetingCosts) {
+      // 如果是标协会议 需要根据参会单位显示不同的会费
+      if (val.meetingType === 2) {
+        validateStandard({companyName: this.selectedCompanyName}).then(res => {
+          if (res.result) {
+            this.meetingCosts = val.meetingCostsVip
+          } else {
+            this.meetingCosts = val.meetingCosts
+          }
+        })
+      } else {
         this.meetingCosts = val.meetingCosts
-        if (val.meetingCostsVip) {
-          this.meetingCosts = val.meetingCosts + val.meetingCostsVip
-        }
-
       }
 
 
@@ -398,11 +406,11 @@ export default {
     /*
     * 校验后四位
     * */
-    validateOrderCode(rule, value, callback){
+    validateOrderCode(rule, value, callback) {
       if (value === undefined || value === '' || value === null) {
         callback('请输入订单号后四位')
       }
-      if (value && value.length === 4 ) {
+      if (value && value.length === 4) {
         callback()
       } else {
         callback('请输入四位订单号后四位')