diff --git a/src/components/jero/JAreaLinkagePca.vue b/src/components/jero/JAreaLinkagePca.vue
index 8fd88fd..3cdaebd 100644
--- a/src/components/jero/JAreaLinkagePca.vue
+++ b/src/components/jero/JAreaLinkagePca.vue
@@ -2,6 +2,7 @@
Bad type value: {{_type}}
@@ -36,7 +37,13 @@ export default {
props: {
value: {
type: String,
- required: false
+ required: false,
+ },
+ // 表单是否必填控制
+ hasError:{
+ type:Boolean,
+ required: false,
+ default:false
},
// 组件的类型,可选值:
// select 下拉样式
@@ -160,6 +167,14 @@ export default {
}
+ /deep/ .area-cascader-wrap .area-select:hover {
+ border-color: #069f99;;
+ }
+ /deep/ .has-error .area-select {
+ border-color: #f5222d!important;
+ }
+
+
///deep/.placeholderBlack .area-cascader-wrap .area-select.active {
// color: #333 !important;
//}
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 24c72eb..9fd4edd 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -94,6 +94,8 @@
@@ -436,8 +438,10 @@ export default {
workGroupList: [],
// 收费二维码显示
QRcodeBool: true,
+ // 召开地点border颜色控制
+ hasError:false,
// 会议类型
- meetingType:'',
+ meetingType: '',
}
},
computed: {
@@ -467,7 +471,7 @@ export default {
this.edit(res.result)
}
})
- }else {
+ } else {
// 没有id走新增
this.add()
}
@@ -510,11 +514,11 @@ export default {
}
console.log(this.model)
// 召开时间回显
- if(this.model.startTime){
+ if (this.model.startTime) {
this.model.convokeTime = [moment(this.model.startTime, dateFormat), moment(this.model.endTime, dateFormat)]
}
// 注册签到时间回显
- if( this.model.startSignInTime){
+ if (this.model.startSignInTime) {
this.model.signInTime = [moment(this.model.startSignInTime, dateFormat), moment(this.model.endSignInTime, dateFormat)]
}
// 后端需要的召开时间
@@ -525,7 +529,7 @@ export default {
this.$nextTick(() => {
// 加定时器是因为有可能赋值不成功
setTimeout(() => {
- this.form.setFieldsValue(pick(this.model,'notice','paymentQrCode','meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone')), 200
+ this.form.setFieldsValue(pick(this.model, 'notice', 'paymentQrCode', 'meetingName', 'meetingType', 'convokeTime', 'particularYear', 'estimatedNumber', 'meetingFiles', 'registerDeadline', 'meetingContent', 'convokeLocale', 'address', 'meetingCosts', 'directorId', 'remark', 'directorPhone')), 200
})
// 如果是标协会议则回显 标协会议的字段
if (this.meetingType === '2') {
@@ -550,6 +554,10 @@ export default {
handleOk() {
const that = this
this.form.validateFields((err, values) => {
+ // 这是设置召开时间不选择的边框颜色为红色
+ if (err && Object.prototype.hasOwnProperty.call(err, 'convokeLocale')) {
+ this.hasError = true
+ }
if (!err) {
that.confirmLoading = true
let httpurl = ''
@@ -562,7 +570,7 @@ export default {
let placeName = values.convokeLocale
const formData = Object.assign(this.model, values, {venue: this.getPcaText(placeName)})
// 如果会议的费用未为0 不能上传缴费凭证
- if(values.meetingCosts === '0.00' ){
+ if (values.meetingCosts === '0.00') {
delete formData.paymentQrCode
}
// 添加编辑会议需要增加会议类型
@@ -601,6 +609,14 @@ export default {
})
},
/*
+ *
+ * */
+ changeConvoke(val){
+ if(!!val){
+ this.hasError = false
+ }
+ },
+ /*
* 取消
* */
handleCancel() {
@@ -706,33 +722,38 @@ export default {
/*
* 根据会议类型返回不同的会议新增与编辑接口
* */
- createUrlByMeetingType(meetingType){
- switch (String(meetingType)){
+ createUrlByMeetingType(meetingType) {
+ switch (String(meetingType)) {
// 工作组会议
- case '1':return {
- add:'/meeting/workGroupMeeting/add',
- edit:'/meeting/workGroupMeeting/edit'
- }
+ case '1':
+ return {
+ add: '/meeting/workGroupMeeting/add',
+ edit: '/meeting/workGroupMeeting/edit'
+ }
// 标协会议
- case '2':return {
- add:'/meeting/standardsMeeting/add',
- edit:'/meeting/standardsMeeting/edit'
- }
+ case '2':
+ return {
+ add: '/meeting/standardsMeeting/add',
+ edit: '/meeting/standardsMeeting/edit'
+ }
// 国际研讨会
- case '3':return {
- add:'/meeting/internalMeeting/add',
- edit:'/meeting/internalMeeting/edit'
- }
+ case '3':
+ return {
+ add: '/meeting/internalMeeting/add',
+ edit: '/meeting/internalMeeting/edit'
+ }
// 其他会议
- case '4':return {
- add:'/meeting/otherMeeting/add',
- edit:'/meeting/otherMeeting/edit'
- }
+ case '4':
+ return {
+ add: '/meeting/otherMeeting/add',
+ edit: '/meeting/otherMeeting/edit'
+ }
// 分标委会议
- case '5':return {
- add:'/meeting/committeeMeeting/add',
- edit:'/meeting/committeeMeeting/edit'
- }
+ case '5':
+ return {
+ add: '/meeting/committeeMeeting/add',
+ edit: '/meeting/committeeMeeting/edit'
+ }
}
},
/*
@@ -791,8 +812,8 @@ export default {
// 会议费用为 0控制二维码显示隐藏
if (value === '0.00') {
this.QRcodeBool = false
- // 如果付款二维码有值 需要清空
- if(this.form.getFieldValue('paymentQrCode')){
+ // 如果付款二维码有值 需要清空
+ if (this.form.getFieldValue('paymentQrCode')) {
this.form.resetFields('paymentQrCode')
}
} else {
diff --git a/src/views/incomePayments/meetManage/meetingValidate.js b/src/views/incomePayments/meetManage/meetingValidate.js
index 3370bd7..4394633 100644
--- a/src/views/incomePayments/meetManage/meetingValidate.js
+++ b/src/views/incomePayments/meetManage/meetingValidate.js
@@ -27,7 +27,7 @@ export default {
rules: [
{ required: true, message: '请选择省市!' },
],
- validateTrigger:['blur','change']
+ validateTrigger:['change']
},
address:{
rules: [