BUG 31142

project/pingchang/apps/AppOrganizationChange/components/organizationSetting.vue

@@ -29,17 +29,17 @@
           </ai-card>
           <ai-card title="当前届次">
             <template #content>
-              <div flex>
-                <el-form-item class="fill" label="本届换届时间" prop="changeTime">
+              <div flex class="wrap">
+                <el-form-item class="w50" label="本届换届时间" prop="changeTime">
                   <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-form-item class="w50" label="下届换届时间" prop="nextChangeTime" v-if="!isMakeUp">
                   <el-date-picker disabled v-model="form.nextChangeTime" placeholder="根据换届设置信息自动计算"/>
                 </el-form-item>
+                <el-form-item label="届次" prop="sessionTime" class="w50">
+                  <el-input type="number" v-model="form.sessionTime" placeholder="请输入..."/>
+                </el-form-item>
               </div>
-              <el-form-item label="届次" prop="sessionTime">
-                <el-input type="number" v-model="form.sessionTime" placeholder="请输入..."/>
-              </el-form-item>
               <detail-panel :serve-list.sync="form.serveList" :candidate-list.sync="form.candidateList"/>
             </template>
           </ai-card>
@@ -96,7 +96,7 @@ export default {
   },
   created() {
     this.org = new this.MODEL.PartyOrg(this.$route.query.oid)
-    !!this.$route.query.id ? this.getSession() : this.getDetail()
+    !!this.isMakeUp ? this.getSession() : this.getDetail()
   },
   methods: {
     cancel() {
@@ -109,7 +109,7 @@ export default {
     getSession() {
       //根据id获取对应届次信息
       const {id} = this.$route.query
-      this.instance.post(`/app/apporganizationgeneralelection/queryDetailById`, null, {
+      id && this.instance.post(`/app/apporganizationgeneralelection/queryDetailById`, null, {
         pureBack: true,
         params: {id}
       }).then((res) => {
@@ -126,10 +126,7 @@ export default {
         params: {organizationId}
       }).then((res) => {
         if (res?.data) {
-          if (this.isMakeUp) {
-            const {type} = res.data
-            this.form = {type}
-          } else this.form = res.data
+          this.form = res.data
         }
       })
     },
@@ -171,6 +168,10 @@ export default {
     width: 100% !important;
   }
 
+  .w50 {
+    width: 50%;
+  }
+
   .tips {
     width: 100%;
     border: 1px solid #f82;