BUG 31142

This commit is contained in:
aixianling
2022-10-28 17:13:40 +08:00
parent 22174f431d
commit 9c9146ca8c

View File

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