From d1430ef4509efe551f3397abd84efd4ac817673f Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Tue, 2 Jan 2024 14:45:15 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/BaseInfoForm.vue                  | 34 ++++++-------------
 1 file changed, 10 insertions(+), 24 deletions(-)

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(',')