diff --git a/src/utils/validate.js b/src/utils/validate.js index 693f7da..3d1e2c4 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -77,5 +77,5 @@ export function number(s) { * @returns {boolean} */ export function money(s) { - return /^[1-9](\d{1,10})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,9}$|^0$/.test(s) + return /^[0-9](\d{1,9})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,9}$|^0$/.test(s) } diff --git a/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue b/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue index d23effd..163eade 100644 --- a/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue +++ b/src/views/contractManagement/revenueContract/modules/AddMemberProject.vue @@ -255,7 +255,7 @@ export default { if(value && money(value)){ callback() }else { - callback('请输入合法的金额数字，最多2位小数,11位正数') + callback('请输入合法的金额数字，最多2位小数,10位正数') } } diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue index ddcfda4..fd0bb32 100644 --- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue +++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue @@ -201,7 +201,7 @@ :maxLength='50' @change="(e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}" @blur="addZero" - v-decorator="[ 'meetingCosts',validatorRules.meetingCosts]"> + v-decorator="[ 'meetingCosts',validateInviteCode.meetingCosts]"> 元/人 @@ -212,10 +212,18 @@ + @blur="addZero" + v-decorator="[ 'meetingCostsVip',validateInviteCode.meetingCostsVip]"> 元/人 + + + + + + @@ -301,6 +309,25 @@ + + + +
@@ -328,8 +355,10 @@ import moment from 'moment' import pick from 'lodash.pick' import meetingValidate from '@views/incomePayments/meetManage/meetingValidate' import PageHeaderTitle from '@comp/layouts/PageHeaderTitle' +import JImageUpload from '@comp/jero/JImageUpload' import {checkMeetingName} from '@/utils/validateOnly' import {addZero} from '@/utils/util' +import {money} from '@/utils/validate' export default { name: 'AddOrDetailMeet', @@ -340,7 +369,8 @@ export default { JDate, SelectPrincipal, JAreaLinkage, - PageHeaderTitle + PageHeaderTitle, + JImageUpload }, data() { return { @@ -397,6 +427,18 @@ export default { validateTrigger: ['blur', 'change'], initialValue: this.$store.getters.currentYear }, + meetingCosts: { + rules: [ + {required: true, validator: this.validateMeetingCosts}, + ], + validateTrigger: ['blur'] + }, + meetingCostsVip: { + rules: [ + {required: true, validator: this.validateMeetingCostsVip}, + ], + validateTrigger: ['blur'] + }, }, url: { add: '/meeting/payMeeting/add', @@ -407,7 +449,9 @@ export default { // 注册召开时间 newSignInTime: '', // 工作组会议列表 - workGroupList: [] + workGroupList: [], + // 收费二维码显示 + QRcodeBool: true, } }, computed: { @@ -681,6 +725,38 @@ export default { } }, /* + * 会议费用校验 + * */ + validateMeetingCosts(rule, value, callback) { + if (value === undefined || value === '' || value === null) { + callback('请输入会议费用') + } + if (value && money(value)) { + // 会议费用为 0控制二维码显示隐藏 + if (value === '0.00') { + this.QRcodeBool = false + } else { + this.QRcodeBool = true + } + callback() + } else { + callback('请输入合法的金额数字，最多2位小数,10位正数') + } + }, + /* + * 标协会议费用校验 + * */ + validateMeetingCostsVip(rule, value, callback) { + if (value === undefined || value === '' || value === null) { + callback('请输入会议费用(标协会员)') + } + if (value && money(value)) { + callback() + } else { + callback('请输入合法的金额数字，最多2位小数,10位正数') + } + }, + /* * 获取所有的工作组 * */ getWorkSelectList() { @@ -690,6 +766,13 @@ export default { } }) }, + moenyQRcode() { + let meetingCosts = this.form.getFieldValue('meetingCosts') + let meetingCostsVip = this.form.getFieldValue('meetingCostsVip') + console.log('meetingCostsVip', meetingCostsVip) + console.log('meetingCostsVip', meetingCosts) + }, + } } diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue index ad52820..b0ca739 100644 --- a/src/views/projectManagement/ConferenceMaintenance.vue +++ b/src/views/projectManagement/ConferenceMaintenance.vue @@ -80,7 +80,7 @@ 新增 导出 批量删除 - 发布-提醒 + 发布
@@ -111,7 +111,7 @@ 上传文件 - 报名信息 + 编辑 删除 @@ -285,7 +285,7 @@ export default { }) }, /* - * 发布提醒 + * 发布 * */ publishRemind() { if (this.selectionRows.length === 0) { @@ -294,7 +294,7 @@ export default { } else { // 传入选中的会议id this.$refs.publishRemindModal.open(this.selectedRowKeys) - this.$refs.publishRemindModal.title = '发布-提醒' + this.$refs.publishRemindModal.title = '发布' } }, diff --git a/src/views/projectManagement/modules/PublishRemindModal.vue b/src/views/projectManagement/modules/PublishRemindModal.vue index 945fbd8..1b7b90e 100644 --- a/src/views/projectManagement/modules/PublishRemindModal.vue +++ b/src/views/projectManagement/modules/PublishRemindModal.vue @@ -44,7 +44,8 @@ @@ -53,9 +54,10 @@ + @@ -90,12 +92,21 @@ export default { align: 'center', width: 200, dataIndex: 'chargeCompanyTemporaryName', + scopedSlots: {customRender: 'text'} }, { title: '企业联系人', align: 'center', width: 200, dataIndex: 'contactsTemporaryNameOne', + scopedSlots: {customRender: 'text'} + }, + { + title: '是否提醒', + align: 'center', + width: 200, + dataIndex: '', + // scopedSlots: {customRender: 'text'} }, ], model: {}, diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue index e261255..f1c9353 100644 --- a/src/views/system/modules/UserModal.vue +++ b/src/views/system/modules/UserModal.vue @@ -137,6 +137,10 @@ + + + + @@ -208,6 +212,13 @@ export default { }], validateTrigger: 'blur' }, + emailCode:{ + rules: [{ + required: true, + message: '请输入邮箱授权码' + }], + validateTrigger: 'blur' + }, password: { rules: [{ required: true, @@ -492,7 +503,7 @@ export default { // 触发表单验证 this.form.validateFields((err, values) => { if (!err) { - console.log("values=======", values) + console.log('values=======', values) let formData = Object.assign(this.model, values) if (that.fileList !== '') { formData.avatar = that.fileList