BUG 31143
This commit is contained in:
		@@ -31,10 +31,10 @@
 | 
				
			|||||||
            <template #content>
 | 
					            <template #content>
 | 
				
			||||||
              <div flex>
 | 
					              <div flex>
 | 
				
			||||||
                <el-form-item class="fill" label="本届换届时间" prop="changeTime">
 | 
					                <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>
 | 
				
			||||||
                <el-form-item class="fill" label="下届换届时间" prop="nextChangeTime">
 | 
					                <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>
 | 
					                </el-form-item>
 | 
				
			||||||
              </div>
 | 
					              </div>
 | 
				
			||||||
              <el-form-item label="届次" prop="sessionTime">
 | 
					              <el-form-item label="届次" prop="sessionTime">
 | 
				
			||||||
@@ -75,9 +75,9 @@ export default {
 | 
				
			|||||||
      },
 | 
					      },
 | 
				
			||||||
      formRules: {
 | 
					      formRules: {
 | 
				
			||||||
        type: [{required: true, message: "请选择换届类型", trigger: "change"}],
 | 
					        type: [{required: true, message: "请选择换届类型", trigger: "change"}],
 | 
				
			||||||
        sessionTime: [{required: true, message: "请输入届次", trigger: "change"}],
 | 
					        sessionTime: [{required: true, message: "请输入届次", trigger: "blur"}],
 | 
				
			||||||
        userList: [{required: true, message: "请选择换届提醒人", trigger: "change"}],
 | 
					        userList: [{required: true, message: "请选择换届提醒人", trigger: "change"}],
 | 
				
			||||||
        changeTime: [{required: true, message: "请选择本次换届时间", trigger: "change"}],
 | 
					        changeTime: [{required: true, message: "请选择本次换届时间", trigger: "blur"}],
 | 
				
			||||||
        nextChangeTime: [{required: true, message: "请选择下次换届时间", trigger: "change"}]
 | 
					        nextChangeTime: [{required: true, message: "请选择下次换届时间", trigger: "change"}]
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      chooseUserList: [],
 | 
					      chooseUserList: [],
 | 
				
			||||||
@@ -126,24 +126,26 @@ export default {
 | 
				
			|||||||
        params: {organizationId}
 | 
					        params: {organizationId}
 | 
				
			||||||
      }).then((res) => {
 | 
					      }).then((res) => {
 | 
				
			||||||
        if (res?.data) {
 | 
					        if (res?.data) {
 | 
				
			||||||
          this.form = res.data
 | 
					          if (this.isMakeUp) {
 | 
				
			||||||
 | 
					            const {type} = res.data
 | 
				
			||||||
 | 
					            this.form = {type}
 | 
				
			||||||
 | 
					          } else this.form = res.data
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
      })
 | 
					      })
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    selectUser(v) {
 | 
					    selectUser(v) {
 | 
				
			||||||
      this.form.userList = v
 | 
					      this.form.userList = v.map(e => ({
 | 
				
			||||||
    },
 | 
					        name: e.name,
 | 
				
			||||||
    selectVote(e) {
 | 
					        organizationId: e.partyOrgId,
 | 
				
			||||||
      this.form.voteUsers = e
 | 
					        partyId: e.id,
 | 
				
			||||||
 | 
					        phone: e.phone
 | 
				
			||||||
 | 
					      }))
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    confirm() {
 | 
					    confirm() {
 | 
				
			||||||
      // 换届设置
 | 
					      // 换届设置
 | 
				
			||||||
      this.$refs.SettingForm.validate(v => {
 | 
					      this.$refs.SettingForm.validate(v => {
 | 
				
			||||||
        if (v) {
 | 
					        if (v) {
 | 
				
			||||||
          const {id: organizationId, name: organizationName} = this.org
 | 
					          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 action = `/app/${this.isMakeUp ? 'apporganizationgeneralelection' : 'apporganizationchangeconfig'}/${!!this.form.id ? 'update' : 'add'}`
 | 
				
			||||||
          const addOrMakeup = !this.isMakeUp
 | 
					          const addOrMakeup = !this.isMakeUp
 | 
				
			||||||
          this.instance.post(action, {
 | 
					          this.instance.post(action, {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user