diff --git a/public/development_address_config.js b/public/development_address_config.js index 7ab924c..f427f6d 100644 --- a/public/development_address_config.js +++ b/public/development_address_config.js @@ -13,8 +13,14 @@ window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas"; window._CONFIG["onlinePreviewDomainURL"] = "http://localhost:8012/onlinePreview"; // 会议管理报名二维码地址 -window._CONFIG['singUpQRCodeURL'] = 'http://localhost:3000/signupentrance' +window._CONFIG["singUpQRCodeURL"] = "http://localhost:3000/signupentrance" // 签到二维码url -window._CONFIG['signInUrl'] = '/meeting/payMeetingSituation/getSignInPage' +window._CONFIG["signInUrl"] = "/meeting/payMeetingSituation/getSignInPage" +// 票据打印--寄件人单位名称 +window._CONFIG["sendCompanyName"] = "中汽标准所" +// 票据打印--寄件人地址 +window._CONFIG["sendAddress"] = "天津市东丽区先锋东路68号" +// 票据打印--寄件人邮编 +window._CONFIG["sendPostCode"] = "300000" \ No newline at end of file diff --git a/public/production_address_config.js b/public/production_address_config.js index 8749c66..51d82ef 100644 --- a/public/production_address_config.js +++ b/public/production_address_config.js @@ -12,5 +12,11 @@ window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas"; window._CONFIG["onlinePreviewDomainURL"] = "http://10.10.10.46:8012/onlinePreview"; // 会议管理报名二维码地址 -window._CONFIG['singUpQRCodeURL'] = 'http://10.10.10.46:8055/signupentrance' +window._CONFIG["singUpQRCodeURL"] = "http://10.10.10.46:8055/signupentrance" +// 票据打印--寄件人单位名称 +window._CONFIG["sendCompanyName"] = "中汽标准所" +// 票据打印--寄件人地址 +window._CONFIG["sendAddress"] = "天津市东丽区先锋东路68号" +// 票据打印--寄件人邮编 +window._CONFIG["sendPostCode"] = "300000" \ No newline at end of file diff --git a/src/assets/less/common.less b/src/assets/less/common.less index c097928..b8535a3 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -99,8 +99,14 @@ } } +/*重置按钮*/ .reset-button { color: #08B6AF; background: rgba(8,182,175,0.10); border: 1px solid #08b6af; } + +/*表格滚动条*/ +.ant-table-body { + overflow-x: auto!important; +} \ No newline at end of file diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue index 6fc16fc..6621a3a 100644 --- a/src/components/ProjectDetailModal.vue +++ b/src/components/ProjectDetailModal.vue @@ -16,7 +16,8 @@ - + @@ -64,7 +65,7 @@ - {{ basicInfo.name }} + @@ -74,7 +75,7 @@ - {{ basicInfo.post }} + @@ -94,9 +95,108 @@ - + + + + @@ -305,7 +405,6 @@ export default { console.log('未查到相应的信息') } }) - }, handleCancel() { this.visible = false diff --git a/src/components/tools/HeaderNotice.vue b/src/components/tools/HeaderNotice.vue index fd509f4..7be09a6 100644 --- a/src/components/tools/HeaderNotice.vue +++ b/src/components/tools/HeaderNotice.vue @@ -15,6 +15,7 @@

{{ record.titile }}

+

{{ record.createTime }} 发布

