diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue index 366e5c72..b19a7f51 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue @@ -436,6 +436,7 @@ export default { if (formInline[res] instanceof Array) { if (formInline[res][0] instanceof Object) { // 说明是树选择 + formInline[res + '_dictText'] = formInline[res].map(item => item.label).join(',') formInline[res] = formInline[res].map(item => item.value).join(',') } else { formInline[res] = formInline[res].join(',') @@ -447,39 +448,24 @@ export default { // 外层获取数据要过校验,返回false表示没有通过校验 async getDataValidate () { let data = {} - console.log(this.rules) await this.$refs.ruleForm.validate(valid => { console.log(valid) if (valid) { - if (this.formInline.release_date && this.formInline.implementation_date) { - // 实施日期需要比发布日期至少大15天 - // 发布日期15天后的日期 - const releaseDate = new Date(Date.parse(this.formInline.release_date)) - const releaseDateAfter = releaseDate.setDate(releaseDate.getDate() + 15) - if (new Date(Date.parse(this.formInline.implementation_date)) <= releaseDateAfter) { - // 实施日期小于等于发布日期的15天后 - this.$message.warning(this.$t('implementationNeedGreaterThan')) - data = false - } else { - const formInline = JSON.parse(JSON.stringify(this.formInline)) - Object.keys(formInline).forEach(res => { - if (formInline[res] instanceof Array) { - if (formInline[res][0] instanceof Object) { - // 说明是树选择 - formInline[res] = formInline[res].map(item => item.value).join(',') - } else { - formInline[res] = formInline[res].join(',') - } - } - }) - data.formInline = formInline - } + // 实施日期需要比发布日期至少大15天 + // 发布日期15天后的日期 + const releaseDate = new Date(Date.parse(this.formInline.release_date)) + const releaseDateAfter = releaseDate.setDate(releaseDate.getDate() + 15) + if (new Date(Date.parse(this.formInline.implementation_date)) <= releaseDateAfter) { + // 实施日期小于等于发布日期的15天后 + this.$message.warning(this.$t('implementationNeedGreaterThan')) + data = false } else { const formInline = JSON.parse(JSON.stringify(this.formInline)) Object.keys(formInline).forEach(res => { if (formInline[res] instanceof Array) { if (formInline[res][0] instanceof Object) { // 说明是树选择 + formInline[res + '_dictText'] = formInline[res].map(item => item.label).join(',') formInline[res] = formInline[res].map(item => item.value).join(',') } else { formInline[res] = formInline[res].join(',')