From 7d8e25036acac9d9c1f696e47c155392168b5465 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Wed, 15 Sep 2021 15:51:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=86=92=E5=8F=B7=20?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E8=A1=A50?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/util.js | 34 ++++++ .../meetManage/AddOrDetailMeet.vue | 112 +++++++++--------- .../memberManage/SafeguardMemberList.vue | 12 +- 3 files changed, 97 insertions(+), 61 deletions(-) diff --git a/src/utils/util.js b/src/utils/util.js index 400dd1f..4553f1c 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -36,6 +36,7 @@ export function filterObj(obj) { } for ( let key in obj) { + // eslint-disable-next-line if (obj.hasOwnProperty(key) && (obj[key] == null || obj[key] == undefined || obj[key] === '')) { delete obj[key] @@ -86,6 +87,7 @@ let indexRouter = [{ path: '/', name: 'dashboard', //component: () => import('@/components/layouts/BasicLayout'), + // eslint-disable-next-line component: resolve => require(['@/components/layouts/TabLayout'], resolve), meta: { title: '首页' }, redirect: '/dashboard/analysis', @@ -136,6 +138,7 @@ function generateChildRouters (data) { // }else if(item.component=="modules/online/cgreport/auto/OnlCgreportAutoList"){ // componentPath = onlineCommons.OnlCgreportAutoList // }else{ + // eslint-disable-next-line componentPath = resolve => require(['@/' + component+'.vue'], resolve) // } @@ -587,3 +590,34 @@ export function isRepeat(arr) { } return false } +/** + * 补充0 + * */ + +export function addZero(e) { + // (e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')} + console.log(e) + // 判断是否包含 . + let value = e.target.value + // 判断是否包含小数点 + if (value.includes('.')) { + // 获取索引 + let index = value.indexOf('.') + console.log('index', index) + // 小树点之前的数 + let beforePointValue = value.slice(0, index + 1) + // 小数点之后的数字 + let afterPointValue = value.slice(index + 1) + // 大于等于2 + if (afterPointValue.length >= 2) { + e.target.value = beforePointValue + afterPointValue + }else { + // 不足2位补0 + afterPointValue = afterPointValue.padEnd(2,'0') + e.target.value = beforePointValue + afterPointValue + } + }else { + // 不包括小数点 + e.target.value = e.target.value + '.00' + } +} diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue index 2e946c2..ddcfda4 100644 --- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue +++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue @@ -10,7 +10,7 @@ - + - + - @@ -70,7 +69,7 @@ style="width: 100%"> - + - + - + - + - - + + - + @@ -153,7 +152,7 @@
邀请码
- + - + - + - + 会议费用 - + 元/人 @@ -222,14 +222,14 @@
联系方式
- + - + - + - +
- + - + - + - +
- + { // 加定时器是因为有可能赋值不成功 - setTimeout( () => { - this.form.setFieldsValue(pick(this.model, 'meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone')),200 + setTimeout(() => { + this.form.setFieldsValue(pick(this.model, 'meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone')), 200 }) // 如果是标协会议则回显 标协会议的字段 - if(this.meetingType === '2'){ - console.log('this.model',this.model) - this.form.setFieldsValue(pick(this.model,'signInTime','hotelContactsList','tbMeetingType','meetingCostsVip','hotelName','hotelAddress' )) + if (this.meetingType === '2') { + console.log('this.model', this.model) + this.form.setFieldsValue(pick(this.model, 'signInTime', 'hotelContactsList', 'tbMeetingType', 'meetingCostsVip', 'hotelName', 'hotelAddress')) } // 如果是工作组会议 赋值工作组 - if(this.meetingType === '1'){ - this.form.setFieldsValue(pick(this.model,'workingGroupId', )) + if (this.meetingType === '1') { + this.form.setFieldsValue(pick(this.model, 'workingGroupId',)) } // 如果是国际研讨会则赋值邀请码 if (this.meetingType === '3') { @@ -505,7 +507,7 @@ export default { let placeName = values.convokeLocale const formData = Object.assign(this.model, values, {venue: this.getPcaText(placeName)}) // 如果是工作会议维护跳转的需要加上会议类型为工作组会议和工作组id - if(!this.isWorkGroupMeetType) { + if (!this.isWorkGroupMeetType) { formData.meetingType = '1' formData.workingGroupId = this.$route.query.workingGroupProjectId } @@ -655,26 +657,26 @@ export default { /* * 会议名称唯一校验 * */ - validaeMeetingName(rule,value,callback){ - checkMeetingName(value,this.model.id).then(res => { - if(res.success){ + validaeMeetingName(rule, value, callback) { + checkMeetingName(value, this.model.id).then(res => { + if (res.success) { callback() - }else { - callback(res.code === 500 ? '会议名称已存在': res) + } else { + callback(res.code === 500 ? '会议名称已存在' : res) } }) }, /* * 年份校验 * */ - validateYear(rule,value,callback){ - if(value === undefined || value === '' || value === null ){ + validateYear(rule, value, callback) { + if (value === undefined || value === '' || value === null) { callback('请选择年份') } const year = new Date().getFullYear() - if(Number(value) < year){ + if (Number(value) < year) { callback(`请选择${year}年或之后的年份`) - }else { + } else { callback() } }, diff --git a/src/views/incomePayments/memberManage/SafeguardMemberList.vue b/src/views/incomePayments/memberManage/SafeguardMemberList.vue index f9aab76..ddf9a2a 100644 --- a/src/views/incomePayments/memberManage/SafeguardMemberList.vue +++ b/src/views/incomePayments/memberManage/SafeguardMemberList.vue @@ -10,22 +10,22 @@
- {{ currentInfo.projectName }} + {{ currentInfo.projectName }} - {{ currentInfo.directorName }} + {{ currentInfo.directorName }} - {{ currentInfo.chargeStandard }} + {{ currentInfo.chargeStandard }} - {{ currentInfo.chargeNoticeNo }} + {{ currentInfo.chargeNoticeNo }} - + - {{ currentInfo.remark }} + {{ currentInfo.remark }}