From ea5e35d8b464646000602dfb510c8601aedc43c3 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 28 Oct 2022 17:00:11 +0800
Subject: [PATCH] BUG 31143

---
 .../components/organizationSetting.vue        | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/project/pingchang/apps/AppOrganizationChange/components/organizationSetting.vue b/project/pingchang/apps/AppOrganizationChange/components/organizationSetting.vue
index 794d271c..f03fe169 100644
--- a/project/pingchang/apps/AppOrganizationChange/components/organizationSetting.vue
+++ b/project/pingchang/apps/AppOrganizationChange/components/organizationSetting.vue
@@ -31,10 +31,10 @@
             <template #content>
               <div flex>
                 <el-form-item class="fill" label="本届换届时间" prop="changeTime">
-                  <el-date-picker v-model="form.changeTime" @change="getNextChangeTime" value-format="yyyy-MM-dd"/>
+                  <el-date-picker v-model="form.changeTime" @change="getNextChangeTime" value-format="yyyy-MM-dd" placeholder="本届换届时间"/>
                 </el-form-item>
                 <el-form-item class="fill" label="下届换届时间" prop="nextChangeTime">
-                  <el-date-picker disabled v-model="form.nextChangeTime"/>
+                  <el-date-picker disabled v-model="form.nextChangeTime" placeholder="根据换届设置信息自动计算"/>
                 </el-form-item>
               </div>
               <el-form-item label="届次" prop="sessionTime">
@@ -75,9 +75,9 @@ export default {
       },
       formRules: {
         type: [{required: true, message: "请选择换届类型", trigger: "change"}],
-        sessionTime: [{required: true, message: "请输入届次", trigger: "change"}],
+        sessionTime: [{required: true, message: "请输入届次", trigger: "blur"}],
         userList: [{required: true, message: "请选择换届提醒人", trigger: "change"}],
-        changeTime: [{required: true, message: "请选择本次换届时间", trigger: "change"}],
+        changeTime: [{required: true, message: "请选择本次换届时间", trigger: "blur"}],
         nextChangeTime: [{required: true, message: "请选择下次换届时间", trigger: "change"}]
       },
       chooseUserList: [],
@@ -126,24 +126,26 @@ export default {
         params: {organizationId}
       }).then((res) => {
         if (res?.data) {
-          this.form = res.data
+          if (this.isMakeUp) {
+            const {type} = res.data
+            this.form = {type}
+          } else this.form = res.data
         }
       })
     },
     selectUser(v) {
-      this.form.userList = v
-    },
-    selectVote(e) {
-      this.form.voteUsers = e
+      this.form.userList = v.map(e => ({
+        name: e.name,
+        organizationId: e.partyOrgId,
+        partyId: e.id,
+        phone: e.phone
+      }))
     },
     confirm() {
       // 换届设置
       this.$refs.SettingForm.validate(v => {
         if (v) {
           const {id: organizationId, name: organizationName} = this.org
-          if (this.isMakeUp && !this.$route.query.id) {
-            delete this.form.id
-          }
           const action = `/app/${this.isMakeUp ? 'apporganizationgeneralelection' : 'apporganizationchangeconfig'}/${!!this.form.id ? 'update' : 'add'}`
           const addOrMakeup = !this.isMakeUp
           this.instance.post(action, {