From 12b72221dd665969b842514535927f71a1661896 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Wed, 27 Oct 2021 17:22:31 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[bug]=20=E9=80=9A=E8=BF=87=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E4=BA=BAid=E8=8E=B7=E5=8F=96=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 2 +- .../projectManagement/modules/GeneralProjectModule.vue | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/api/api.js b/src/api/api.js index 052a94a..e7e640a 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -113,7 +113,7 @@ const getContactsByCompany = (params) => getAction('/company/payContactsManageme // 通过企业名称获取该企业下的联系人无权限接口 const getContactsByCompanyNoLimit = (params) => getAction('/company/payContactsManagement/queryByCompanyMeeting', params) // 通过联系人id获取联系人信息 -const getContactsById = (param) => getAction('/company/payContactsManagement/queryByIdMeeting', param) +const getContactsById = (param) => getAction('/company/payContactsManagement/queryByIdGetContract', param) // 加密获取key 与 iv const getKeyIv = (param) => getAction('/sys/getEncryptedString',param) diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue index 114f5d8..919f91e 100644 --- a/src/views/projectManagement/modules/GeneralProjectModule.vue +++ b/src/views/projectManagement/modules/GeneralProjectModule.vue @@ -110,8 +110,10 @@ 合同 - + 无 合同 收费通知 From 51e8ee5d7cf620025e621fb38c3e5fc2017e287a Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Wed, 27 Oct 2021 18:08:18 +0800 Subject: [PATCH 2/7] =?UTF-8?q?[bug]=20=E6=94=B6=E5=85=A5=E5=90=88?= =?UTF-8?q?=E5=90=8C=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE--=E6=99=AE?= =?UTF-8?q?=E9=80=9A=E9=A1=B9=E7=9B=AE=E7=A7=91=E5=AE=A4=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/RevenueContractModule.vue | 40 ++++++++----------- .../modules/SelectProjectModule.vue | 4 +- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index d2ddc59..1cc827f 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -502,6 +502,7 @@ export default { this.accountsReceivableNum = record.accountsReceivableAmount this.amountReceivedNum = record.amountReceived this.model = Object.assign({}, record) + this.getUserDetailByUserId() this.$nextTick(() => { this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'outstandingAmount', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear')) this.confirmLoading = false @@ -806,21 +807,16 @@ export default { switch (type) { // 普通项目 case 1: - this.getUserDetailByUserId().then(res => { - this.departId = res - // 混入筛选条件 - this.$refs.selectProjectModule.filters = { - chargeCompanyId: this.selectedCompany.id, - contractId: this.contractId, - departId: this.departId // 一个用户多部门情况下传给后端第一个部门id - } - // 获取负责人列表 - this.$refs.selectProjectModule.departChange(this.departId) - // 打开弹窗 - this.$refs.selectProjectModule.open() - }).catch((err) => { - this.$message.warn(err) - }) + // 混入筛选条件 + this.$refs.selectProjectModule.filters = { + chargeCompanyId: this.selectedCompany.id, + contractId: this.contractId + // departId: this.departId // 一个用户多部门情况下传给后端第一个部门id + } + // 获取负责人列表 + this.$refs.selectProjectModule.departChange(this.departId) + // 打开弹窗 + this.$refs.selectProjectModule.open() break // 工作组项目 case 2: @@ -855,14 +851,12 @@ export default { let param = { id: this.model.principalId } - return new Promise((resolve, reject) => { - queryUserByDepartId(param).then(res => { - if (res.success) { - resolve(res.result[0].departIds) - } else { - reject(res.message) - } - }) + queryUserByDepartId(param).then(res => { + if (res.success) { + this.departId = res.result[0].departIds + } else { + console.log(res.message) + } }) }, /** diff --git a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue index 3313212..b9b86fc 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue @@ -150,6 +150,7 @@ export default { requird: false, default: null }, + // 负责人id principal: { type: String, requird: false, @@ -261,7 +262,6 @@ export default { } }, methods: { - /** * 运行年份变化 */ @@ -278,7 +278,7 @@ export default { // 运行年份默认为当年 this.queryParam.year = new Date().getFullYear().toString() this.lastQueryParam.year = new Date().getFullYear().toString() - // + // 默认科室、负责人 this.queryParam.principalId = this.principal this.lastQueryParam.principalId = this.principal this.queryParam.departId = this.departId From 0511f6186e2df37cc053163d28f280f91c7884d8 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Wed, 27 Oct 2021 18:19:40 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[bug]=20backspace=E5=9B=9E=E9=80=80?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 03a4ae8..bb0a332 100644 --- a/src/App.vue +++ b/src/App.vue @@ -18,8 +18,27 @@ window.addEventListener('message', function (event) { document.getElementsByClassName('tab-layout-tabs ant-tabs ant-tabs-top')[0].style.display = 'none' }, 1000) } - }) + +document.onkeydown = keyDown + +function keyDown(e) { + console.log(navigator.userAgent) + // 拦截backspace按钮，谷歌浏览器不需要拦截 + // 拦截仍然存在的问题：当input、textarea失去焦点后，仍然会后退页面 + if (e.keyCode === 8 && navigator.userAgent.indexOf('AppleWebKit') === -1 ) { + // 判断是不是在input或textarea触发backspace按钮事件 + if (window.event.srcElement.tagName.toUpperCase() === 'INPUT' || window.event.srcElement.tagName.toUpperCase() === 'TEXTAREA') { + // 判断输入框中是否还有值可删除 + if (window.event.srcElement.value.length === 1) { + // 拦截事件 + e.keyCode=0 + e.returnValue=false + } + } + } +} + export default { data() { return { From c07cf98a8305ae47e10feab856020eb1a2de6baf Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Wed, 27 Oct 2021 18:28:25 +0800 Subject: [PATCH 4/7] =?UTF-8?q?[bug]=20=E7=94=A8=E6=88=B7=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tools/UserMenu.vue | 369 +++++++++++++++--------------- 1 file changed, 188 insertions(+), 181 deletions(-) diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue index 3bef1c6..acf1ab9 100644 --- a/src/components/tools/UserMenu.vue +++ b/src/components/tools/UserMenu.vue @@ -4,7 +4,7 @@ - 欢迎您，{{ nickname() }} + @@ -19,9 +19,9 @@ 账户设置 - - - 系统设置 + + + 系统设置 @@ -35,17 +35,17 @@ 清理缓存 - + @@ -61,194 +61,201 @@ From 09ad243c8f238d462d1069657060e19b6461e428 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Wed, 27 Oct 2021 18:34:27 +0800 Subject: [PATCH 5/7] =?UTF-8?q?[bug]=20=E6=97=A5=E5=BF=97=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/LogList.vue | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/views/system/LogList.vue b/src/views/system/LogList.vue index e6edce4..92fbf5b 100644 --- a/src/views/system/LogList.vue +++ b/src/views/system/LogList.vue @@ -13,13 +13,13 @@
- - + + - + - - + + - - - 查询 + + + + 查询 重置 - + style="margin-left: 8px;">重置 + - -
From 627a6ef454a413341d065a8c1aeae2eaf11b3c80 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Thu, 28 Oct 2021 10:21:13 +0800 Subject: [PATCH 6/7] =?UTF-8?q?[bug]=20=E6=94=B6=E5=85=A5=E5=90=88?= =?UTF-8?q?=E5=90=8C=E5=85=B3=E8=81=94=E4=BC=9A=E8=AE=AE=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/SelectMeetingProjectModule.vue | 8 ++++---- src/views/mailManagement/BillMail.vue | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue index 877a1c2..edd6e34 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue @@ -142,14 +142,14 @@ export default { title: '会议名称', align: 'center', dataIndex: 'meetingName', - width: 160, + width: 280, scopedSlots: { customRender: 'text' } }, { title: '参会单位', align: 'center', dataIndex: 'companyName', - width: 260, + width: 280, scopedSlots: { customRender: 'text' } }, // 合同里来款用途固定为会务费 @@ -166,7 +166,7 @@ export default { title: '参会人员', align: 'center', dataIndex: 'companyContactName', - width: 260, + width: 280, scopedSlots: { customRender: 'text' } }, { @@ -194,7 +194,7 @@ export default { title: '负责人', align: 'center', dataIndex: 'directorName', - width: 200, + width: 280, scopedSlots: { customRender: 'text' } }, { diff --git a/src/views/mailManagement/BillMail.vue b/src/views/mailManagement/BillMail.vue index 30a7238..fb036c0 100644 --- a/src/views/mailManagement/BillMail.vue +++ b/src/views/mailManagement/BillMail.vue @@ -87,7 +87,7 @@ - 打印 + 打印 邮寄 From f8fdade998d503e5629794e61ffd6980dde1472e Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Thu, 28 Oct 2021 11:20:39 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=20=E6=B8=85=E9=99=A4=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=20=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/company/SelectContacts.vue | 3 ++- .../incomePayments/meetManage/Attendance.vue | 3 ++- .../meetManage/OtherMeetingForm.vue | 8 +++++--- src/views/signUp/SignUpPage.vue | 20 ++++++++++++------- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/components/company/SelectContacts.vue b/src/components/company/SelectContacts.vue index 369f319..4cdaaf1 100644 --- a/src/components/company/SelectContacts.vue +++ b/src/components/company/SelectContacts.vue @@ -160,7 +160,8 @@ export default { this.$refs.contactForm.disableSubmit = false return } - this.$message.warn('请先选择来款企业再为该企业新建联系人') + // 调用无权限的提示语修改 + this.$message.warn('请先选择企业再为该企业新建联系人') }, addContactsOk(id) { this.getContactsList().then(() => { diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index adeba89..6cc4e64 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -95,7 +95,8 @@ 签到二维码 - + + diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue index e8eb932..b1b57a9 100644 --- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue +++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue @@ -91,8 +91,8 @@ - - + @@ -233,7 +233,6 @@ export default { * 清空邮寄联系人 地址 邮编 * */ clearFormItem(){ - // 选择企业清空 姓名 手机号 this.form.resetFields(['postContactId','postContactAddress','postCode']) }, @@ -250,6 +249,9 @@ export default { * 选择联系人之后地址邮编复制 * */ changePost(val){ + if(val === undefined){ + this.clearFormItem() + } getContactsById({id:val}).then(res => { if(res.success){ this.setAddressVal(res.result) diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue index e0fe879..b7b8fcf 100644 --- a/src/views/signUp/SignUpPage.vue +++ b/src/views/signUp/SignUpPage.vue @@ -74,7 +74,7 @@ v-if="currentMeetingInfo.meetingFiles"> - + @@ -223,7 +223,7 @@