From 73f281cbebe6cb111d3dc2d78c87cad976945dc2 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Wed, 3 Nov 2021 14:15:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/jero/JImageUpload.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/jero/JImageUpload.vue b/src/components/jero/JImageUpload.vue index 77e6667..cdafac2 100644 --- a/src/components/jero/JImageUpload.vue +++ b/src/components/jero/JImageUpload.vue @@ -18,7 +18,7 @@ @preview="handlePreview" :class="!isMultiple?'imgupload':''">
- +
@@ -215,6 +215,13 @@ this.handlePathChange() } }, + // 图片点击预览 + clickFunc() { + if (!this.disabled) return + if (this.fileList.length > 0) { + this.handlePreview(this.fileList[0]) + } + }, // 预览 handlePreview(file) { if (file && file.url) { From e68055a0bf3a411f25a49db2f7533f52b147111d Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Wed, 3 Nov 2021 17:19:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[bug]=20=E5=BC=80=E7=A5=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=82=AE=E7=BC=96=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arriveAndInvoicing/modules/InvoicingModule.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue index 1c4666a..52cdccd 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue @@ -50,6 +50,7 @@ import pick from 'lodash.pick' import { money } from '../../../../utils/validate' import { addPayBill, addPaymentPhase, editAmountPhase, editPayBill } from '../../../../api/incomePaymentsApi' import { addZero } from '../../../../utils/util' +import { getContactsById } from '../../../../api/api' export default { name: 'InvoicingModule', @@ -115,7 +116,8 @@ export default { rules: [{ required: true, message: '请选择开票日期' }], validateTrigger: 'change' } - } + }, + postalCode: '', // 邮寄联系人邮编 } }, methods: { @@ -126,11 +128,17 @@ export default { edit(record) { this.form.resetFields() this.model = Object.assign({}, record) + this.getMailContactPostalCode() this.visible = true this.$nextTick(() => { this.form.setFieldsValue(pick(this.model, 'invoiceAmount', 'billNo', 'billDate', 'remark')) }) }, + getMailContactPostalCode() { + getContactsById({id: this.mailContactsId}).then(res => { + this.postalCode = res.result.postalCode + }) + }, handleOk() { if (this.confirmLoading) { return @@ -141,6 +149,7 @@ export default { // values.chargeCompanyName = this.chargeCompanyName values.projectName = this.projectName values.contactId = this.mailContactsId + values.postalCode = this.postalCode const formData = Object.assign(this.model, values) console.log('表单提交数据', formData) let okHttpMethod From 21a899dfa43866f862b14202d86353f4eae1ccd1 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Wed, 3 Nov 2021 18:11:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[bug]=20bug=E4=BF=AE=E6=94=B9=EF=BC=9B?= =?UTF-8?q?=E5=90=88=E5=90=8C=E6=89=93=E5=8D=B0=EF=BC=9B=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ProjectDetailModal.vue | 2 +- src/views/mailManagement/ContractMail.vue | 16 +++++++++++++++- src/views/mailManagement/PrintPage.vue | 20 +++++++++++--------- src/views/system/RoleUserList.vue | 4 +++- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue index 6621a3a..e15202c 100644 --- a/src/components/ProjectDetailModal.vue +++ b/src/components/ProjectDetailModal.vue @@ -104,7 +104,7 @@ - 打印 + 打印 邮寄 @@ -207,6 +207,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) { + let routerUrl = this.$router.resolve({ + path: '/mailManagement/PrintPage', + query: { + record: JSON.stringify(record), + type: 'contract' + } + }) + window.open(routerUrl.href, '_blank') + }, handleAdd (id) { let param = { id: id diff --git a/src/views/mailManagement/PrintPage.vue b/src/views/mailManagement/PrintPage.vue index 454f35a..ec4ce3a 100644 --- a/src/views/mailManagement/PrintPage.vue +++ b/src/views/mailManagement/PrintPage.vue @@ -11,20 +11,20 @@
{{ sendAddress }}
-
{{ mailDetail.billNo }}
+
{{ sendPostCode }}
-
{{ mailDetail.contactName }}
-
{{ mailDetail.contactMobile }}
+
{{ isContract ? mailDetail.liaisonMan : mailDetail.contactName }}
+
{{ isContract ? mailDetail.mobile : mailDetail.contactMobile }}
-
{{ mailDetail.chargeCompanyName }}
+
{{ isContract ? mailDetail.signedCompanyTemporaryName : mailDetail.chargeCompanyName }}
-
{{ mailDetail.chargeCompanyName }}
+
{{ mailDetail.contactAddress }}
-
{{ mailDetail.postNo }}
+
{{ mailDetail.postalCode }}
@@ -44,10 +44,12 @@ export default { userInfo: {}, sendCompanyName: '', sendAddress: '', - sendPostCode: '' + sendPostCode: '', + isContract: false, // 是否合同 } }, created() { + this.isContract = this.$route.query.type === 'contract' this.sendCompanyName = window._CONFIG['sendCompanyName'] this.sendAddress = window._CONFIG['sendAddress'] this.sendPostCode = window._CONFIG['sendPostCode'] @@ -140,7 +142,7 @@ export default { .sendPostCode { position: absolute; left: 218pt; - top: 134pt; + top: 138pt; font-size: 16px; letter-spacing: 9pt; } @@ -193,7 +195,7 @@ export default { .arrivePostNo { position: absolute; left: 218pt; - top: 246pt; + top: 240pt; font-size: 16px; letter-spacing: 9pt; } diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue index 19e3e66..2cdde4f 100644 --- a/src/views/system/RoleUserList.vue +++ b/src/views/system/RoleUserList.vue @@ -47,7 +47,9 @@ 授权 编辑 - 删除 + 删除