From c1199043f3a9654f512c98f16d80c52dc901b758 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Sun, 24 Apr 2022 10:19:43 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20-=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E9=93=B6=E8=A1=8C=E8=B4=A6=E6=88=B7=20=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B0=E5=AD=97=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/BusinessManagementModule.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/businessManagement/modules/BusinessManagementModule.vue b/src/views/businessManagement/modules/BusinessManagementModule.vue index 05b66b7..ba7d8bf 100644 --- a/src/views/businessManagement/modules/BusinessManagementModule.vue +++ b/src/views/businessManagement/modules/BusinessManagementModule.vue @@ -295,11 +295,11 @@ export default { */ checkBankAccount(rules, value, callback) { if (value) { - if (number(value)) { - callback() - } else { - callback('请输入数字') - } + // if (number(value)) { + callback() + // } else { + // callback('请输入数字') + // } return } callback('请输入银行账号') @@ -379,4 +379,4 @@ export default { cursor: pointer; } } - \ No newline at end of file + From 076406809cc339f3593f8a518db82e9c202755fc Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Tue, 26 Apr 2022 14:25:13 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[=E5=8F=98=E6=9B=B4]=20=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=BB=84=E8=AE=BE=E7=BD=AE=E6=94=B6=E8=B4=B9=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A0=A1=E9=AA=8C=EF=BC=8C=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=94=B6=E8=B4=B9=E9=80=9A=E7=9F=A5=E5=BC=B9=E7=AA=97=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=B8=85=E9=99=A4=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkingGroupMemberUnitMaintenance.vue | 35 ++++++++++--------- .../WorkingGroupMemberSetChargeNotice.vue | 12 ++++--- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue index 99def6d..793f91d 100644 --- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue +++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue @@ -62,7 +62,7 @@ + /> @@ -379,7 +379,7 @@ export default { id: this.workingGroupProjectId } getWorkingGroupById(param).then(res => { - if(res.success) { + if (res.success) { this.workingGroupDetail = res.result || {} } }).finally(() => { @@ -446,21 +446,22 @@ export default { this.$message.warn('请先选择成员') return } - let param = { - ids: this.selectedRowKeys.join(','), - workingGroupId: this.workingGroupProjectId - } + // 2022-04-26 变更：不校验来款是否是收费通知 + // let param = { + // ids: this.selectedRowKeys.join(','), + // workingGroupId: this.workingGroupProjectId + // } // 判断选中的成员是否存在来款方式非收费通知的 - getChargeNotice(param).then(res => { - if (res.success) { - this.getChargeNoticeList() - this.$refs.setChargeNotic.chargeNoticeList = this.chargeNoticeList - this.$refs.setChargeNotic.selectedRowKeys = this.selectedRowKeys - this.$refs.setChargeNotic.handleOpen() - } else { - this.$message.warn(res.message) - } - }) + // getChargeNotice(param).then(res => { + // if (res.success) { + this.getChargeNoticeList() + this.$refs.setChargeNotic.chargeNoticeList = this.chargeNoticeList + this.$refs.setChargeNotic.selectedRowKeys = this.selectedRowKeys + this.$refs.setChargeNotic.handleOpen() + // } else { + // this.$message.warn(res.message) + // } + // }) }, /** * 催款提醒 @@ -502,7 +503,7 @@ export default { if (file && file.url) { const fileFullUrl = `${ window._CONFIG['domianWebSocketURL'] }/sys/common/download/${ file.id }?token=${ Vue.ls.get(ACCESS_TOKEN) }&fullfilename=${ file.fileName }` // let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${ encodeURIComponent(Base64.encode(fileFullUrl)) }` - let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` + let url = `${ window._CONFIG['onlinePreviewDomainURL'] }?url=${ encodeURIComponent(fileFullUrl) }` window.open(url) } } diff --git a/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue b/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue index 7451f9a..0e9fcb2 100644 --- a/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue +++ b/src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue @@ -84,7 +84,7 @@ import EmailErrorMsgModal from '@views/projectManagement/modules/EmailErrorMsgMo export default { name: 'WorkingGroupMemberSetChargeNotice', - components: { JUpload ,EmailErrorMsgModal}, + components: { JUpload, EmailErrorMsgModal }, data() { return { title: '设置收费通知', @@ -135,11 +135,11 @@ export default { if (res.success) { this.$message.success(res.message) // 是否有邮件发送失败 有就给出提示信息 - if(Array.isArray(res.result) && res.result.length > 0){ + if (Array.isArray(res.result) && res.result.length > 0) { // msgWarn(this,res.result,0) that.$refs.emailError.open() that.$refs.emailError.msgList = res.result - console.log(that.$refs.emailError.msgList ,'that.$refs.emailError.msgList ') + console.log(that.$refs.emailError.msgList, 'that.$refs.emailError.msgList ') } this.$emit('ok') @@ -159,6 +159,10 @@ export default { close() { this.visible = false this.model = {} + this.form.resetFields() + this.selectedRowKeys = null + this.chargeNoticeList = null + this.selectedChargeNotice = null }, /** * 收费通知号变化, 回显本年应收款和文件 @@ -178,7 +182,7 @@ export default { this.model.receivableAmount = item.yearCharge this.model.chargeNoticeId = item.chargeNoticeId this.model.chargeNoticeNo = item.value - } else if (item.type === 'chargeNoticeB' && key === 'b'){ + } else if (item.type === 'chargeNoticeB' && key === 'b') { this.selectedChargeNotice = 'B' this.model.receivableAmount = item.yearCharge this.model.chargeNoticeId = item.chargeNoticeId From d7af76158c2bf2ec9adcaf3f29204a14230f6899 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Tue, 26 Apr 2022 14:29:48 +0800 Subject: [PATCH 3/6] =?UTF-8?q?update=20=E5=8E=BB=E6=8E=89=E9=9D=A2?= =?UTF-8?q?=E5=8C=85=E5=B1=91=E7=9A=84=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/layouts/TabLayout.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue index 1b744d7..c05d172 100644 --- a/src/components/layouts/TabLayout.vue +++ b/src/components/layouts/TabLayout.vue @@ -58,7 +58,7 @@ activePage: '', menuVisible: false, menuItemList: [ - { key: '4', icon: 'reload', text: '刷 新' }, + // { key: '4', icon: 'reload', text: '刷 新' }, { key: '1', icon: 'arrow-left', text: '关闭左侧' }, { key: '2', icon: 'arrow-right', text: '关闭右侧' }, { key: '3', icon: 'close', text: '关闭其它' } From ac5c1feb739e156bcbf1761a207f2d1be1f2f6f7 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Tue, 26 Apr 2022 16:26:12 +0800 Subject: [PATCH 4/6] =?UTF-8?q?update=20=E5=88=86=E5=8F=91=E8=B5=84?= =?UTF-8?q?=E6=96=99=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkingGroupProjectDataMaintenance.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue index 8425e37..081a56b 100644 --- a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue +++ b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue @@ -58,6 +58,7 @@ 分发 + 下载 删除 @@ -202,6 +203,13 @@ export default { this.distributeModalVisible = true this.isBatchDistribute = false }, + /** + * 下载 + * @param record + */ + handleDownload(record) { + downloadFile(`sys/common/download/${record.fileId}`, record.fileName) + }, handleExportXls(fileName) { if (!fileName || typeof fileName != 'string') { fileName = '导出文件' From efcf9a9cb8272034013470f8d11a3484b7934bc2 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Tue, 26 Apr 2022 17:01:31 +0800 Subject: [PATCH 5/6] =?UTF-8?q?update=20=E5=8D=95=E4=BD=8D/=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E4=BF=A1=E7=94=A8=E4=BB=A3=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/businessManagement/BusinessManagement.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/businessManagement/BusinessManagement.vue b/src/views/businessManagement/BusinessManagement.vue index 5569977..caa29a2 100644 --- a/src/views/businessManagement/BusinessManagement.vue +++ b/src/views/businessManagement/BusinessManagement.vue @@ -16,6 +16,11 @@ + + + + + 查询 From 87d76c5de181411ad8a06a57fcdb1f1b65a5a7fa Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Thu, 5 May 2022 14:58:55 +0800 Subject: [PATCH 6/6] =?UTF-8?q?update=20=E5=B7=A5=E4=BD=9C=E7=BB=84?= =?UTF-8?q?=E5=82=AC=E6=AC=BE=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkingGroupMemberUnitMaintenance.vue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue index 793f91d..0330323 100644 --- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue +++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue @@ -168,6 +168,8 @@ + + @@ -183,6 +185,7 @@ import WorkingGroupMemberSetChargeNotice from './modules/WorkingGroupMemberSetCh import Vue from 'vue' import { ACCESS_TOKEN } from '../../store/mutation-types' import PreviewFile from '../../components/jero/PreviewFile' +import EmailErrorMsgModal from './modules/EmailErrorMsgModal' // eslint-disable-next-line no-undef,no-unused-vars const Base64 = require('js-base64').Base64 @@ -196,7 +199,8 @@ export default { ProjectDetailModal, WorkingGroupMemberUnitModule, WorkingGroupMemberSetChargeNotice, - PreviewFile + PreviewFile, + EmailErrorMsgModal }, mixins: [JeroListMixin], computed: { @@ -483,6 +487,13 @@ export default { dunningReminder(param).then((res) => { if (res.success) { that.$message.success(res.message) + // 是否有邮件发送失败 有就给出提示信息 + if (Array.isArray(res.result) && res.result.length > 0) { + // msgWarn(this,res.result,0) + that.$refs.emailError.open() + that.$refs.emailError.msgList = res.result + console.log(that.$refs.emailError.msgList, 'that.$refs.emailError.msgList ') + } that.loadData() that.onClearSelected() } else {