diff --git a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue index e2b1ce7..9fccb96 100644 --- a/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue +++ b/src/views/contractManagement/revenueContract/modules/AddMeetingPerson.vue @@ -226,7 +226,7 @@ export default { validateTrigger: 'change' }, orderCode: { - rules: [{required: true, message: '请输入订单号后四位'}], + rules: [{required: true, validator: this.validateOrderCode}], validateTrigger: 'blur' }, postAddress: { @@ -396,6 +396,19 @@ export default { } }, /* + * 校验后四位 + * */ + validateOrderCode(rule, value, callback){ + if (value === undefined || value === '' || value === null) { + callback('请输入订单号后四位') + } + if (value && value.length === 4 ) { + callback() + } else { + callback('请输入四位订单号后四位') + } + }, + /* * 线上缴费才有订单后四位 * */ changePayMode(e) { diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index aac185c..c459bc2 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -127,14 +127,13 @@ date-format="YYYY-MM-DD"/> - - @@ -808,7 +807,7 @@ export default { this.$refs.projectTypeSelection.open() }, /** - * 项目类型选择回调，动态传入表头数据 + * 项目类型选择 * @param type */ selectProjectTypeOk(type) { @@ -872,6 +871,7 @@ export default { * 项目选中回调 */ selectProjectOk() { + this.edit(this.model.id) this.$refs.associatedProject.loadAssociatedProject() }, /** diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index b202911..6fcc5cd 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -259,7 +259,7 @@ v-has:[authorCode.auditRecord]="'attendance:auditCredentials'">审核凭证 审核报名信息 编辑 diff --git a/src/views/mailManagement/BillMail.vue b/src/views/mailManagement/BillMail.vue index 3e73e51..60c7ba3 100644 --- a/src/views/mailManagement/BillMail.vue +++ b/src/views/mailManagement/BillMail.vue @@ -87,7 +87,7 @@ - 打印 + 打印 邮寄 @@ -233,6 +233,20 @@ export default { const com = Number(record.sendMethod) === 1 && 'ems' || 'shunfeng' window.open(`https://www.kuaidi100.com/chaxun?com=${ com }&nu=${ record.postNo }`) }, + /** + * 打印，新标签打开页面，打印页面 + * @param record + */ + goPrint(record) { + console.log(record) + let routerUrl = this.$router.resolve({ + path: '/mailManagement/PrintPage', + query: { + record: JSON.stringify(record) + } + }) + window.open(routerUrl.href, '_blank') + }, handleAdd: function (record) { this.$refs.modalForm.add(record, 1) this.$refs.modalForm.title = '邮寄' diff --git a/src/views/mailManagement/ContractMail.vue b/src/views/mailManagement/ContractMail.vue index c1cf270..eab737d 100644 --- a/src/views/mailManagement/ContractMail.vue +++ b/src/views/mailManagement/ContractMail.vue @@ -7,27 +7,27 @@
- + - + - + - + - + 查询 重置 @@ -51,7 +51,7 @@ size="middle" bordered rowKey="id" - :scroll="{x:true}" + :scroll="{x:1600}" :columns="columns" :dataSource="dataSource" :pagination="ipagination" @@ -116,6 +116,7 @@ export default { title: '序号', dataIndex: '', key: 'rowIndex', + width: 60, align: 'center', customRender: function (t, r, index) { return parseInt(index) + 1 diff --git a/src/views/mailManagement/PrintPage.vue b/src/views/mailManagement/PrintPage.vue new file mode 100644 index 0000000..454f35a --- /dev/null +++ b/src/views/mailManagement/PrintPage.vue @@ -0,0 +1,200 @@ + + + + + \ No newline at end of file diff --git a/src/views/packManagement/modules/PackCompanyModule.vue b/src/views/packManagement/modules/PackCompanyModule.vue index c8e5c98..659bcc3 100644 --- a/src/views/packManagement/modules/PackCompanyModule.vue +++ b/src/views/packManagement/modules/PackCompanyModule.vue @@ -213,7 +213,7 @@ export default { if (!err) { // 判断选中企业是否改变 if (values.company.id === this.model.companyId) { - values.companyId = this.model.companyTemporaryId + values.companyId = this.model.companyTemporaryId || values.company.id } else { values.companyId = values.company.id } diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue index 9b473dc..0e87b7b 100644 --- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue @@ -56,10 +56,33 @@ v-decorator="['contactsIdTwo',validatorRules.contactsRepeat]" :maxLength='50' ref="selectContacts2" + @change="contactsTwoChange" @ok="addContactsTwoOk"> + + + + + + + + + + + + + + @@ -69,6 +92,7 @@ v-decorator="['contactsIdThree',validatorRules.contactsRepeat]" :maxLength='50' ref="selectContacts3" + @change="contactsThreeChange" @ok="addContactsThreeOk"> @@ -84,6 +108,18 @@ + + + + + + + + @@ -140,11 +176,11 @@ - - - - - + + + + + { this.disabledCompany = this.disabledChargeCompany || res || (!!record.inAccount && record.inAccount !== 0) || (!!record.makeInvoice && record.makeInvoice !== 0) || (!!record.mail && record.mail !== 0) this.isAssociatedContract = res - console.log(this.isContractNumDisabled,this.isAssociatedContract, this.isContractNumDisabled || this.isAssociatedContract, '----------------') }) } else { this.disabledCompany = this.disabledChargeCompany @@ -453,12 +491,22 @@ export default { id: this.model.mailContactsTemporaryId, name: this.model.mailContactsTemporaryName } + // 是否需要显示联系人备注信息 + if (this.model.contactsTemporaryIdOne) { + this.hasContactOne = true + } + if (this.model.contactsTemporaryIdTwo) { + this.hasContactTwo = true + } + if (this.model.contactsTemporaryIdThree) { + this.hasContactThree = true + } } this.chargeWayType = record.chargeWay this.pickChargeNoticeType(record.charge, true) this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId', 'chargeWay', 'charge', 'receivableAmount', 'contractNum', 'receivableAmount', 'chargeNoticeId', 'needInvoice', 'remarks')) + this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId', 'chargeWay', 'charge', 'receivableAmount', 'contractNum', 'receivableAmount', 'chargeNoticeId', 'needInvoice', 'remarks', 'remarksOne', 'remarksTwo', 'remarksThree')) }) }, close() { @@ -473,6 +521,10 @@ export default { // 清除企业、来款方式、合同号的限制 this.isAssociatedContract = false this.disabledCompany = false + // 清除联系人备注信息 + this.hasContactOne = false + this.hasContactTwo = false + this.hasContactThree = false this.visible = false }, handleOk() { @@ -677,6 +729,16 @@ export default { * @param value */ contactsChange(value) { + if (!value) { + this.hasContactOne = false + this.form.setFieldsValue({remarksOne: null}) + return + } + this.hasContactOne = true + // 判断联系人是否和原来的一致，不一致则清空备注内容 + if (value !== this.model.contactsTemporaryIdOne) { + this.form.setFieldsValue({remarksOne: null}) + } let mailContact = Object.values(this.form.getFieldValue(['mailContactsId']))[0] // 邮寄联系人非undefined时赋值 if (!mailContact) { @@ -685,6 +747,38 @@ export default { this.form.setFieldsValue(pick(this.model, 'mailContactsId')) }) } + }, + /** + * 企业联系人2变化 + * @param value + */ + contactsTwoChange (value) { + if (!value) { + this.hasContactTwo = false + this.form.setFieldsValue({remarksTwo: null}) + return + } + this.hasContactTwo = true + // 判断联系人是否和原来的一致，不一致则清空备注内容 + if (value !== this.model.contactsTemporaryIdTwo) { + this.form.setFieldsValue({remarksTwo: null}) + } + }, + /** + * 企业联系人3变化 + * @param value + */ + contactsThreeChange (value) { + if (!value) { + this.hasContactThree = false + this.form.setFieldsValue({remarksThree: null}) + return + } + this.hasContactThree = true + // 判断联系人是否和原来的一致，不一致则清空备注内容 + if (value !== this.model.contactsTemporaryIdThree) { + this.form.setFieldsValue({remarksThree: null}) + } } } } diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue index e99ef7b..4ea5a1f 100644 --- a/src/views/system/DepartList.vue +++ b/src/views/system/DepartList.vue @@ -10,10 +10,10 @@ 添加下级 导出 - - 导入 - + + + + 批量删除 diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue index 88c2628..9e4f1b8 100644 --- a/src/views/system/UserAnnouncementList.vue +++ b/src/views/system/UserAnnouncementList.vue @@ -133,7 +133,20 @@ export default { { name: '企业通知', value: '5' + }, + { + name: '到账通知', + value: '9' + }, + { + name: '开票通知', + value: '10' + }, + { + name: '邮寄通知', + value: '7' } + ], IconImg, columns: [ diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue index cfa5780..106294c 100644 --- a/src/views/system/UserList.vue +++ b/src/views/system/UserList.vue @@ -88,7 +88,7 @@ bordered size="middle" rowKey="id" - :scroll="{x:true}" + :scroll="{x: 1600}" :columns="columns" :dataSource="dataSource" :pagination="ipagination" @@ -163,13 +163,13 @@ export default { title: '用户账号', align: 'center', dataIndex: 'username', - width: 120, + width: 280, scopedSlots: { customRender: 'text' } }, { title: '用户姓名', align: 'center', - width: 160, + width: 280, dataIndex: 'realname', scopedSlots: { customRender: 'text' } }, @@ -190,14 +190,14 @@ export default { { title: '角色类型', align: 'center', - width: 100, + width: 280, dataIndex: 'roleName', scopedSlots: { customRender: 'text' } }, { title: '组织机构', align: 'center', - width: 180, + width: 280, dataIndex: 'departIds_dictText', scopedSlots: { customRender: 'text' } }, @@ -230,6 +230,7 @@ export default { { title: '操作', dataIndex: 'action', + fixed: 'right', scopedSlots: { customRender: 'action' }, align: 'center' }