diff --git a/project/pingchang/apps/AppGeneralElection/components/electionAdd.vue b/project/pingchang/apps/AppGeneralElection/components/electionAdd.vue
index 5ff34564..9e4e4ba9 100644
--- a/project/pingchang/apps/AppGeneralElection/components/electionAdd.vue
+++ b/project/pingchang/apps/AppGeneralElection/components/electionAdd.vue
@@ -85,7 +85,7 @@
-
@@ -97,7 +97,7 @@
-
@@ -156,7 +156,6 @@ export default {
voteUsers: [],
partyOrganizations: []
},
- chooseUserList: [],
formRules: {
title: [{required: true, message: "请输入标题", trigger: "blur"}],
organizationName: [{required: true, message: "请选择党组织", trigger: "blur"}],
@@ -171,6 +170,8 @@ export default {
info: {},
candidateUsersList: '',
voteUsersList: '',
+ chooseCandidateList: [],
+ chooseVoteList: [],
}
},
computed: {
@@ -194,12 +195,13 @@ export default {
params: {id:this.id}
}).then((res) => {
if(res?.data) {
- console.log(res.data,'getDetail');
this.form = res.data
this.form.organizationName = res.data.partyOrganizations[0].name
this.info = res.data
this.candidateUsersList = res.data.candidateUsers.map(v=> v.name)
this.voteUsersList = res.data.voteUsers.map(v=> v.name)
+ this.chooseCandidateList = res.data.candidateUsers
+ this.chooseVoteList = res.data.voteUsers
}
})
},
@@ -211,10 +213,10 @@ export default {
},
handlePartyOrgSelect(v) {
if(v) {
- this.form.organizationName = v[0].name
+ this.form.organizationName = v[0]?.name
this.form.partyOrganizations = [v[0]]
} else {
- this.form.organizationName = this.chooseUserList[0].name
+ this.form.organizationName = this.chooseUserList[0]?.name
this.form.partyOrganizations = this.chooseUserList
}
},
diff --git a/project/pingchang/apps/AppGeneralElection/components/electionList.vue b/project/pingchang/apps/AppGeneralElection/components/electionList.vue
index 8c57e038..8f1a7d8e 100644
--- a/project/pingchang/apps/AppGeneralElection/components/electionList.vue
+++ b/project/pingchang/apps/AppGeneralElection/components/electionList.vue
@@ -9,9 +9,9 @@
-
+
- 重置
+ 重置