Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

project/pingchang/apps/AppGeneralElection/components/electionAdd.vue

@@ -85,7 +85,7 @@
                 </el-row>
 
                 <el-form-item label="候选人" prop="candidateUsers">
-                  <ai-person-select :instance="instance" :customClicker="true" :chooseUserList="chooseUserList"
+                  <ai-person-select :instance="instance" :customClicker="true" :chooseUserList="chooseCandidateList"
                       url="/app/appgirdmemberinfo/list" headerTitle="党员列表"
                       :isMultiple="true" dialogTitle="选择" @selectPerson="selectCandidate" class="aipersonselect">
                     <template name="option" v-slot:option="{ item }">
@@ -97,7 +97,7 @@
                 </el-form-item>
 
                 <el-form-item label="投票人" prop="voteUsers">
-                  <ai-person-select :instance="instance" :customClicker="true" :chooseUserList="chooseUserList"
+                  <ai-person-select :instance="instance" :customClicker="true" :chooseUserList="chooseVoteList"
                       url="/app/appgirdmemberinfo/list" headerTitle="党员列表"
                       :isMultiple="true" dialogTitle="选择" @selectPerson="selectVote" class="aipersonselect">
                     <template name="option" v-slot:option="{ item }">
@@ -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
       }
     },

project/pingchang/apps/AppGeneralElection/components/electionList.vue

@@ -9,9 +9,9 @@
             <ai-select v-model="search.status" @change=";(page.current = 1), getList()" placeholder="请选择状态" :selectList="dict.getDict('electionStatus')"></ai-select>
           </template>
           <template #right>
-            <el-input v-model="search.title" class="search-input" size="small" v-throttle="() => {     ;(page.current = 1), getList()   } " placeholder="标题" clearable @change="getList" @clear="page.current = 1, (search.title = ''), getList()" suffix-icon="iconfont iconSearch">
+            <el-input v-model="search.title" class="search-input" size="small" v-throttle="() => {(page.current = 1), getList()} " placeholder="标题" clearable @change="getList" @clear="page.current = 1, (search.title = ''), getList()" suffix-icon="iconfont iconSearch">
             </el-input>
-            <el-button size="small" type="primary" icon="el-icon-refresh-right" @click="reset" >重置</el-button>
+            <el-button size="small" type="primary" icon="el-icon-refresh-right" @click="reset">重置</el-button>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size" @getList="getList" :col-configs="colConfigs" :dict="dict">