Merge remote-tracking branch 'origin/branch20211008'

# Conflicts:
#	src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue

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
 }

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
     },
     /*

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

@@ -47,20 +47,7 @@
             </a-form-item>
           </a-col>
         </a-row>
-<!--        <a-row :gutter="24">-->
-<!--       -->
-<!--        </a-row>-->
-
         <a-row :gutter="24">
-          <a-col :xl="12" :sm="24">
-            <a-form-item label="来款方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <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">打包</a-radio>
-              </a-radio-group>
-            </a-form-item>
-          </a-col>
           <a-col :xl="12" :sm="24">
             <a-form-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-radio-group v-decorator="['identity',validatorRules.identity]" disabled>
@@ -73,15 +60,6 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :xl="12" :sm="24">
-            <a-form-item label="需要发票" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag style="width: 100%" dict-code="invoice_type"
-                                 v-decorator="['needInvoice',validatorRules.needInvoice]"
-                                 :trigger-change="true"
-                                 @change="changeNeedInvoice"
-                                 placeholder="请选择发票类型"></j-dict-select-tag>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="12" :sm="24" v-if="!needInvoiceBool">
             <a-form-item label="邮寄人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <select-contacts placeholder="请选择邮寄人"
                                :selected-company="contractInfo.companyId"
@@ -89,18 +67,7 @@
                                v-decorator="['postContactId',validatorRules.postContactId]"></select-contacts>
             </a-form-item>
           </a-col>
-
+          <a-col :xl="12" :sm="24">
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :xl="12" :sm="24" v-if="!needInvoiceBool">
-            <a-form-item label="邮编" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入邮编"
-                       v-decorator="['postCode',validatorRules.postCode]"
-                       @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}" :maxLength="6"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="12" :sm="24" v-if="!needInvoiceBool">
             <a-form-item label="邮寄地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input placeholder="请输入邮寄地址"
                        v-decorator="['postContactAddress',validatorRules.postAddress]"
@@ -110,12 +77,41 @@
           </a-col>
         </a-row>
         <a-row :gutter="24">
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="邮编" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入邮编"
+                       v-decorator="['postContacCode',validatorRules.postCode]"
+                       @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}" :maxLength="6"
+              ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="来款方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <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">打包</a-radio>
+              </a-radio-group>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="需要发票" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag style="width: 100%" dict-code="invoice_type"
+                                 v-decorator="['needInvoice',validatorRules.needInvoice]"
+                                 :trigger-change="true"
+                                 placeholder="请选择发票类型"></j-dict-select-tag>
+            </a-form-item>
+          </a-col>
           <a-col :xl="12" :sm="24">
             <a-form-item label="抵达日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-date placeholder="请选择抵达日期" style="width: 100%;" v-decorator="['arrivalTime']" :trigger-change="true"
                       date-format="YYYY-MM-DD"/>
             </a-form-item>
           </a-col>
+        </a-row>
+        <a-row :gutter="24">
           <a-col :xl="12" :sm="24">
             <a-form-item label="离开日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-date placeholder="请选择离开日期" style="width: 100%;" v-decorator="['departureTime']" :trigger-change="true"
@@ -133,7 +129,7 @@
               </a-radio-group>
             </a-form-item>
           </a-col>
-          <a-col :xl="12" :sm="24" v-if="!isPackBool">
+          <a-col :xl="12" :sm="24">
             <a-form-item label="缴费凭证" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-image-upload :return-id="true"
                               v-decorator="['paymentRecord',validatorRules.paymentRecord]"></j-image-upload>
@@ -180,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 {
@@ -269,10 +266,6 @@ export default {
       },
       // 订单后四位显示
       onlinePayModeBool: false,
-      // 是否需要发票
-      needInvoiceBool:false,
-      // 是否打包 打包不上传缴费凭证
-      isPackBool:false,
       url: {
         add: '/meeting/payMeetingSituation/add'
       },
@@ -282,6 +275,8 @@ export default {
       selectContact: null,
       // 会议金额
       meetingCosts: '',
+      // 参会单位
+      selectedCompanyName: ''
 
     }
   },
@@ -297,6 +292,7 @@ export default {
         id: record.signedCompanyId,
         companyName: record.signedCompanyTemporaryName
       }
+      this.selectedCompanyName = record.signedCompanyTemporaryName
       // 姓名的默认显示
       this.contractInfo.companyContactId = record.signedContactsId
       // 通过联系人id获取手机号
@@ -317,17 +313,6 @@ export default {
         this.form.setFieldsValue(pick(this.contractInfo, 'companyId', 'companyContactId', 'identify', 'postContactId'))
       })
     },
-    /*
-    * 是否需要发票
-    * */
-    changeNeedInvoice(val){
-      if(val === '0'){
-        // 不需要发票
-        this.needInvoiceBool = true
-      }else {
-        this.needInvoiceBool = false
-      }
-    },
     close() {
       this.visible = false
     },
@@ -367,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
-        }
-
       }
 
 
@@ -417,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('请输入四位订单号后四位')
@@ -437,12 +426,6 @@ export default {
       } else {
         this.onlinePayModeBool = false
       }
-      // 是否打包
-      if (e.target.value === 3) {
-        this.isPackBool = true
-      } else {
-        this.isPackBool = false
-      }
     }
 
   }

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

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)
+    // 数据中没有邮编或地址信息，调用接口
-  },
+    if (!this.mailDetail.contactAddress || !this.mailDetail.postalCode) {
-  mounted() {
+      this.getPostContactDetail(this.mailDetail.id)
-    // 打印
+    }
-    this.print()
   },
   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()
+        })
+      })
+    },
     /**
      * 打印
      */