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/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
},
/*
diff --git a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
index 214bbf5..b949b06 100644
--- a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
+++ b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue
@@ -47,20 +47,7 @@
-
-
-
-
-
-
-
- 汇款
- 现场缴费(仅支持扫码支付)
- 打包
-
-
-
@@ -73,15 +60,6 @@
-
-
-
-
-
-
-
-
-
-
- {e.target.value = e.target.value.replace(/[^0-9]/g,'')}" :maxLength="6"
- >
-
-
-
+
+
+
+ {e.target.value = e.target.value.replace(/[^0-9]/g,'')}" :maxLength="6"
+ >
+
+
+
+
+
+ 汇款
+ 线上缴费
+ 打包
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -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
- }
}
}
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
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 @@