From 79933ec6b4909abc930fee67c403f4f07a6d1b2b Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 22 Oct 2021 17:52:02 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8F=90=E7=A4=BA=E8=AF=AD]=E5=8E=BB=E6=8E=89?= =?UTF-8?q?form=E6=A0=A1=E9=AA=8C=E6=8F=90=E7=A4=BA=E8=AF=AD=E7=9A=84?= =?UTF-8?q?=EF=BC=81;=20bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tools/UserPassword.vue | 8 ++--- .../modules/BusinessManagementModule.vue | 9 +++--- .../modules/ExpenditureContractModule.vue | 31 ++++++++++++------ .../modules/RevenueContractModule.vue | 32 +++++++++++++------ .../modules/SelectProjectModule.vue | 2 +- .../SelectWorkingGroupProjectModule.vue | 5 +-- .../meetManage/meetingValidate.js | 26 +++++++-------- .../WorkingGroupMemberUnitMaintenance.vue | 32 ++++++++++++++----- .../modules/WorkingGroupProjectModule.vue | 4 +-- src/views/system/modules/DictItemModal.vue | 2 +- src/views/system/modules/UserModal.vue | 6 ++-- src/views/user/alteration/Alteration.vue | 14 ++++---- 12 files changed, 106 insertions(+), 65 deletions(-) diff --git a/src/components/tools/UserPassword.vue b/src/components/tools/UserPassword.vue index a320a65..b80d0fa 100644 --- a/src/components/tools/UserPassword.vue +++ b/src/components/tools/UserPassword.vue @@ -70,12 +70,12 @@ export default { validatorRules: { oldpassword: { rules: [{ - required: true, message: '请输入旧密码!' + required: true, message: '请输入旧密码' }] }, password: { rules: [ - { required: true, message: '请输入新密码!' }, + { required: true, message: '请输入新密码' }, { //原正则，3种组合时不会提示 /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/ pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,30}$/, @@ -186,14 +186,14 @@ export default { callback(new Error('两次密码不一致')) } if (value && !passwordReg(value)) { - callback('密码由8位及以上数字、大小写字母和特殊符号组成！') + callback('密码由8位及以上数字、大小写字母和特殊符号组成') } callback() }, compareToFirstPassword(rule, value, callback) { const form = this.form if (value && value !== form.getFieldValue('password')) { - callback('两次输入的密码不一样！') + callback('两次密码不一致') } else { callback() } diff --git a/src/views/businessManagement/modules/BusinessManagementModule.vue b/src/views/businessManagement/modules/BusinessManagementModule.vue index 9f6565a..5dd6f24 100644 --- a/src/views/businessManagement/modules/BusinessManagementModule.vue +++ b/src/views/businessManagement/modules/BusinessManagementModule.vue @@ -189,9 +189,9 @@ export default { methods: { add(limit) { // true 是调用无权限接口 - if(limit){ + if (limit) { this.url.add = '/company/payCompanyManagement/addMeeting' - }else { + } else { this.url.add = '/company/payCompanyManagement/add' } this.edit({}) @@ -312,7 +312,7 @@ export default { callback('请输入15位、18位的信用代码') return } - if (!this.model.id) { + if (this.model.dutyCode !== value) { const params = { confusionCode: 'pay_company_duty_code', fieldVal: value @@ -325,8 +325,9 @@ export default { } }) return + } else { + callback() } - callback() } else { callback('请输入信用代码') } diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue index 0568089..0c9ef2b 100644 --- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue +++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue @@ -75,7 +75,7 @@ - +
日期节点
- + - - - + + + + + + @@ -141,7 +144,7 @@
账款信息
- + 其他信息
- +
日期节点
- + - - - + + + + + + @@ -145,7 +148,7 @@
账款信息
- + 其他信息
- + - + - + @@ -69,9 +70,12 @@
- 添加成员 + + 添加成员 + + :action="importExcelUrl" @change="handleImportExcel" v-has="'workingGroupMember:import'" + v-if="canOperate"> 导入 @@ -80,9 +84,14 @@ 下载模板 - 批量删除 - 设置收费通知 - 催款提醒 + + 批量删除 + + + 设置收费通知 + + 催款提醒
@@ -261,6 +270,13 @@ export default { width: 280, dataIndex: 'contactsTemporaryNameOne', scopedSlots: { customRender: 'text' } + }, { + // 2021-10-22需求变更新加 + title: '收费通知号', + align: 'center', + width: 280, + dataIndex: 'chargeNoticeNo', + scopedSlots: { customRender: 'text' } }, { title: '应收金额', align: 'center', @@ -322,7 +338,7 @@ export default { // lastQueryParam: { // paymentDate: new Date().getFullYear().toString() // }, - canOperate: true, // 是否可操作（负责人B不可操作） + canOperate: true // 是否可操作（负责人B不可操作） } }, created() { @@ -469,7 +485,7 @@ export default { // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` window.open(url) } - }, + } // 2021 10 11 沟通后去掉了这个功能 // searchReset() { // this.lastQueryParam = { diff --git a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue index 7d5340b..c98aa2c 100644 --- a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue @@ -69,7 +69,7 @@ - + - + 《》/?！￥（）—【】‘；：”“。，、？]") if(reg.test(value)){ - callback('数据值不能包含特殊字符！') + callback('数据值不能包含特殊字符') }else{ //update--begin--autor:lvdandan-----date:20201203------for：JT-27【数据字典】字典 - 数据值可重复 getAction('/sys/dictItem/dictItemCheck',param).then((res)=>{ diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue index 0417681..b330290 100644 --- a/src/views/system/modules/UserModal.vue +++ b/src/views/system/modules/UserModal.vue @@ -597,7 +597,7 @@ export default { callback() } if (!passwordReg(value)) { - callback('密码由8位及以上数字、大小写字母和特殊符号组成！') + callback('密码由8位及以上数字、大小写字母和特殊符号组成') } if (value && this.confirmDirty) { form.validateFields(['confirm'], {force: true}) @@ -607,10 +607,10 @@ export default { compareToFirstPassword(rule, value, callback) { const form = this.form if (value && value !== form.getFieldValue('password')) { - callback('两次输入的密码不一样！') + callback('两次密码不一致') } if (value && !passwordReg(value)) { - callback('密码由8位及以上数字、大小写字母和特殊符号组成！') + callback('密码由8位及以上数字、大小写字母和特殊符号组成') } callback() }, diff --git a/src/views/user/alteration/Alteration.vue b/src/views/user/alteration/Alteration.vue index bc539ce..d9d3054 100644 --- a/src/views/user/alteration/Alteration.vue +++ b/src/views/user/alteration/Alteration.vue @@ -129,35 +129,35 @@ export default { validatorRules: { username: { rules: [ - { required: true, message: '请输入账号!' }], + { required: true, message: '请输入账号' }], validateTrigger: 'blur' }, phone: { rules: [ - { required: true, message: '请输入手机号!' }, + { required: true, message: '请输入手机号' }, { validator: this.validatePhone } ], validateTrigger: 'blur' }, verifyCode: { - rules: [{ required: true, message: '请输入验证码!' }], + rules: [{ required: true, message: '请输入验证码' }], validateTrigger: 'blur' }, password: { rules: [ - { required: true, message: '请输入新密码!' }, + { required: true, message: '请输入新密码' }, { pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,30}$/, - message: '密码由8位及以上数字、大小写字母和特殊符号组成！' + message: '密码由8位及以上数字、大小写字母和特殊符号组成' } ], validateTrigger: 'blur' }, confirmPassword: { rules: [ - { required: true, message: '请输入确认密码!' }, + { required: true, message: '请输入确认密码' }, { pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,30}$/, - message: '密码由8位及以上数字、大小写字母和特殊符号组成！' + message: '密码由8位及以上数字、大小写字母和特殊符号组成' }, { validator: this.handlePasswordCheck } ],