From 5d91166c34d5e3b4dcafc2feb3885d7833277620 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Mon, 18 Oct 2021 11:40:30 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/form/InstallmentForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/form/InstallmentForm.vue b/src/components/form/InstallmentForm.vue index deb699b..72bd58a 100644 --- a/src/components/form/InstallmentForm.vue +++ b/src/components/form/InstallmentForm.vue @@ -156,14 +156,14 @@ export default { * @param callback */ checkMoney(rules, value, callback) { + console.log(value, rules.field) if (value) { if (money(value)) { callback() - return } callback('请输入正确格式的金额') } - if (rules.field === 'accountsReceivableAmount') { + if (rules.field.indexOf('accountsReceivableAmount') > -1) { callback('请输入金额') } callback() From 285946ee43344fec616b8dc18ce7d1a283cf6cad Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Mon, 18 Oct 2021 13:40:32 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E8=B5=84=E6=96=99=E7=BD=91=E5=91=98?= =?UTF-8?q?=E6=88=90=E5=91=98=E5=AF=BC=E5=85=A5=E5=8A=A0=E5=85=A5poojectId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/incomePayments/memberManage/SafeguardMemberList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/incomePayments/memberManage/SafeguardMemberList.vue b/src/views/incomePayments/memberManage/SafeguardMemberList.vue index ce0a32b..9dd9836 100644 --- a/src/views/incomePayments/memberManage/SafeguardMemberList.vue +++ b/src/views/incomePayments/memberManage/SafeguardMemberList.vue @@ -239,7 +239,7 @@ export default { }, computed: { importExcelUrl: function () { - return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}` + return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}?projectId=${this.currentInfo.id}` }, }, created() { From cbd2687c58d4934515d5ab7f12fb85d227753e90 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Tue, 19 Oct 2021 09:00:03 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E3=80=81=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=A1=B9=E7=9B=AE=E5=85=B3?= =?UTF-8?q?=E8=81=94=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=EF=BC=8Cbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/incomePaymentsApi.js | 5 +- src/components/ProjectDetailModal.vue | 2 +- src/components/tools/UserPassword.vue | 4 +- src/utils/projectCheck.js | 16 ++ .../revenueContract/RevenueContractList.vue | 2 +- .../modules/RevenueContractDetail.vue | 141 +++++++++--------- .../modules/RevenueContractModule.vue | 17 ++- .../modules/SelectMeetingProjectModule.vue | 18 ++- .../modules/SelectProjectModule.vue | 17 ++- .../modules/GeneralProjectModule.vue | 34 ++++- .../modules/WorkingGroupMemberUnitModule.vue | 14 +- 11 files changed, 177 insertions(+), 93 deletions(-) create mode 100644 src/utils/projectCheck.js diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js index ef07b2a..15f9aae 100644 --- a/src/api/incomePaymentsApi.js +++ b/src/api/incomePaymentsApi.js @@ -76,6 +76,8 @@ const sysReminders = (param) => postAction('/reminders/edit', param) const checkCompanyAduit = (param) => getAction('/payMailContract/payMailContract/check', param) // 获取全部部门 const getAllDepartTreeList = (param) => getAction('/sys/sysDepart/queryTreeAllList', param) +// 验证项目是否关联合同 +const getIsAssociatedProject = (param) => getAction('/contract/payIncomeContract/getAssociatedProject', param) export { getWorkingGroupById, @@ -115,5 +117,6 @@ export { homePageDataStatistics, sysReminders, checkCompanyAduit, - getAllDepartTreeList + getAllDepartTreeList, + getIsAssociatedProject } diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue index 78e722e..8395b26 100644 --- a/src/components/ProjectDetailModal.vue +++ b/src/components/ProjectDetailModal.vue @@ -202,7 +202,7 @@ const columns = [ { title: '开票人', align: 'center', - dataIndex: 'createBy' + dataIndex: 'realName' }, { title: '日期', diff --git a/src/components/tools/UserPassword.vue b/src/components/tools/UserPassword.vue index c82c11a..ae86bd7 100644 --- a/src/components/tools/UserPassword.vue +++ b/src/components/tools/UserPassword.vue @@ -17,7 +17,7 @@ @paste.native.capture.prevent="handleOperate" autocomplete="new-password" label="旧密码"> - + @@ -42,6 +43,7 @@ placeholder="请确认新密码" @paste.native.capture.prevent="handleOperate" autocomplete="new-password" + :maxLength='30' v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/> diff --git a/src/utils/projectCheck.js b/src/utils/projectCheck.js new file mode 100644 index 0000000..20bc3e6 --- /dev/null +++ b/src/utils/projectCheck.js @@ -0,0 +1,16 @@ +import { getIsAssociatedProject } from '../api/incomePaymentsApi' +/** + * 验证项目是否关联合同 + * @param projectId + */ +export function checkAssociatedProject(projectId) { + return new Promise(resolve => { + getIsAssociatedProject({projectId: projectId}).then(res => { + if (res.success) { + resolve(false) + } else { + resolve(true) + } + }) + }) +} \ No newline at end of file diff --git a/src/views/contractManagement/revenueContract/RevenueContractList.vue b/src/views/contractManagement/revenueContract/RevenueContractList.vue index 1f60655..ba3f9bf 100644 --- a/src/views/contractManagement/revenueContract/RevenueContractList.vue +++ b/src/views/contractManagement/revenueContract/RevenueContractList.vue @@ -94,6 +94,7 @@ @click="toRevenueContractDetail(record.id, record.contractNum)" v-if="record.chargeStatus === 1" :value="text" + style="cursor: pointer" :length="18"> \ No newline at end of file diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue index f506de6..7a76b3d 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue @@ -8,18 +8,18 @@
主体信息
- - - - +
+
+ + {{ item.title }}： + {{ detailData[item.fieldName] }}% + {{ detailData[item.fieldName] }} + +
+
+ @@ -28,18 +28,16 @@
日期节点
- - - - +
+
+ + {{ item.title }}： + {{ detailData[item.fieldName] }} + +
+
+ @@ -48,18 +46,16 @@
账款信息
- - - - +
+
+ + {{ item.title }}： + {{ detailData[item.fieldName] }} + +
+
+ @@ -68,18 +64,16 @@
其他信息
- - - - +
+
+ + {{ item.title }}： + {{ detailData[item.fieldName] }} + +
+
+ @@ -138,19 +132,17 @@
存档信息
-
- - +
+
+ + {{ item.createBy }} + {{ item.createTime }} + {{ item.contractStatus_dictText }} + +
+
@@ -159,20 +151,18 @@
审核记录
-
- - +
+
+ + {{ item.createBy }} + {{ item.createTime }} + {{ item.contractStatus_dictText }} + {{ item.explainRemarks }} + +
+
@@ -409,11 +399,16 @@ export default { @import '~@assets/less/common.less'; .detail { + display: flex; padding: 0 20px; + flex-wrap: wrap; &-item { + width: 25%; + min-width: 280px; padding-top: 10px; color: #2F3133; + word-break: break-all; &-title { color: #999999; diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index 7a402c3..9150a6d 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -42,6 +42,7 @@ :selected-company="selectedCompany" :init-contacts="selectedContact" :is-cancel="isCancel" + :disabled="isSaved" v-decorator="['signedContactsId',validatorRules.signedContactsId]"> @@ -78,7 +79,7 @@ - + @@ -260,6 +263,7 @@ moment().add(1, 'year') } } } diff --git a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue index 5c3b6ff..672a71f 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue @@ -34,8 +34,8 @@ - - + + @@ -261,6 +261,9 @@ export default { this.contractId = this.contranctInfo.id // 记录打包状态 this.pack = this.contranctInfo.pack + // 运行年份默认为当年 + this.queryParam.particularYear = new Date().getFullYear().toString() + this.lastQueryParam.particularYear = new Date().getFullYear().toString() this.loadData(1) this.visible = true }, @@ -333,7 +336,16 @@ export default { return false } return startValue.valueOf() > endValue.valueOf() - } + }, + searchReset() { + this.lastQueryParam = { + particularYear: new Date().getFullYear().toString() + } + this.queryParam = { + particularYear: new Date().getFullYear().toString() + } + this.loadData(1) + }, } } diff --git a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue index cf8f78c..1e6ef79 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue @@ -140,6 +140,11 @@ export default { type: Number, requird: false, default: null + }, + principal: { + type: String, + requird: false, + default: '' } }, data() { @@ -246,14 +251,14 @@ export default { userList: [], // 用户列表 } }, - // 部门id变化时绑定查询条件 - watch: { - departId(val) { - this.queryParam.departId = val - } - }, methods: { open() { + // 运行年份默认为当年 + this.queryParam.year = new Date().getFullYear().toString() + this.lastQueryParam.year = new Date().getFullYear().toString() + // + this.queryParam.principalId = this.principal + this.queryParam.departId = this.departId this.loadDepartTreeData() this.visible = true this.loadData() diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue index 08b2671..102309d 100644 --- a/src/views/projectManagement/modules/GeneralProjectModule.vue +++ b/src/views/projectManagement/modules/GeneralProjectModule.vue @@ -42,7 +42,7 @@ @@ -187,6 +187,8 @@ import SelectContacts from '@comp/company/SelectContacts' import { addZero } from '../../../utils/util' import Vue from 'vue' import { USER_INFO } from '../../../store/mutation-types' +import { money } from '../../../utils/validate' +import { checkAssociatedProject } from '../../../utils/projectCheck' export default { name: 'GeneralProjectModule', @@ -290,7 +292,7 @@ export default { validateTrigger: 'change' }, receivableAmount: { - rules: [{ required: true, message: '请输入应收金额' }], + rules: [{ required: true, validator: this.checkMoney }], validateTrigger: 'blur' }, needInvoice: { @@ -314,6 +316,7 @@ export default { selectedCompany: null, // 当前选中的企业 selectedContact: null, // 编辑时的联系人 selectedMailContact: null, // 编辑时的邮寄联系人 + disabledCompany: false, // 企业是否可以编辑 url: { add: '/project/payCommonProject/add', edit: '/project/payCommonProject/edit' @@ -346,9 +349,16 @@ export default { companyName: record.chargeCompanyTemporaryName } } - + // 判断企业是否可以编辑，项目来款、开票、邮寄、打包、关联合同后，企业不可更改 + if (record.id) { + // 验证项目是否关联收入合同 + checkAssociatedProject(record.id).then(res => { + this.disabledCompany = this.disabledChargeCompany || res || (!!record.inAccount && record.inAccount !== 0) || (!!record.makeInvoice && record.makeInvoice !== 0) || (!!record.mail && record.mail !== 0) + }) + } else { + this.disabledCompany = this.disabledChargeCompany + } // 是否存在从收入合同传入的签订联系人id - console.log(record, this.signedContactId) record.contactsId = this.signedContactId || record.contactsTemporaryId || undefined record.mailContactsId = this.signedContactId || record.mailContactsTemporaryId || undefined // 回显选中的企业 @@ -487,6 +497,22 @@ export default { this.form.setFieldsValue(pick(this.model, 'mailContactsId')) }) } + }, + /** + * 校验金额格式 + * @param rules + * @param value + * @param callback + */ + checkMoney(rules, value, callback) { + console.log(value, rules.field) + if (value) { + if (money(value)) { + callback() + } + callback('请输入正确格式的金额') + } + callback('请输入应收金额') } } } diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue index 5be039f..c1e472f 100644 --- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue @@ -28,7 +28,7 @@ @@ -216,6 +216,7 @@ import { getWorkingGroupListByNotCompany } from '../../../api/incomePaymentsApi' import { isRepeat } from '../../../utils/util' import { addZero } from '../../../utils/util' import { money } from '../../../utils/validate' +import { checkAssociatedProject } from '../../../utils/projectCheck' export default { name: 'WorkingGroupMemberUnitModule', @@ -342,6 +343,7 @@ export default { selectedChargeNotice: null, // 选中的收费通知号 workingGroupId: null, workingGroupList: [], + disabledCompany: false, // 企业是否禁用 url: { add: '/project/payWorkingGroupSubitem/add', edit: '/project/payWorkingGroupSubitem/edit' @@ -393,6 +395,14 @@ export default { companyName: record.chargeCompanyTemporaryName } } + // 验证项目是否关联收入合同，项目来款、开票、邮寄、打包、关联合同后，企业不可更改 + if (record.id) { + checkAssociatedProject(record.id).then(res => { + this.disabledCompany = this.disabledChargeCompany || res || (!!record.inAccount && record.inAccount !== 0) || (!!record.makeInvoice && record.makeInvoice !== 0) || (!!record.mail && record.mail !== 0) + }) + } else { + this.disabledCompany = this.disabledChargeCompany + } // 回显选中的企业 this.selectedCompany = record.chargeCompany this.companyChange(this.selectedCompany) @@ -577,7 +587,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入正确格式的金额，金额格式为不超过十位整数，保留两位小数') } callback('请输入应收金额') }, From 97e6a760011ba165be2c9d3bdd9bef585c1058d1 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Tue, 19 Oct 2021 11:14:57 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=20=E8=A7=92=E8=89=B2=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/incomePayments/meetManage/Attendance.vue | 4 ++-- src/views/system/modules/UserRoleModal.vue | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 9c95365..409f2ea 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -602,9 +602,9 @@ export default { signUpHerfUrl() { return `${window._CONFIG['singUpQRCodeURL']}?id=${this.$route.query.id}` }, - // 签到地址 + // 签到地址 只给一个会议id signInUrl() { - return `${window._CONFIG['signInUrl']}?id=${this.$route.query.id}` + return this.$route.query.id } }, methods: { diff --git a/src/views/system/modules/UserRoleModal.vue b/src/views/system/modules/UserRoleModal.vue index 8080361..6bc85f6 100644 --- a/src/views/system/modules/UserRoleModal.vue +++ b/src/views/system/modules/UserRoleModal.vue @@ -82,10 +82,10 @@ }, methods: { onTreeNodeSelect(id){ - // if(id && id.length>0){ - // this.selectedKeys = id - // } - // this.$refs.datarule.show(this.selectedKeys[0],this.roleId) + if(id && id.length>0){ + this.selectedKeys = id + } + this.$refs.datarule.show(this.selectedKeys[0],this.roleId) }, onCheck (o) { if(this.checkStrictly){ From b0a50b19e1c6a7ff031b0af8068856af7af46d6f Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Tue, 19 Oct 2021 16:15:15 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8Cbug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ProjectDetailModal.vue | 2 +- .../modules/SelectMeetingProjectModule.vue | 82 +++--- .../modules/SelectProjectModule.vue | 36 ++- .../SelectWorkingGroupProjectModule.vue | 25 +- .../incomePayments/meetManage/Attendance.vue | 254 +++++++++++------- .../modules/WorkingGroupMemberUnitModule.vue | 12 +- 6 files changed, 263 insertions(+), 148 deletions(-) diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue index 8395b26..eef544e 100644 --- a/src/components/ProjectDetailModal.vue +++ b/src/components/ProjectDetailModal.vue @@ -227,7 +227,7 @@ const columns = [ { title: '邮寄人', align: 'center', - dataIndex: 'contactName' + dataIndex: 'mailName' }, { title: '快递', diff --git a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue index 672a71f..e3e847b 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue @@ -35,7 +35,8 @@ - + @@ -72,8 +73,7 @@ class="j-table-force-nowrap"> @@ -87,7 +87,7 @@ - + @@ -106,7 +106,7 @@ import '@/assets/less/TableExpand.less' export default { name: 'SelectMeetingProjectModule', mixins: [JeroListMixin], - components:{ + components: { JDate, JYearDate, StatusSlot, @@ -143,117 +143,125 @@ export default { align: 'center', dataIndex: 'meetingName', width: 160, - scopedSlots: {customRender: 'text'} + scopedSlots: { customRender: 'text' } }, { title: '参会单位', align: 'center', dataIndex: 'companyName', width: 260, - scopedSlots: {customRender: 'text'} + scopedSlots: { customRender: 'text' } }, // 合同里来款用途固定为会务费 { title: '来款用途', align: 'center', dataIndex: 'chargeUse', - width: 80, - customRender: () => {return '会务费'} + width: 200, + customRender: () => { + return '会务费' + } }, { title: '参会人员', align: 'center', dataIndex: 'companyContactName', - width: 80, - scopedSlots: {customRender: 'text'} + width: 260, + scopedSlots: { customRender: 'text' } }, { title: '应收金额', align: 'center', dataIndex: 'amountReceivable', - width: 80, - scopedSlots: {customRender: 'text'} + width: 200, + scopedSlots: { customRender: 'text' } }, { title: '实收金额', align: 'center', dataIndex: 'paidAmount', - width: 80, - scopedSlots: {customRender: 'text'} + width: 200, + scopedSlots: { customRender: 'text' } }, { title: '缴费方式', align: 'center', dataIndex: 'payMode_dictText', - width: 80, - scopedSlots: {customRender: 'text'} + width: 150, + scopedSlots: { customRender: 'text' } }, { title: '负责人', align: 'center', dataIndex: 'directorName', - width: 80, - scopedSlots: {customRender: 'text'} + width: 200, + scopedSlots: { customRender: 'text' } }, { title: '打包', align: 'center', dataIndex: 'pack', width: 80, - scopedSlots: {customRender: 'status-pack'} + scopedSlots: { customRender: 'status-pack' } }, { title: '需要发票', align: 'center', dataIndex: 'needInvoice', - scopedSlots: {customRender: 'status-pack'}, - width: 80, + scopedSlots: { customRender: 'status-pack' }, + width: 80 }, { title: '到账', align: 'center', dataIndex: 'inAccount', - scopedSlots: {customRender: 'status'}, - width: 80, + scopedSlots: { customRender: 'status' }, + width: 80 }, { title: '开票', align: 'center', dataIndex: 'makeInvoice', - scopedSlots: {customRender: 'status'}, - width: 80, + scopedSlots: { customRender: 'status' }, + width: 80 }, { title: '邮寄', align: 'center', dataIndex: 'mail', - scopedSlots: {customRender: 'status'}, - width: 80, + scopedSlots: { customRender: 'status' }, + width: 80 }, { title: '创建时间', align: 'center', dataIndex: 'createTime', width: 160, - scopedSlots: {customRender: 'text'}, - }, + scopedSlots: { customRender: 'text' } + } ], url: { - list: '/meeting/payMeetingSituation/contractPage', + list: '/meeting/payMeetingSituation/contractPage' }, disableMixinCreated: true, contractId: '', // 收入合同id // 合同信息 - contranctInfo:{}, + contranctInfo: {}, // 打包状态 - pack:'' + pack: '' } }, methods: { moment, + /** + * 运行年份变化 + */ + dateChange() { + this.$forceUpdate() + }, open(record) { - this.contranctInfo =Object.assign({},record) - console.log(record,'meetingPerson') + this.contranctInfo = Object.assign({}, record) + console.log(record, 'meetingPerson') this.filters.companyId = record.signedCompanyId // 列表查询加入打包年份 this.filters.packYear = record.packYear @@ -313,7 +321,7 @@ export default { /* * 打开新增会议参会人员 * */ - handleAdd(){ + handleAdd() { // 传进去一些需要的默认值 this.$refs.modalForm.open(this.contranctInfo) }, @@ -345,7 +353,7 @@ export default { particularYear: new Date().getFullYear().toString() } this.loadData(1) - }, + } } } diff --git a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue index 1e6ef79..2d228aa 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue @@ -20,6 +20,7 @@ v-model="queryParam.departId" placeholder="请选择科室" :disabled="pack === 0" + allowClear @change="departChange"> @@ -28,16 +29,24 @@ - {{ item.realname }} + + {{ item.realname }} + - + @@ -133,7 +142,7 @@ export default { contractId: { type: String, requird: false, - default: null, + default: null }, // 项目类型，1--普通项目；2--工作组项目；3--会议项目；4--会员项目 projectType: { @@ -248,10 +257,23 @@ export default { } ], treeDepartData: [], // 部门列表 - userList: [], // 用户列表 + userList: [] // 用户列表 } }, methods: { + + /** + * 运行年份变化 + */ + dateChange() { + this.$forceUpdate() + }, + /** + * 负责人变化 + */ + principalChange() { + this.$forceUpdate() + }, open() { // 运行年份默认为当年 this.queryParam.year = new Date().getFullYear().toString() @@ -357,13 +379,13 @@ export default { * 重置 */ searchReset() { - this.lastQueryParam = {} let obj = { departId: this.departId, - principalId: undefined, - year: undefined, + principalId: this.principal, + year: new Date().getFullYear().toString(), } this.queryParam = Object.assign(this.queryParam, obj) + this.lastQueryParam = Object.assign(this.lastQueryParam, obj) this.loadData(1) }, /** diff --git a/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue index fcde150..8431244 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue @@ -18,7 +18,7 @@ - + @@ -163,7 +163,16 @@ export default { } }, methods: { + /** + * 运行年份变化 + */ + dateChange() { + this.$forceUpdate() + }, open() { + // 运行年份默认为当年 + this.queryParam.year = new Date().getFullYear().toString() + this.lastQueryParam.year = new Date().getFullYear().toString() this.loadData() this.visible = true }, @@ -230,7 +239,19 @@ export default { addOk() { this.close() this.$emit('ok') - } + }, + /** + * 重置 + */ + searchReset() { + this.lastQueryParam = { + year: new Date().getFullYear().toString() + } + this.queryParam = { + year: new Date().getFullYear().toString() + } + this.loadData(1) + }, } } diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 409f2ea..8e8ad14 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -5,7 +5,7 @@
会议信息
- + {{ currentMeetingInfo.meetingName }} @@ -66,10 +66,24 @@ {{ currentMeetingInfo.cooperativeInvitationCode }} - - + + + + + + {{ currentMeetingInfo.meetingContent }} + + + {{ currentMeetingInfo.remark }} + + +
+
报名信息
+
+ {{ signUpHerfUrl }} @@ -87,18 +101,12 @@ v-model="currentMeetingInfo.paymentQrCode" disabled> - - {{ - item.hotelContacts + ':' + item.hotelContactsPhone + ' ' - }} - - - {{ currentMeetingInfo.meetingContent }} - - - {{ currentMeetingInfo.remark }} + + + + {{ item.hotelContacts + ':' + item.hotelContactsPhone + ' ' }}
参会人员信息
@@ -160,7 +168,8 @@ - 查询 + 查询 重置 @@ -173,10 +182,14 @@
- 添加参会人 - 导出 + 添加参会人 + + 导出 + + + 批量删除 - 批量删除 @@ -268,9 +281,9 @@ diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue index 9ae84c1..8102e14 100644 --- a/src/views/packManagement/PackProjectMaintenance.vue +++ b/src/views/packManagement/PackProjectMaintenance.vue @@ -527,6 +527,9 @@ export default { if (arr.some(item => item.needInvoice === 0 || Number(item.receivableAmount) === 0)) { reject('存在不需要发票的项目！') } + if (arr.some(item => item.makeInvoice === 1)) { + reject('存在已完成开票的项目！') + } } // 来款 if (operateType === 'incomePayment') { @@ -534,6 +537,9 @@ export default { if (arr.some(item => Number(item.receivableAmount) === 0)) { reject('存在应收金额为0的项目！') } + if (arr.some(item => item.inAccount === 1)) { + reject('不可选择已付全款的项目！') + } } resolve(arr) }) diff --git a/src/views/packManagement/modules/BatchIncomePaymentModule.vue b/src/views/packManagement/modules/BatchIncomePaymentModule.vue index 799a91c..3894591 100644 --- a/src/views/packManagement/modules/BatchIncomePaymentModule.vue +++ b/src/views/packManagement/modules/BatchIncomePaymentModule.vue @@ -258,10 +258,6 @@ export default { this.addZero(e) e.target.value = (e.target.value.replace(/[^0-9.]/g, '')).trim() this.inputIncomingAmount = Number(e.target.value) - if (this.inputIncomingAmount > this.sumAmountOwed) { - this.$message.warn('来款金额大于当前欠款金额，输入有误！') - return - } this.clearThisTimeAmount() this.calculateThisTimeAmount() }, @@ -282,6 +278,10 @@ export default { this.$message.warn('请输入大于0的来款金额') return } + if (this.inputIncomingAmount > this.sumAmountOwed) { + this.$message.warn('来款金额大于当前欠款金额，输入有误！') + return + } this.dataSource.forEach((item, index) => { // 当前项目欠款是否 >0 if (Number(item.amountOwed) > 0) { diff --git a/src/views/packManagement/modules/BatchInvoicingModule.vue b/src/views/packManagement/modules/BatchInvoicingModule.vue index 587d08e..9a9b750 100644 --- a/src/views/packManagement/modules/BatchInvoicingModule.vue +++ b/src/views/packManagement/modules/BatchInvoicingModule.vue @@ -274,10 +274,6 @@ export default { this.addZero(e) e.target.value = (e.target.value.replace(/[^0-9.]/g, '')).trim() this.inputInvoicingAmount = Number(e.target.value) - if (this.inputInvoicingAmount > this.sumAmountOwed) { - this.$message.warn('开票金额大于当前未开票金额，输入有误！') - return - } this.clearThisTimeAmount() this.calculateThisTimeAmount() }, @@ -317,6 +313,10 @@ export default { this.$message.warn('请输入大于0的开票金额') return } + if (this.inputInvoicingAmount > this.sumAmountOwed) { + this.$message.warn('开票金额大于当前未开票金额，输入有误！') + return + } this.dataSource.forEach((item, index) => { // 当前项目欠款是否 >0 if (Number(item.amountOwed) > 0) { diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue index a86b048..e5eba1d 100644 --- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue +++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue @@ -196,23 +196,29 @@ export default { return parseInt(index) + 1 } }, { - title: '项目名称', + title: '来款项目', align: 'center', - // width: 200, + width: 200, dataIndex: 'projectName', scopedSlots: { customRender: 'projectName' } }, { - title: '负责人', + title: '项目负责人', align: 'center', - width: 140, + width: 200, dataIndex: 'principalName', scopedSlots: { customRender: 'text' } }, { title: '所属科室', align: 'center', - width: 140, + width: 200, dataIndex: 'depart', scopedSlots: { customRender: 'text' } + }, { + title: '来款单位', + align: 'center', + width: 200, + dataIndex: 'chargeCompanyTemporaryName', + scopedSlots: { customRender: 'text' } }, { title: '应收金额', align: 'center', @@ -236,27 +242,32 @@ export default { { title: '序号', dataIndex: 'title', - key: 'rowIndex', - width: 120, - align: 'center' - }, { - title: '项目名称', align: 'center', - // width: 200, + width: 60, + }, { + title: '来款项目', + align: 'center', + width: 200, dataIndex: 'projectName', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'projectName' } }, { - title: '负责人', + title: '项目负责人', align: 'center', - width: 140, + width: 200, dataIndex: 'principalName', scopedSlots: { customRender: 'text' } }, { title: '所属科室', align: 'center', - width: 140, + width: 200, dataIndex: 'depart', scopedSlots: { customRender: 'text' } + }, { + title: '来款单位', + align: 'center', + width: 200, + dataIndex: 'chargeCompanyTemporaryName', + scopedSlots: { customRender: 'text' } }, { title: '应收金额', align: 'center', From e975c99a1c4fcf24ff752d788466888594ce4616 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Tue, 19 Oct 2021 18:11:54 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=20=E5=8F=82=E4=BC=9A=E6=83=85=E5=86=B5?= =?UTF-8?q?=E7=9A=84=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/incomePayments/meetManage/Attendance.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 8e8ad14..46902b1 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -254,7 +254,7 @@ - 审核凭证 Date: Wed, 20 Oct 2021 09:11:03 +0800 Subject: [PATCH 08/18] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/form/InstallmentForm.vue | 2 +- .../modules/ExpenditureContractModule.vue | 2 +- .../revenueContract/modules/RevenueContractModule.vue | 2 +- .../arriveAndInvoicing/modules/ArriveModule.vue | 2 +- .../arriveAndInvoicing/modules/InvoicingModule.vue | 2 +- .../meetManage/modules/BatchInvocieModal.vue | 2 +- .../modules/BatchIncomePaymentModule.vue | 2 +- .../packManagement/modules/BatchInvoicingModule.vue | 2 +- .../packManagement/modules/PackCompanyModule.vue | 2 +- .../modules/GeneralProjectModule.vue | 2 +- .../modules/WorkingGroupMemberUnitModule.vue | 2 +- .../modules/WorkingGroupProjectModule.vue | 2 +- .../WholeInstituteStatisticsList.vue | 7 +++---- .../WorkingGroupPaymentStatisticsDetail.vue | 2 +- .../WorkingGroupPaymentStatisticsList.vue | 11 +++++++---- 15 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/components/form/InstallmentForm.vue b/src/components/form/InstallmentForm.vue index 72bd58a..491bf9f 100644 --- a/src/components/form/InstallmentForm.vue +++ b/src/components/form/InstallmentForm.vue @@ -161,7 +161,7 @@ export default { if (money(value)) { callback() } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } if (rules.field.indexOf('accountsReceivableAmount') > -1) { callback('请输入金额') diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue index 204373c..0568089 100644 --- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue +++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue @@ -641,7 +641,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } switch (rules.field) { case 'contractAmount': diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index 9150a6d..5fac175 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -754,7 +754,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } switch (rules.field) { case 'contractAmount': diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue index 4e56274..4c5157e 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue @@ -157,7 +157,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } callback('请输入到账金额') } diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue index c07c7d5..1c4666a 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue @@ -197,7 +197,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } callback('请输入到账金额') } diff --git a/src/views/incomePayments/meetManage/modules/BatchInvocieModal.vue b/src/views/incomePayments/meetManage/modules/BatchInvocieModal.vue index 95c19e0..991835c 100644 --- a/src/views/incomePayments/meetManage/modules/BatchInvocieModal.vue +++ b/src/views/incomePayments/meetManage/modules/BatchInvocieModal.vue @@ -174,7 +174,7 @@ export default { if(value && money(value)){ callback() }else { - callback('请输入正确格式的金额,') + callback('请输入合法的金额数字,最多2位小数,10位正数') } }, /* diff --git a/src/views/packManagement/modules/BatchIncomePaymentModule.vue b/src/views/packManagement/modules/BatchIncomePaymentModule.vue index 3894591..e008840 100644 --- a/src/views/packManagement/modules/BatchIncomePaymentModule.vue +++ b/src/views/packManagement/modules/BatchIncomePaymentModule.vue @@ -313,7 +313,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } callback('请输入来款金额') } diff --git a/src/views/packManagement/modules/BatchInvoicingModule.vue b/src/views/packManagement/modules/BatchInvoicingModule.vue index 9a9b750..886722e 100644 --- a/src/views/packManagement/modules/BatchInvoicingModule.vue +++ b/src/views/packManagement/modules/BatchInvoicingModule.vue @@ -409,7 +409,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } callback('请输入开票金额') } diff --git a/src/views/packManagement/modules/PackCompanyModule.vue b/src/views/packManagement/modules/PackCompanyModule.vue index 8314de3..e0785ef 100644 --- a/src/views/packManagement/modules/PackCompanyModule.vue +++ b/src/views/packManagement/modules/PackCompanyModule.vue @@ -271,7 +271,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } callback('请输入打包费用总计') }, diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue index 102309d..65b0377 100644 --- a/src/views/projectManagement/modules/GeneralProjectModule.vue +++ b/src/views/projectManagement/modules/GeneralProjectModule.vue @@ -510,7 +510,7 @@ export default { if (money(value)) { callback() } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } callback('请输入应收金额') } diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue index da52e1e..d63c3c6 100644 --- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue @@ -597,7 +597,7 @@ export default { callback() return } - callback('请输入正确格式的金额，金额格式为不超过十位整数，保留两位小数') + callback('请输入合法的金额数字,最多2位小数,10位正数') } callback('请输入应收金额') }, diff --git a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue index ad3ea0d..7d5340b 100644 --- a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue @@ -333,7 +333,7 @@ export default { callback() return } - callback('请输入正确格式的金额') + callback('请输入合法的金额数字,最多2位小数,10位正数') } callback() }, diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue index e5eba1d..e4d83c0 100644 --- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue +++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue @@ -96,6 +96,7 @@
+ @@ -132,7 +132,6 @@ :dataSource="footerDataSource" :showHeader="false" :pagination="false" - :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" class="j-table-force-nowrap footer-table"> @@ -243,7 +242,7 @@ export default { title: '序号', dataIndex: 'title', align: 'center', - width: 60, + width: 60 }, { title: '来款项目', align: 'center', @@ -469,7 +468,7 @@ export default { } console.log('导出参数', param) downloadFile(this.url.exportXlsUrl, fileName + '.xlsx', param) - }, + } } } diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue index 8e32309..e48897f 100644 --- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue @@ -73,6 +73,7 @@
+ diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue index e9a7cd7..1ff0b0f 100644 --- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue +++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue @@ -34,7 +34,8 @@ - 查询 + 查询 重置 @@ -45,12 +46,15 @@
- 导出 + 导出 +
+ @@ -252,7 +255,7 @@ export default { } this.footerDataSource = [obj] if (res.result.pageList.total) { - this.ipagination.total = res.result.pageList.total + this.ipagination.total = res.result.pageList.total //清空列表选中 this.onClearSelected() } else { From a24d69b7e2add4d0681a1eb1e90c802ab6dd9a48 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Wed, 20 Oct 2021 15:46:22 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E4=BC=9A=E8=AE=AE=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=8C=89=E9=92=AE=E6=B6=88=E5=A4=B1=20?= =?UTF-8?q?=E7=BB=99=E5=87=BA=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/signUp/SignUpEntrance.vue | 54 +++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/src/views/signUp/SignUpEntrance.vue b/src/views/signUp/SignUpEntrance.vue index 6928e82..f60f157 100644 --- a/src/views/signUp/SignUpEntrance.vue +++ b/src/views/signUp/SignUpEntrance.vue @@ -36,7 +36,7 @@ - {{holdtime}} + {{ holdtime }} @@ -46,7 +46,7 @@ - {{holdAddress}} + {{ holdAddress }} @@ -60,7 +60,8 @@ - + @@ -69,7 +70,8 @@ - 立即报名 + 立即报名 +
@@ -84,7 +86,7 @@ import {getMeetInfoById} from '@api/incomeMeetingApi' export default { name: 'SignUpEntrance', - components:{ + components: { PreviewFile }, data() { @@ -97,11 +99,13 @@ export default { // 会议费用 meetingMoney: '', // 召开时间 - holdtime:'', + holdtime: '', // 召开地点 - holdAddress:'', + holdAddress: '', // 会议id - meetingId:'' + meetingId: '', + // 当前时间是否超过报名截止时间 + invalidationBool: false } }, created() { @@ -109,7 +113,7 @@ export default { let id = this.GetQueryString('id') this.meetingId = id document.title = '报名入口' - if(id){ + if (id) { this.getMeetingInfo(id) } }, @@ -141,7 +145,7 @@ export default { this.$router.push({ path: '/signUpPage', query: { - id:this.meetingId + id: this.meetingId } }) }, @@ -152,6 +156,14 @@ export default { getMeetInfoById({id: params}).then(res => { if (res.success) { this.currentMeetingInfo = res.result + // true超过了 false 未超过 + this.invalidationBool = this.compareCurrentTime(res.result.registerDeadline) + if (this.invalidationBool) { + this.$notification.error({ + message: '系统提示', + description: '当前会议超出报名时间,不可报名！' + }) + } // 初始化会议费用 if (this.currentMeetingInfo.meetingCostsVip) { this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人) 标协会员(${this.currentMeetingInfo.meetingCostsVip}/人)` @@ -159,11 +171,11 @@ export default { this.meetingMoney = `普通会员(${this.currentMeetingInfo.meetingCosts}/人)` } // 初始化召开时间 - if(this.currentMeetingInfo.startTime){ + if (this.currentMeetingInfo.startTime) { this.holdtime = this.currentMeetingInfo.startTime + '~' + this.currentMeetingInfo.endTime } // 初始化召开地点 - if(this.currentMeetingInfo.venue){ + if (this.currentMeetingInfo.venue) { this.holdAddress = this.currentMeetingInfo.venue + '/' + this.currentMeetingInfo.address } } else { @@ -172,6 +184,18 @@ export default { }) }, /* + * 当前时间是否超过会议报名时间 + * */ + compareCurrentTime(time) { + let date = new Date() + let compareTime = new Date(time) + if (date.getTime() > compareTime.getTime()) { + return true + } else { + return false + } + }, + /* * 会议类型 * */ initMeetingType(val) { @@ -193,9 +217,9 @@ export default { } }, /** - * 获取url的参数 - * @param name要获取的参数名 - * */ + * 获取url的参数 + * @param name要获取的参数名 + * */ GetQueryString(name) { var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)') var r = window.location.search.substr(1).match(reg) From 59089919ff89df0f88258f49364895204b2bb995 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Wed, 20 Oct 2021 16:12:26 +0800 Subject: [PATCH 10/18] =?UTF-8?q?bug=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 | 14 ++- src/components/tools/UserPassword.vue | 25 +++-- src/utils/projectCheck.js | 2 +- .../modules/AssociatedProject.vue | 6 +- .../modules/RevenueContractModule.vue | 2 + .../modules/SelectProjectModule.vue | 2 + .../committee/CommitteeMaintenance.vue | 2 +- .../ArriveAndInvoivingList.vue | 4 +- .../modules/ArriveModule.vue | 6 +- .../modules/ArriveStageModule.vue | 3 + src/views/mailManagement/BillMail.vue | 8 +- src/views/mailManagement/ContractMail.vue | 10 +- .../modules/BatchIncomePaymentModule.vue | 6 +- .../modules/PackCompanyModule.vue | 3 + .../modules/GeneralProjectModule.vue | 12 ++- .../modules/WorkingGroupMemberUnitModule.vue | 14 ++- .../WholeInstituteStatisticsList.vue | 16 +-- .../IndividualPaymentStatisticsDetail.vue | 4 +- .../IndividualPaymentStatisticsList.vue | 4 +- .../ProjectPaymentStatisticsList.vue | 12 +-- .../EnterprisePaymentStatisticsDetail.vue | 6 +- .../WorkingGroupPaymentStatisticsDetail.vue | 8 +- src/views/system/SystemDept.vue | 98 +++++++++++++------ src/views/system/modules/RoleModal.vue | 2 + src/views/system/modules/UserModal.vue | 9 +- 25 files changed, 184 insertions(+), 94 deletions(-) diff --git a/src/components/company/SelectContacts.vue b/src/components/company/SelectContacts.vue index 400cab6..369f319 100644 --- a/src/components/company/SelectContacts.vue +++ b/src/components/company/SelectContacts.vue @@ -82,6 +82,8 @@ export default { } }, created() { + // this.initContacts = null + this.contactsList = [] // 编辑 第一次不回显的问题 this.getContactsList() }, @@ -117,7 +119,7 @@ export default { * 获取联系人数据 */ getContactsList() { - if (this.selectedCompany && this.selectedCompany.hasOwnProperty.call(this.selectedCompany, 'id')) { + if (this.selectedCompany && this.selectedCompany.id) { const params = { companyId: this.selectedCompany.id } @@ -127,7 +129,7 @@ export default { return new Promise(resolve => { getContactsByCompanyNoLimit(params).then(res => { this.contactsList = res.result - if (this.initContacts && this.initContacts.hasOwnProperty.call(this.initContacts, 'id')) { + if (this.initContacts && this.initContacts.id) { this.contactsList.push(this.initContacts) } resolve() @@ -137,7 +139,8 @@ export default { return new Promise(resolve => { getContactsByCompany(params).then(res => { this.contactsList = res.result - if (this.initContacts && this.initContacts.hasOwnProperty.call(this.initContacts, 'id')) { + console.log(this.initContacts) + if (this.initContacts && this.initContacts.id) { this.contactsList.push(this.initContacts) } resolve() @@ -179,8 +182,11 @@ export default { option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 ) }, + /** + * 第一次展开下拉，去掉和初始联系人一样的联系人 + */ handleDropdownOpen() { - if (this.isFirstOpen && this.initContacts && this.initContacts.hasOwnProperty.call(this.initContacts, 'id')) { + if (this.isFirstOpen && this.initContacts && this.initContacts.id) { this.contactsList.forEach((item, index) => { if (item.id === this.initContacts.id) { this.$emit('change', undefined) diff --git a/src/components/tools/UserPassword.vue b/src/components/tools/UserPassword.vue index ae86bd7..a320a65 100644 --- a/src/components/tools/UserPassword.vue +++ b/src/components/tools/UserPassword.vue @@ -57,6 +57,7 @@ import { putAction } from '@/api/manage' import { getRSAPublicKey } from '@api/login' import { JSEncrypt } from 'jsencrypt' +import { passwordReg } from '../../utils/validate' export default { name: 'UserPassword', @@ -85,14 +86,19 @@ export default { validateTrigger: 'blur' }, confirmpassword: { - rules: [ - { required: true, message: '请确认新密码!' }, - { - pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,30}$/, - message: '密码由8位及以上数字、大小写字母和特殊符号组成！' - }, - { validator: this.handlePasswordCheck } - ], + rules: [{ + required: true, message: '请确认新密码', + }, { + validator: this.handlePasswordCheck, + }], + // rules: [ + // { required: true, message: '请确认新密码!' }, + // { + // pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,30}$/, + // message: '密码由8位及以上数字、大小写字母和特殊符号组成！' + // }, + // { validator: this.handlePasswordCheck } + // ], validateTrigger: 'blur' } }, @@ -179,6 +185,9 @@ export default { if (value && password && value.trim() !== password.trim()) { callback(new Error('两次密码不一致')) } + if (value && !passwordReg(value)) { + callback('密码由8位及以上数字、大小写字母和特殊符号组成！') + } callback() }, compareToFirstPassword(rule, value, callback) { diff --git a/src/utils/projectCheck.js b/src/utils/projectCheck.js index 20bc3e6..9163812 100644 --- a/src/utils/projectCheck.js +++ b/src/utils/projectCheck.js @@ -1,7 +1,7 @@ import { getIsAssociatedProject } from '../api/incomePaymentsApi' /** * 验证项目是否关联合同 - * @param projectId + * @param projectId 项目id */ export function checkAssociatedProject(projectId) { return new Promise(resolve => { diff --git a/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue b/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue index 04efffa..2b8ae0c 100644 --- a/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue +++ b/src/views/contractManagement/revenueContract/modules/AssociatedProject.vue @@ -72,7 +72,7 @@ export default { title: '来款单位', align: 'center', dataIndex: 'chargeCompanyName', - width: 250, + width: 280, scopedSlots: { customRender: 'text' } }, { title: '应收金额', @@ -90,13 +90,13 @@ export default { title: '负责人', align: 'center', dataIndex: 'principalName', - width: 250, + width: 280, scopedSlots: { customRender: 'text' } }, { title: '企业联系人', align: 'center', dataIndex: 'contactsName', - width: 250, + width: 280, scopedSlots: { customRender: 'text' } }, { title: '创建时间', diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index 5fac175..b156767 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -547,6 +547,8 @@ export default { } else { this.form.resetFields() this.$refs.installmentForm.form.resetFields() + // 清除选中联系人相关信息 + this.selectedContact = null } }, installmentFormOk(value) { diff --git a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue index 2d228aa..2e55228 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue @@ -280,7 +280,9 @@ export default { this.lastQueryParam.year = new Date().getFullYear().toString() // this.queryParam.principalId = this.principal + this.lastQueryParam.principalId = this.principal this.queryParam.departId = this.departId + this.lastQueryParam.departId = this.departId this.loadDepartTreeData() this.visible = true this.loadData() diff --git a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue index cc5348a..5755e6e 100644 --- a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue +++ b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue @@ -76,7 +76,7 @@ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, columnWidth: 80}" class="j-table-force-nowrap"> diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue index f7581a4..e0f429c 100644 --- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue +++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue @@ -204,7 +204,7 @@ export default { }, { title: '项目负责人', align: 'center', - width: 140, + width: 280, dataIndex: 'principalName', scopedSlots: { customRender: 'text' } }, { @@ -222,7 +222,7 @@ export default { }, { title: '实收金额', align: 'center', - width: 100, + width: 120, dataIndex: 'paidAmount', scopedSlots: { customRender: 'text' } }, { diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue index 4c5157e..7cd5b41 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue @@ -154,7 +154,11 @@ export default { checkMoney(rules, value, callback) { if (value) { if (money(value)) { - callback() + if (Number(value) > 0) { + callback() + } else { + callback('到账金额不能小于或等于0') + } return } callback('请输入合法的金额数字,最多2位小数,10位正数') diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue index 9d8a2fe..7b94313 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue @@ -207,12 +207,15 @@ export default { &-content { padding-right: 20px; word-break: break-all; + white-space: nowrap; font-size: 14px; font-family: NotoSansHans, NotoSansHans-Light; color: #4D4D4D; &-money { color: #D40505; + word-break: break-all; + white-space: nowrap; } } } diff --git a/src/views/mailManagement/BillMail.vue b/src/views/mailManagement/BillMail.vue index 03406c1..4f1eb18 100644 --- a/src/views/mailManagement/BillMail.vue +++ b/src/views/mailManagement/BillMail.vue @@ -152,7 +152,7 @@ export default { { title: '票号', align: 'center', - width: 200, + width: 300, dataIndex: 'billNo', scopedSlots: { customRender: 'text' } }, @@ -166,21 +166,21 @@ export default { { title: '项目负责人', align: 'center', - width: 200, + width: 300, dataIndex: 'principalName', scopedSlots: { customRender: 'text' } }, { title: '来款单位', align: 'center', - width: 200, + width: 300, dataIndex: 'chargeCompanyName', scopedSlots: { customRender: 'text' } }, { title: '邮寄联系人', align: 'center', - width: 200, + width: 300, dataIndex: 'contactName', scopedSlots: { customRender: 'text' } }, diff --git a/src/views/mailManagement/ContractMail.vue b/src/views/mailManagement/ContractMail.vue index 8afc412..974e098 100644 --- a/src/views/mailManagement/ContractMail.vue +++ b/src/views/mailManagement/ContractMail.vue @@ -124,28 +124,28 @@ export default { { title: '合同编号', align: 'center', - width: 200, + width: 300, dataIndex: 'contractNum', scopedSlots: { customRender: 'htmlSlot' } }, { title: '合同名称', align: 'center', - width: 250, + width: 300, dataIndex: 'contractName', scopedSlots: { customRender: 'projectName' } }, { title: '签订单位', align: 'center', - width: 200, + width: 300, dataIndex: 'signedCompanyTemporaryName', scopedSlots: { customRender: 'projectName' } }, { title: '负责人', align: 'center', - width: 200, + width: 300, dataIndex: 'principalName', scopedSlots: { customRender: 'projectName' } }, @@ -159,7 +159,7 @@ export default { { title: '邮寄联系人', align: 'center', - width: 200, + width: 300, dataIndex: 'liaisonMan', scopedSlots: { customRender: 'projectName' } }, diff --git a/src/views/packManagement/modules/BatchIncomePaymentModule.vue b/src/views/packManagement/modules/BatchIncomePaymentModule.vue index e008840..7b4b020 100644 --- a/src/views/packManagement/modules/BatchIncomePaymentModule.vue +++ b/src/views/packManagement/modules/BatchIncomePaymentModule.vue @@ -310,7 +310,11 @@ export default { checkMoney(rules, value, callback) { if (value) { if (money(value)) { - callback() + if (Number(value) > 0) { + callback + } else { + callback('来款金额不能小于或等于0') + } return } callback('请输入合法的金额数字,最多2位小数,10位正数') diff --git a/src/views/packManagement/modules/PackCompanyModule.vue b/src/views/packManagement/modules/PackCompanyModule.vue index e0785ef..c8e5c98 100644 --- a/src/views/packManagement/modules/PackCompanyModule.vue +++ b/src/views/packManagement/modules/PackCompanyModule.vue @@ -198,6 +198,9 @@ export default { close() { this.$emit('close') this.visible = false + // 清空选中联系人相关信息 + this.initContact = null + this.initPackContact = null }, handleOk() { if (this.confirmLoading) { diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue index 65b0377..114f5d8 100644 --- a/src/views/projectManagement/modules/GeneralProjectModule.vue +++ b/src/views/projectManagement/modules/GeneralProjectModule.vue @@ -111,7 +111,7 @@ 合同 + v-else :disabled="isAssociatedContract"> 无 合同 收费通知 @@ -123,7 +123,7 @@ @@ -317,6 +317,7 @@ export default { selectedContact: null, // 编辑时的联系人 selectedMailContact: null, // 编辑时的邮寄联系人 disabledCompany: false, // 企业是否可以编辑 + isAssociatedContract: false, // 是否已关联合同 url: { add: '/project/payCommonProject/add', edit: '/project/payCommonProject/edit' @@ -354,6 +355,7 @@ export default { // 验证项目是否关联收入合同 checkAssociatedProject(record.id).then(res => { this.disabledCompany = this.disabledChargeCompany || res || (!!record.inAccount && record.inAccount !== 0) || (!!record.makeInvoice && record.makeInvoice !== 0) || (!!record.mail && record.mail !== 0) + this.isAssociatedContract = res }) } else { this.disabledCompany = this.disabledChargeCompany @@ -392,6 +394,12 @@ export default { this.$emit('close') this.chargeWayType = null this.selectedCompany = null + // 清空选中联系人的相关信息 + this.selectedContact = null + this.selectedMailContact = null + // 清除能否编辑企业、来款方式的限制 + this.isAssociatedContract = false + this.disabledCompany = false this.visible = false }, handleOk() { diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue index d63c3c6..713e304 100644 --- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue @@ -89,7 +89,7 @@ 合同 + v-else :disabled="isAssociatedContract"> 无 合同 收费通知 @@ -141,7 +141,7 @@ @@ -354,6 +354,7 @@ export default { workingGroupId: null, workingGroupList: [], disabledCompany: false, // 企业是否禁用 + isAssociatedContract: false, // 是否关联合同 url: { add: '/project/payWorkingGroupSubitem/add', edit: '/project/payWorkingGroupSubitem/edit' @@ -409,6 +410,7 @@ export default { if (record.id) { checkAssociatedProject(record.id).then(res => { this.disabledCompany = this.disabledChargeCompany || res || (!!record.inAccount && record.inAccount !== 0) || (!!record.makeInvoice && record.makeInvoice !== 0) || (!!record.mail && record.mail !== 0) + this.isAssociatedContract = res }) } else { this.disabledCompany = this.disabledChargeCompany @@ -453,6 +455,14 @@ export default { this.$emit('close') this.chargeWayType = null this.selectedCompany = null + // 清除选中联系人信息 + this.selectedContact1 = null + this.selectedContact2 = null + this.selectedContact3 = null + this.selectedMailContact = null + // 清除企业、来款方式、合同号的限制 + this.isAssociatedContract = false + this.disabledCompany = false this.visible = false }, handleOk() { diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue index e4d83c0..6eecd7f 100644 --- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue +++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue @@ -197,25 +197,25 @@ export default { }, { title: '来款项目', align: 'center', - width: 200, + width: 300, dataIndex: 'projectName', scopedSlots: { customRender: 'projectName' } }, { title: '项目负责人', align: 'center', - width: 200, + width: 300, dataIndex: 'principalName', scopedSlots: { customRender: 'text' } }, { title: '所属科室', align: 'center', - width: 200, + width: 300, dataIndex: 'depart', scopedSlots: { customRender: 'text' } }, { title: '来款单位', align: 'center', - width: 200, + width: 300, dataIndex: 'chargeCompanyTemporaryName', scopedSlots: { customRender: 'text' } }, { @@ -246,25 +246,25 @@ export default { }, { title: '来款项目', align: 'center', - width: 200, + width: 300, dataIndex: 'projectName', scopedSlots: { customRender: 'projectName' } }, { title: '项目负责人', align: 'center', - width: 200, + width: 300, dataIndex: 'principalName', scopedSlots: { customRender: 'text' } }, { title: '所属科室', align: 'center', - width: 200, + width: 300, dataIndex: 'depart', scopedSlots: { customRender: 'text' } }, { title: '来款单位', align: 'center', - width: 200, + width: 300, dataIndex: 'chargeCompanyTemporaryName', scopedSlots: { customRender: 'text' } }, { diff --git a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue index 6a5acbf..e2c07f9 100644 --- a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue @@ -170,7 +170,7 @@ export default { }, { title: '来款项目', align: 'center', - width: 160, + width: 300, dataIndex: 'projectName', scopedSlots: { customRender: 'projectName' } }, { @@ -203,7 +203,7 @@ export default { }, { title: '来款项目', align: 'center', - width: 160, + width: 300, dataIndex: 'workGroup', scopedSlots: { customRender: 'text' } }, { diff --git a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue index 87a0605..959e49c 100644 --- a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue +++ b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue @@ -156,7 +156,7 @@ export default { }, { title: '项目负责人', align: 'center', - width: 140, + width: 300, dataIndex: 'principalName', scopedSlots: { customRender: 'projectName' } }, { @@ -186,7 +186,7 @@ export default { }, { title: '项目负责人', align: 'center', - width: 140, + width: 300, dataIndex: 'principalName', scopedSlots: { customRender: 'text' } }, { diff --git a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue index 55e505d..61cec92 100644 --- a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue +++ b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue @@ -178,19 +178,19 @@ export default { }, { title: '项目负责人', align: 'center', - width: 160, + width: 300, dataIndex: 'principalName', scopedSlots: { customRender: 'text' } }, { title: '来款项目', align: 'center', - width: 160, + width: 300, dataIndex: 'projectName', scopedSlots: { customRender: 'projectName' } }, { title: '来款单位', align: 'center', - width: 160, + width: 300, dataIndex: 'chargeCompanyTemporaryName', scopedSlots: { customRender: 'text' } }, { @@ -223,19 +223,19 @@ export default { }, { title: '项目负责人', align: 'center', - width: 160, + width: 300, dataIndex: 'principalName', scopedSlots: { customRender: 'text' } }, { title: '来款项目', align: 'center', - width: 160, + width: 300, dataIndex: 'projectName', scopedSlots: { customRender: 'text' } }, { title: '来款单位', align: 'center', - width: 160, + width: 300, dataIndex: 'chargeCompanyTemporaryName', scopedSlots: { customRender: 'text' } }, { diff --git a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue index 51924b1..4683606 100644 --- a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue @@ -72,7 +72,7 @@ :dataSource="dataSource" :pagination="ipagination" :loading="loading" - :scroll="{x: 1100}" + :scroll="{x: 1000}" @change="handleTableChange" :class="dataSource.length === 0 ? 'show-scroll' : ''" class="j-table-force-nowrap main-table"> @@ -101,7 +101,7 @@ :dataSource="footerDataSource" :showHeader="false" :pagination="false" - :scroll="{x: 1100}" + :scroll="{x: 1000}" class="j-table-force-nowrap footer-table"> @@ -161,6 +161,7 @@ export default { }, { title: '来款项目', align: 'center', + width: 300, dataIndex: 'projectName', scopedSlots: { customRender: 'projectName' } }, { @@ -193,6 +194,7 @@ export default { }, { title: '来款项目', align: 'center', + width: 300, dataIndex: 'projectName', scopedSlots: { customRender: 'text' } }, { diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue index e48897f..5502625 100644 --- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue @@ -173,12 +173,13 @@ export default { }, { title: '项目负责人', align: 'center', + width: 300, dataIndex: 'principalName', scopedSlots: { customRender: 'text' } }, { title: '来款单位', align: 'center', - width: 160, + width: 300, dataIndex: 'chargeCompanyTemporaryName', scopedSlots: { customRender: 'text' } }, { @@ -214,17 +215,18 @@ export default { { title: '序号', dataIndex: 'title', - width: 100, + width: 60, align: 'center' }, { title: '项目负责人', align: 'center', + width: 300, dataIndex: 'principalName', scopedSlots: { customRender: 'text' } }, { title: '来款单位', align: 'center', - width: 160, + width: 300, dataIndex: 'chargeCompanyTemporaryName', scopedSlots: { customRender: 'text' } }, { diff --git a/src/views/system/SystemDept.vue b/src/views/system/SystemDept.vue index 5ee9a2b..64b195c 100644 --- a/src/views/system/SystemDept.vue +++ b/src/views/system/SystemDept.vue @@ -11,44 +11,70 @@ dictCode="system_dept_frequency" @change="deptFrequencyChange"/> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
- - - - - - - - - - - - -
保存 @@ -76,14 +102,22 @@ export default { model: {}, labelCol: { xs: { span: 24 }, - sm: { span: 3 } + sm: { span: 4 } }, wrapperCol: { xs: { span: 24 }, - sm: { span: 21 } + sm: { span: 20 } + }, + yearLabelCol: { + xs: { span: 24 }, + sm: { span: 7 } + }, + yearWrapperCol: { + xs: { span: 24 }, + sm: { span: 17 } }, validatorRules: { - deptFrequency: { + frequency: { rules: [{ required: true, message: '请选择频率' }], validateTrigger: 'change' }, diff --git a/src/views/system/modules/RoleModal.vue b/src/views/system/modules/RoleModal.vue index 7d44946..65d8b1e 100644 --- a/src/views/system/modules/RoleModal.vue +++ b/src/views/system/modules/RoleModal.vue @@ -157,6 +157,8 @@ export default { }, close() { this.$emit('close') + // 解决点编辑关闭后，再点添加下级角色编码仍然置灰的问题 + this.roleDisabled = false this.isAddLower = false this.visible = false }, diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue index e3dbde2..0417681 100644 --- a/src/views/system/modules/UserModal.vue +++ b/src/views/system/modules/UserModal.vue @@ -606,14 +606,13 @@ export default { }, compareToFirstPassword(rule, value, callback) { const form = this.form + if (value && value !== form.getFieldValue('password')) { + callback('两次输入的密码不一样！') + } if (value && !passwordReg(value)) { callback('密码由8位及以上数字、大小写字母和特殊符号组成！') } - if (value && value !== form.getFieldValue('password')) { - callback('两次输入的密码不一样！') - } else { - callback() - } + callback() }, validatePhone(rule, value, callback) { checkPhone(value, this.userId).then(res => { From 64b308326338fe359eec3585045f086c81446e5d Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Wed, 20 Oct 2021 16:35:42 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E3=80=90bug=E3=80=91=E8=B5=84=E6=96=99?= =?UTF-8?q?=E7=BD=91=E5=91=98=E6=88=90=E5=91=98=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?=E5=B8=A6=E5=87=BA=E9=82=AE=E5=AF=84=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/SafeguardMemberModal.vue | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue index 72277fd..8f63e73 100644 --- a/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue +++ b/src/views/incomePayments/memberManage/modules/SafeguardMemberModal.vue @@ -39,12 +39,13 @@ :selected-company="selectedCompany" :init-contacts="selectPerson" placeholder="请选择企业联系人" + @change="changetPerson" v-decorator="[ 'companyContactId', validatorRules.companyContactId, ]" :maxLength="50" - ref="selectMailContacts" + ref="selectContacts" @ok="addContactsOk" > @@ -203,11 +204,11 @@ - + + + + + @@ -216,7 +217,7 @@ import pick from 'lodash.pick' import { httpAction } from '@api/manage' import JUpload from '@comp/jero/JUpload' import CompanySelect from '@comp/company/CompanySelect' -import ContactManagementModule from '@views/businessManagement/modules/ContactManagementModule' +// import ContactManagementModule from '@views/businessManagement/modules/ContactManagementModule' import SelectContacts from '@comp/company/SelectContacts' import {addZero} from '@/utils/util' @@ -225,7 +226,7 @@ export default { components: { JUpload, CompanySelect, - ContactManagementModule, + // ContactManagementModule, SelectContacts, }, data() { @@ -263,11 +264,11 @@ export default { }, companyContactId: { rules: [{ required: true, message: '请选择企业联系人' }], - validateTrigger: 'blur', + validateTrigger: 'change', }, postContactId: { rules: [{ required: true, message: '请选择邮寄联系人' }], - validateTrigger: 'blur', + validateTrigger: 'change', }, paymentMethod: { rules: [{ required: true, message: '请选择来款方式' }], @@ -365,6 +366,13 @@ export default { ) }) }, + // 选择企业联系人 带出邮寄联系人 + changetPerson(val){ + // 只有邮寄联系人没有值的时候才去联动复制 + if(this.form.getFieldValue('postContactId') === undefined ){ + this.form.setFieldsValue({'postContactId':val}) + } + }, close() { this.incomePaysType = 3 this.$emit('close') @@ -413,10 +421,10 @@ export default { * 选择会员单位 * */ companyChange(val) { - this.selectedCompany = Object.assign({}, val, { companyName: val.name }) + this.selectedCompany = Object.assign({}, val, ) }, handleCancel() { - this.selectedCompany = {} + this.selectedCompany = null this.close() }, /* From 3b10703035433486fb2ee39bceefe5263641aa42 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Wed, 20 Oct 2021 17:01:02 +0800 Subject: [PATCH 12/18] =?UTF-8?q?[=E5=85=A8=E5=B1=80]=E6=90=9C=E7=B4=A2inp?= =?UTF-8?q?ut=E9=99=90=E5=88=B6=E9=95=BF=E5=BA=A650?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/businessManagement/BusinessManagement.vue | 2 +- src/views/businessManagement/ContactManagement.vue | 6 +++--- .../expenditureContract/ExpenditureContractList.vue | 4 ++-- .../revenueContract/RevenueContractList.vue | 6 +++--- .../revenueContract/modules/SelectMeetingProjectModule.vue | 2 +- .../modules/SelectWorkingGroupProjectModule.vue | 2 +- .../committee/CommitteeMaintenance.vue | 6 +++--- .../arriveAndInvoicing/ArriveAndInvoivingList.vue | 4 ++-- src/views/incomePayments/meetManage/Attendance.vue | 5 +++-- src/views/incomePayments/memberManage/MemberProjectList.vue | 2 +- .../incomePayments/memberManage/StardsMemberProjectList.vue | 2 +- src/views/mailManagement/BillMail.vue | 4 ++-- src/views/mailManagement/ContractMail.vue | 6 +++--- src/views/modules/message/SysMessageTemplateList.vue | 2 +- src/views/packManagement/PackCompanyList.vue | 2 +- src/views/packManagement/PackProjectMaintenance.vue | 2 +- .../modules/PackProjectSelectProjectModule.vue | 2 +- src/views/projectManagement/ConferenceMaintenance.vue | 2 +- src/views/projectManagement/GeneralProjectManagement.vue | 6 +++--- src/views/projectManagement/InternationalSeminar.vue | 2 +- src/views/projectManagement/OtherMeeting.vue | 2 +- .../projectManagement/WorkingGroupMemberUnitMaintenance.vue | 2 +- .../WorkingGroupProjectDataMaintenance.vue | 2 +- .../projectManagement/WorkingGroupProjectManagement.vue | 2 +- .../statisticalReport/WholeInstituteStatisticsList.vue | 4 ++-- .../IndividualPaymentStatisticsDetail.vue | 2 +- .../departmentStatistics/ProjectPaymentStatisticsList.vue | 4 ++-- .../EnterprisePaymentStatisticsDetail.vue | 2 +- .../WorkingGroupPaymentStatisticsDetail.vue | 2 +- .../WorkingGroupPaymentStatisticsList.vue | 2 +- src/views/system/DepartList.vue | 2 +- src/views/system/DictItemList.vue | 2 +- src/views/system/DictList.vue | 4 ++-- src/views/system/LogList.vue | 2 +- src/views/system/RoleUserList.vue | 2 +- src/views/system/UserList.vue | 4 ++-- 36 files changed, 55 insertions(+), 54 deletions(-) diff --git a/src/views/businessManagement/BusinessManagement.vue b/src/views/businessManagement/BusinessManagement.vue index a1ba605..62cd0c7 100644 --- a/src/views/businessManagement/BusinessManagement.vue +++ b/src/views/businessManagement/BusinessManagement.vue @@ -8,7 +8,7 @@ - + diff --git a/src/views/businessManagement/ContactManagement.vue b/src/views/businessManagement/ContactManagement.vue index 4b7181b..a116695 100644 --- a/src/views/businessManagement/ContactManagement.vue +++ b/src/views/businessManagement/ContactManagement.vue @@ -8,17 +8,17 @@ - + - + - + diff --git a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue index 1e49ad9..0e3dbe8 100644 --- a/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue +++ b/src/views/contractManagement/expenditureContract/ExpenditureContractList.vue @@ -8,12 +8,12 @@ - + - + diff --git a/src/views/contractManagement/revenueContract/RevenueContractList.vue b/src/views/contractManagement/revenueContract/RevenueContractList.vue index ba3f9bf..398d655 100644 --- a/src/views/contractManagement/revenueContract/RevenueContractList.vue +++ b/src/views/contractManagement/revenueContract/RevenueContractList.vue @@ -8,17 +8,17 @@ - + - + - + diff --git a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue index e3e847b..c9f3457 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue @@ -12,7 +12,7 @@ - + diff --git a/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue index 8431244..b229098 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue @@ -13,7 +13,7 @@ - + diff --git a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue index 5755e6e..bd20d33 100644 --- a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue +++ b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue @@ -8,17 +8,17 @@ - + - + - + diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue index e0f429c..fa20761 100644 --- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue +++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue @@ -20,12 +20,12 @@ - + - + diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 46902b1..74e3804 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -117,12 +117,12 @@ - + - + @@ -847,6 +847,7 @@ export default { //会议内容、备注的样式 .meeting-textarea { display: flex; + label { flex-shrink: 0; } diff --git a/src/views/incomePayments/memberManage/MemberProjectList.vue b/src/views/incomePayments/memberManage/MemberProjectList.vue index 4bddf74..0709ca7 100644 --- a/src/views/incomePayments/memberManage/MemberProjectList.vue +++ b/src/views/incomePayments/memberManage/MemberProjectList.vue @@ -9,7 +9,7 @@ - + diff --git a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue index 87686f4..28f7f31 100644 --- a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue +++ b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue @@ -8,7 +8,7 @@ - + diff --git a/src/views/mailManagement/BillMail.vue b/src/views/mailManagement/BillMail.vue index 4f1eb18..625fce6 100644 --- a/src/views/mailManagement/BillMail.vue +++ b/src/views/mailManagement/BillMail.vue @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/src/views/mailManagement/ContractMail.vue b/src/views/mailManagement/ContractMail.vue index 974e098..2dbf221 100644 --- a/src/views/mailManagement/ContractMail.vue +++ b/src/views/mailManagement/ContractMail.vue @@ -9,17 +9,17 @@ - + - + - + diff --git a/src/views/modules/message/SysMessageTemplateList.vue b/src/views/modules/message/SysMessageTemplateList.vue index 79f614d..ce5738d 100644 --- a/src/views/modules/message/SysMessageTemplateList.vue +++ b/src/views/modules/message/SysMessageTemplateList.vue @@ -9,7 +9,7 @@ - + diff --git a/src/views/packManagement/PackCompanyList.vue b/src/views/packManagement/PackCompanyList.vue index 68ad6ec..78a7eef 100644 --- a/src/views/packManagement/PackCompanyList.vue +++ b/src/views/packManagement/PackCompanyList.vue @@ -9,7 +9,7 @@ - + diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue index 8102e14..d3501a7 100644 --- a/src/views/packManagement/PackProjectMaintenance.vue +++ b/src/views/packManagement/PackProjectMaintenance.vue @@ -39,7 +39,7 @@ - + diff --git a/src/views/packManagement/modules/PackProjectSelectProjectModule.vue b/src/views/packManagement/modules/PackProjectSelectProjectModule.vue index df34ad1..372eb63 100644 --- a/src/views/packManagement/modules/PackProjectSelectProjectModule.vue +++ b/src/views/packManagement/modules/PackProjectSelectProjectModule.vue @@ -15,7 +15,7 @@ - + diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue index 9f90b17..aede2a2 100644 --- a/src/views/projectManagement/ConferenceMaintenance.vue +++ b/src/views/projectManagement/ConferenceMaintenance.vue @@ -12,7 +12,7 @@ - + diff --git a/src/views/projectManagement/GeneralProjectManagement.vue b/src/views/projectManagement/GeneralProjectManagement.vue index 345b3d3..c43f1c9 100644 --- a/src/views/projectManagement/GeneralProjectManagement.vue +++ b/src/views/projectManagement/GeneralProjectManagement.vue @@ -8,12 +8,12 @@ - + - + @@ -29,7 +29,7 @@ - + diff --git a/src/views/projectManagement/InternationalSeminar.vue b/src/views/projectManagement/InternationalSeminar.vue index 22d6e26..4c5a648 100644 --- a/src/views/projectManagement/InternationalSeminar.vue +++ b/src/views/projectManagement/InternationalSeminar.vue @@ -8,7 +8,7 @@ - + diff --git a/src/views/projectManagement/OtherMeeting.vue b/src/views/projectManagement/OtherMeeting.vue index a185e9b..c5ae5d6 100644 --- a/src/views/projectManagement/OtherMeeting.vue +++ b/src/views/projectManagement/OtherMeeting.vue @@ -8,7 +8,7 @@ - + diff --git a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue index 9bedd60..b9dbd75 100644 --- a/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue +++ b/src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue @@ -41,7 +41,7 @@ - + diff --git a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue index 1ff8123..1fb6ca8 100644 --- a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue +++ b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue @@ -8,7 +8,7 @@ - + diff --git a/src/views/projectManagement/WorkingGroupProjectManagement.vue b/src/views/projectManagement/WorkingGroupProjectManagement.vue index 6208c54..4f7cb59 100644 --- a/src/views/projectManagement/WorkingGroupProjectManagement.vue +++ b/src/views/projectManagement/WorkingGroupProjectManagement.vue @@ -8,7 +8,7 @@ - + diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue index 6eecd7f..9af6a5a 100644 --- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue +++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue @@ -10,12 +10,12 @@ - + - + diff --git a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue index e2c07f9..b0920ea 100644 --- a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue @@ -9,7 +9,7 @@ - + diff --git a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue index 61cec92..f234ddb 100644 --- a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue +++ b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue @@ -9,12 +9,12 @@ - + - + diff --git a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue index 4683606..50f03e8 100644 --- a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue @@ -9,7 +9,7 @@ - + diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue index 5502625..b89d462 100644 --- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue @@ -9,7 +9,7 @@ - + diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue index 1ff0b0f..12c908f 100644 --- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue +++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue @@ -9,7 +9,7 @@ - + diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue index 17a8002..dc9f602 100644 --- a/src/views/system/DepartList.vue +++ b/src/views/system/DepartList.vue @@ -24,7 +24,7 @@ 取消选择
- + diff --git a/src/views/signUp/SignUpEntrance.vue b/src/views/signUp/SignUpEntrance.vue index f60f157..83522e6 100644 --- a/src/views/signUp/SignUpEntrance.vue +++ b/src/views/signUp/SignUpEntrance.vue @@ -26,7 +26,7 @@ - {{ currentMeetingInfo.directorName }} + {{ currentMeetingInfo.directorName }} {{currentMeetingInfo.directorPhone}} diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue index ac852fe..4a2e48c 100644 --- a/src/views/signUp/SignUpPage.vue +++ b/src/views/signUp/SignUpPage.vue @@ -36,7 +36,7 @@ - {{ currentMeetingInfo.directorName }} + {{ currentMeetingInfo.directorName }}({{ currentMeetingInfo.directorPhone }}) @@ -146,7 +146,7 @@ - + 参会人 @@ -324,6 +324,8 @@ export default { codeErrorBool: true, // 是否是打包 isPackBool:false, + // 国际研讨会身份的控制 + identityBool:false, url: { add: '/meeting/payMeetingSituation/signUp' } @@ -549,8 +551,10 @@ export default { // 选择是说明身份是嘉宾 this.identifyType = 1 this.inviteCodeBool = true + this.identityBool = false } else if (e.target.value === 0) { this.inviteCodeBool = false + this.identityBool = true // 选的否 身份置空 this.identifyType = null this.$nextTick(() => { From 93b848d4581d70ab96fcb303a88044b2c273d4e1 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Thu, 21 Oct 2021 08:57:51 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E5=90=88?= =?UTF-8?q?=E5=90=8C=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/SelectMeetingProjectModule.vue | 16 ++++++++++++++-- .../modules/SelectMemberProjectModule.vue | 16 +++++++++++----- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue index c9f3457..877a1c2 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue @@ -291,10 +291,17 @@ export default { this.onClearSelected() }, handleOk() { - if (this.selectedRowKeys.length <= 0) { - this.$message.warn('请选择项目后再提交关联') + if (this.confirmLoading) { return } + this.confirmLoading = true + if (this.selectedRowKeys.length <= 0) { + this.$message.warn('请选择项目后再提交关联') + this.confirmLoading = false + + return + } + let submitData = [] let projectItem this.selectedRowKeys.forEach(item => { @@ -309,10 +316,15 @@ export default { if (res.success) { this.$message.success(res.message) this.close() + this.confirmLoading = false this.$emit('ok') } else { this.$message.warn(res.message) } + }).finally(() => { + setTimeout(() => { + this.confirmLoading = false + }, 1000) }) }, handleCancel() { diff --git a/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue index e97a8af..28c0fa6 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue @@ -109,10 +109,6 @@
- @@ -329,8 +325,13 @@ export default { this.$emit('ok') }, handleOk() { + if (this.confirmLoading) { + return + } + this.confirmLoading = true if (this.selectedRowKeys.length <= 0) { this.$message.warn('请选择项目后再提交关联') + this.confirmLoading = false return } let submitData = [] @@ -348,10 +349,15 @@ export default { this.$message.success(res.message) this.close() this.$emit('ok') + this.confirmLoading = false } else { this.$message.warn(res.message) } - }) + }).finally( () => { + setTimeout(() => { + this.confirmLoading = false + }, 1000) + } ) }, handleCancel() { this.activeKey = '1' From 10a93155a12a9aabd1c1f6ba50329a844ada0ef1 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Thu, 21 Oct 2021 09:38:52 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E5=90=88=E5=90=8C=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/RevenueContractDetail.vue | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue index 7a76b3d..031d5de 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue @@ -151,8 +151,8 @@
审核记录
-
-
+
{{ item.createBy }} @@ -330,8 +330,13 @@ export default { id: this.$route.query.revenueId } getRevenueContractById(param).then(res => { - this.detailData = res.result - this.detailData.pack = this.detailData.pack === 1 ? '是' : this.detailData.pack === 0 ? '否' : '' + if (res.success) { + this.detailData = res.result + this.detailData.pack = this.detailData.pack === 1 ? '是' : this.detailData.pack === 0 ? '否' : '' + } else { + // 添加异常判断，防止消息进入详情无法正常获取数据造成卡死及控制台报错 + this.$message.warn(res.message) + } }).finally(() => { this.loading = false }) @@ -428,4 +433,9 @@ export default { margin-right: 8px; } } + +.aduit-text { + color: #2F3133; + padding: 0 20px; +} \ No newline at end of file From 0ab3c4f5cf625a0770adac780ecffc64d52d28ee Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Thu, 21 Oct 2021 09:40:49 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E5=90=88?= =?UTF-8?q?=E5=90=8C=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../revenueContract/modules/SelectMemberProjectModule.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue index 28c0fa6..954d4b2 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue @@ -153,6 +153,13 @@ export default { width: 200, scopedSlots: {customRender: 'text'}, }, + { + title: '收费标准', + align: 'center', + dataIndex: 'chargeStandard', + width: 100, + scopedSlots: {customRender: 'text'}, + }, { title: '负责人', align: 'center',