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

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

@@ -1,52 +1,91 @@
 <template>
   <section class="electionAdd">
-    <ai-detail>
-      <ai-title slot="title" title="添加换届选举" isShowBottomBorder isShowBack @onBackClick="cancel(true)"/>
+    <ai-detail class="add" v-if="id && !isEdit">
+      <template slot="title">
+        <ai-title title="换届选举详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
+      </template>
+      <template slot="content">
+        <ai-card title="基本信息">
+          <template #right>
+            <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="edit">修改</span>
+          </template>
+          <template #content v-if="isEdit == false">
+            <ai-wrapper>
+              <ai-info-item label="标题" :value="info.title"></ai-info-item>
+              <ai-info-item label="投票说明" :value="info.votingInstructions"></ai-info-item>
+              <ai-info-item label="单位名称" :value="info.organizationName"></ai-info-item>
+              <ai-info-item label="选举方式" :value="info.electionMethod"></ai-info-item>
+              <ai-info-item label="应选人数" :value="info.candidatesNumber"></ai-info-item>
+              <ai-info-item label="投票日期" :value="info.votingDate"></ai-info-item>
+              <ai-info-item label="候选人" isLine>
+                <span v-for="(item,index) in candidateUsersList" :key="index">
+                  {{ item }}
+                  <span v-if="index < candidateUsersList.length - 1">,</span>
+                </span>
+              </ai-info-item>
+              <ai-info-item label="投票人" isLine :value="info.voteUsers">
+                <span v-for="(item,index) in voteUsersList" :key="index">
+                  {{ item }}
+                  <span v-if="index < voteUsersList.length - 1">,</span>
+                </span>
+              </ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+      </template>
+    </ai-detail>
+    <ai-detail v-else>
+      <ai-title slot="title" :title="id? '编辑换届选举':'添加换届选举'" isShowBottomBorder isShowBack @onBackClick="cancel(true)"/>
       <template slot="content">
         <ai-card title="基本信息">
           <template #content>
             <div class="add-form">
               <el-form ref="form" :model="form" :rules="formRules" size="small"  label-width="150px">
 
-                <el-form-item label="标题" prop="licenseName">
-                  <el-input v-model="form.licenseName" placeholder="请输入" show-word-limit maxlength="100"></el-input>
+                <el-form-item label="标题" prop="title">
+                  <el-input v-model="form.title" placeholder="请输入" show-word-limit maxlength="100"></el-input>
                 </el-form-item>
 
-                <el-form-item label="投票说明" prop="licenseName">
-                  <el-input type="textarea" :rows="5" v-model="form.licenseName" placeholder="请输入" show-word-limit maxlength="500"></el-input>
+                <el-form-item label="投票说明">
+                  <el-input type="textarea" :rows="5" v-model="form.votingInstructions" placeholder="请输入" show-word-limit maxlength="500"></el-input>
                 </el-form-item>
 
-                <el-form-item label="单位名称" prop="licenseOrganization">
-                  <el-input size="small" disabled placeholder="请选择所属党组织" v-model="form.partyOrgName">
+                <el-form-item label="单位名称" prop="organizationName">
+                  <el-input size="small" disabled placeholder="请选择所属党组织" v-model="form.organizationName">
                     <template slot="append">
                       <ai-party :instance="instance" size="small" :value="form.partyOrgId" @origin="handlePartyOrgSelect"/>
                     </template>
                   </el-input>
                 </el-form-item>
 
-                <el-form-item label="选举方式" prop="licenseOrganization">
-                  <el-radio v-model="form.radio" label="1">等额</el-radio>
-                  <el-radio v-model="form.radio" label="2">差额</el-radio>
+                <el-form-item label="选举方式" prop="electionMethod">
+                  <el-tooltip class="item" effect="dark" content="差额选举：候选人数多于应选人数的选举方式；
+                   等额选举：候选人数与应选人数相等的选举方式。" placement="top">
+                    <i class="el-icon-info" style="margin-right: 8px"></i>
+                  </el-tooltip>
+                  
+                  <el-radio v-model="form.electionMethod" label="1">等额</el-radio>
+                  <el-radio v-model="form.electionMethod" label="2">差额</el-radio>
                 </el-form-item>
                 
                 <el-row type="flex">
                   <el-col :span="20">
-                    <el-form-item label="应选人数" prop="licenseCode">
-                      <el-input type="number" v-model="form.licenseCode" placeholder="请输入"></el-input>
+                    <el-form-item label="应选人数" prop="candidatesNumber">
+                      <el-input type="number" v-model="form.candidatesNumber" placeholder="请输入"></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="20">
-                    <el-form-item label="投票日期" prop="decisionDate">
-                      <el-date-picker v-model="form.decisionDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:338px">
+                    <el-form-item label="投票日期" prop="votingDate">
+                      <el-date-picker v-model="form.votingDate" value-format="yyyy-MM-dd HH:mm:ss" type="date" placeholder="选择日期" style="width:338px">
                       </el-date-picker>
                     </el-form-item>
                   </el-col>
                 </el-row>
 
-                <el-form-item label="候选人" prop="licenseOrganization">
+                <el-form-item label="候选人" prop="candidateUsers">
                   <ai-person-select :instance="instance" :customClicker="true" :chooseUserList="chooseUserList"
                       url="/app/appgirdmemberinfo/list" headerTitle="党员列表"
-                      :isMultiple="true" dialogTitle="选择" @selectPerson="selectPerson" class="aipersonselect">
+                      :isMultiple="true" dialogTitle="选择" @selectPerson="selectCandidate" class="aipersonselect">
                     <template name="option" v-slot:option="{ item }">
                       <span class="iconfont iconProlife">{{ item.name }}</span>
                       <span>{{ item.phone }}</span>
@@ -55,10 +94,10 @@
                   </ai-person-select>
                 </el-form-item>
 
-                <el-form-item label="投票人" prop="licenseOrganization">
+                <el-form-item label="投票人" prop="voteUsers">
                   <ai-person-select :instance="instance" :customClicker="true" :chooseUserList="chooseUserList"
                       url="/app/appgirdmemberinfo/list" headerTitle="党员列表"
-                       dialogTitle="选择" @selectPerson="selectPerson" class="aipersonselect">
+                      :isMultiple="true" dialogTitle="选择" @selectPerson="selectVote" class="aipersonselect">
                     <template name="option" v-slot:option="{ item }">
                       <span class="iconfont iconProlife">{{ item.name }}</span>
                       <ai-id mode="show" :show-eyes="false" :value="item.idNumber"/>
@@ -75,31 +114,7 @@
         <el-button class="footer-btn" type="primary" @click="confirm()">保存</el-button>
       </template>
     </ai-detail>
-    <!-- <ai-detail class="add" v-if="id && !isEdit">
-      <template slot="title">
-        <ai-title title="行政许可信息详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
-      </template>
-      <template slot="content">
-        <ai-card title="基本信息">
-          <template #right>
-            <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="edit">修改</span>
-          </template>
-          <template #content v-if="isEdit == false">
-            <ai-wrapper>
-              <ai-info-item label="许可文书名称" :value="data.licenseName"></ai-info-item>
-              <ai-info-item label="许可文书号" :value="data.licenseCode"></ai-info-item>
-              <ai-info-item label="许可决定日期" :value="data.decisionDate"></ai-info-item>
-              <ai-info-item label="许可有效期自" :value="data.startDate"></ai-info-item>
-              <ai-info-item label="许可有效期至" :value="data.endDate"></ai-info-item>
-              <ai-info-item label="许可机关" isLine :value="data.licenseOrganization"></ai-info-item>
-              <ai-info-item label="经营主体" isLine :value="data.enterpriseName"></ai-info-item>
-              <ai-info-item label="统一信用代码" isLine :value="data.unifiedCode"></ai-info-item>
-              <ai-info-item label="许可内容" isLine :value="data.licenseContent"></ai-info-item>
-            </ai-wrapper>
-          </template>
-        </ai-card>
-      </template>
-    </ai-detail> -->
+    
   </section>
 </template>
 
@@ -109,13 +124,60 @@ export default {
   props: {
     instance: Function,
     dict: Object,
-    permissions: Function
+    params: Object,
   },
+
   data() {
+    let validCandidate = (rule, value, callback) => {
+      if (!value.length) {
+        return callback(new Error('请选择候选人'));
+      } else {
+        callback();
+      }
+    };
+    let validVote = (rule, value, callback) => {
+      if (!value.length) {
+        return callback(new Error('请选择投票人'));
+      } else {
+        callback();
+      }
+    };
     return {
       form: {
-
+        title: '',
+        votingInstructions: '',
+        organizationName: '',
+        electionMethod: '',
+        candidatesNumber: '',
+        votingDate: '',
+        candidateUsers: [],
+        voteUsers: [],
+        partyOrganizations: []
       },
+      chooseUserList: [],
+      formRules: {
+        title: [{required: true, message: "请输入标题", trigger: "blur"}],
+        organizationName: [{required: true, message: "请选择党组织", trigger: "blur"}],
+        electionMethod: [{required: true, message: "请选择选举方式", trigger: "blur"}],
+        candidatesNumber: [{required: true, message: "请输入应选人数", trigger: "blur"}],
+        votingDate: [{required: true, message: "请选择投票日期", trigger: "blur"}],
+        candidateUsers: [{required: true,validator: validCandidate, trigger: "blur"}],
+        voteUsers: [{required: true,validator: validVote, trigger: "blur"}],
+      },
+      id: '',
+      isEdit: false,
+      info: {},
+      candidateUsersList: '',
+      voteUsersList: '',
+    }
+  },
+  computed: {
+  },
+  created() {
+    if(this.params && this.params.id) {
+      this.id = this.params.id
+      this.isEdit = this.params.isEdit
+      this.getDetail()
     }
   },
   methods: {
@@ -124,7 +186,56 @@ export default {
         type: 'electionList',
         isRefresh: !!isRefresh
       })
-    }
+    },
+    getDetail() {
+      this.instance.post(`/app/appgeneralelectioninfo/queryDetailById`,null, {
+        params: {id:this.id}
+      }).then((res) => {
+        if(res?.data) {
+          // console.log(res.data);
+          this.form = res.data,
+          this.info = res.data
+          this.candidateUsersList = res.data.candidateUsers.map(v=> v.name)
+          this.voteUsersList = res.data.voteUsers.map(v=> v.name)
+        }
+      })
+    },
+    edit() {},
+    selectCandidate(v) {
+      this.form.candidateUsers = v
+    },
+    selectVote(e) {
+      this.form.voteUsers = e
+    },
+    handlePartyOrgSelect(v) {
+      if(v) {
+        this.form.organizationName = v[0].name
+        this.form.partyOrganizations = [v[0]]
+      } else {
+        this.form.organizationName = this.chooseUserList[0].name
+        this.form.partyOrganizations = this.chooseUserList
+      }
+    },
+    confirm() {
+      this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.instance.post(`/app/appgeneralelectioninfo/addOrUpdate`,{
+              ...this.form
+            }).then(res => {
+              if(res.code == 0) {
+                if(this.id) {
+                  this.$message.success('编辑成功')
+                } else {
+                  this.$message.success('新增成功')
+                }
+                this.cancel(false)
+              }
+            }).catch((err) => {
+              console.log(err);
+            })
+          }
+      })
+    },
   },
 }
 </script>

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

@@ -5,7 +5,7 @@
       <template #content>
         <ai-search-bar>
           <template #left>
-            <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')" >添加</el-button>
+            <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('', false)" >添加</el-button>
             <ai-select v-model="search.status" @change=";(page.current = 1), getList()" placeholder="请选择状态" :selectList="dict.getDict('cwpStatus')"></ai-select>
           </template>
           <template #right>
@@ -18,8 +18,8 @@
           <el-table-column slot="options" label="操作" fixed="right" align="center">
             <template slot-scope="{ row }">
               <!--  show-overflow-tooltip -->
-              <el-button type="text" @click.native="toAdd(row.id)">编辑</el-button>
-              <el-button type="text" @click.native="toAdd(row.id)">详情</el-button>
+              <el-button type="text" @click.native="toAdd(row.id, true)">编辑</el-button>
+              <el-button type="text" @click.native="toAdd(row.id, false)">详情</el-button>
               <el-button type="text" @click.native="handleDelete(row.id)">删除</el-button>
             </template>
           </el-table-column>
@@ -57,11 +57,11 @@ export default {
   computed: {
     colConfigs() {
       return [
-        {prop: "", label: "标题", align: "left", showOverflowTooltip: true},
-        {prop: "", label: "所属支部", align: "center"},
-        {prop: "", label: "选举方式", align: "center"},
-        {prop: "", label: "应选人数", align: "center"},
-        {prop: "", label: "状态", align: "center",width: "180px"},
+        {prop: "title", label: "标题", align: "left", showOverflowTooltip: true},
+        {prop: "organizationName", label: "所属支部", align: "center"},
+        {prop: "electionMethod", label: "选举方式", align: "center"},
+        {prop: "chooseNumber", label: "应选人数", align: "center"},
+        {prop: "status", label: "状态", align: "center",width: "180px"},
         { slot: "options", },
       ]
     }
@@ -75,15 +75,17 @@ export default {
         }
       }).then(res=> {
         if(res?.data) {
-          console.log(res);
+          this.tableData = res.data.records
+          this.total.total = res.data.total
         }
       })
     },
-    toAdd(id) {
+    toAdd(id,flag) {
       this.$emit('change', {
         type: 'electionAdd',
         params: {
           id: id || '',
+          isEdit: flag
         }
       })
     },

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

@@ -1,7 +1,71 @@
 <template>
-  <section class="addChange">
-    新增 
-  </section>
+  <ai-list class="addChange">
+    <template #title>
+      <ai-title title="基本信息" isShowBottomBorder isShowBack  @onBackClick="cancel(false)" />
+    </template>
+        <template #content>
+      <div class="Form" style="padding: 0 200px;">
+        <el-form ref="form" :model="form" label-width="100px" label-position="right">
+          <ai-bar title="基本信息"></ai-bar>
+                <el-row type="flex">
+                  <el-col :span="12">
+                    <el-form-item label="换届时间" prop="data" :rules="[{ required: true, message: '请选择换届时间', trigger: 'blur' }]">
+                      <el-input size="small" :maxlength="30" placeholder="请输入大屏项目名称" v-model="form.name"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="届次" prop="noun" :rules="[{ required: true, message: '请输入届次', trigger: 'blur' }]">
+                      <el-input size="small" :maxlength="30" placeholder="请输入届次" v-model="form.name"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+
+        <ai-bar title="本届任职(必填)">
+                <template slot="right">
+                  <el-button size="small" type="text" icon="iconfont iconAdd" @click="toEdit('')" >添加任职人员</el-button>
+                </template>
+              </ai-bar>
+              <ai-table
+                class="detail-table__table"
+                :tableData="tableDataJob"
+                :col-configs="colConfigsJob"
+                :total="job.total"
+                :current.sync="job.current"
+                :size.sync="job.size"
+              >
+          <!-- @getList="getJobList" -->
+                <el-table-column slot="options" label="操作" align="center">
+                  <template slot-scope="{ row }">
+                    <el-button type="text" @click="jobEdit(row.id)">编辑</el-button>
+                    <el-button type="text" @click="jobDelete(row.id)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </ai-table>
+              <ai-bar title="本届候选人">
+                <template slot="right">
+                  <el-button size="small" type="text" icon="iconfont iconAdd" @click="toEdit('')" >添加候选人</el-button>
+                </template>
+              </ai-bar>
+              <ai-table
+                class="detail-table__table"
+                :tableData="tableDataPerson"
+                :col-configs="colConfigsPerson"
+                :total="person.total"
+                :current.sync="person.current"
+                :size.sync="person.size"
+                >
+          <!-- @getList="getJobList" -->
+                <el-table-column slot="options" label="操作" align="center">
+                  <template slot-scope="{ row }">
+                    <el-button type="text" @click="jobEdit(row.id)">编辑</el-button>
+                    <el-button type="text" @click="jobDelete(row.id)">删除</el-button>
+                  </template>
+                </el-table-column>
+        </ai-table>
+            </div>
+        </template>
+  </ai-list>
 </template>
 
 <script>
@@ -12,6 +76,55 @@ export default {
     permissions: Function,
     dict: Object,
   },
+  data() {
+    return {
+      form: {
+
+      },
+      tableDataJob: [],
+      tableDataPerson: [],
+      totalJob: '',
+      job: {
+        total: 0,
+        current: 1,
+        size: 10,
+      },
+      person: {
+        total: 0,
+        current: 1,
+        size: 10,
+      }
+    }
+  },
+  computed: {
+    colConfigsJob() {
+      return [
+        {prop: 'content', label: '职位'},
+        {prop: 'content', label: '姓名'},
+        {slot: 'options'},
+      ]
+    },
+    colConfigsPerson() {
+      return [
+        {prop: 'content', label: '职位'},
+        {prop: 'content', label: '候选人'},
+        {slot: 'options'},
+      ]
+    },
+    formRules() {
+      return {
+        // corpId: [{required: true, message: "请输入CorpId"}],
+      }
+    }
+  },
+  methods: {
+    cancel (isRefresh) {
+      this.$emit('change', {
+        type: 'List',
+        isRefresh: !!isRefresh
+      })
+    }
+  }
 }
 </script>
 

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

@@ -14,27 +14,7 @@
       </ai-wrapper>
       <ai-bar title="本届任职">
         <template slot="right">
-          <el-button size="small" type="text" icon="iconfont iconAdd" @click="toAdd('')" >添加任职人员</el-button>
-        </template>
-      </ai-bar>
-      <ai-table
-          class="detail-table__table"
-          :tableData="tableData"
-          :col-configs="colConfigs"
-          :total="totalJob"
-          :current.sync="current"
-          :size.sync="size"
-          @getList="getJobList">
-          <el-table-column slot="options" label="操作" align="center">
-            <template slot-scope="{ row }">
-              <el-button type="text" @click="jobEdit(row.id)">编辑</el-button>
-              <el-button type="text" @click="jobDelete(row.id)">删除</el-button>
-            </template>
-          </el-table-column>
-        </ai-table>
-        <ai-bar title="本届候选人">
-        <template slot="right">
-          <el-button size="small" type="text" icon="iconfont iconAdd" @click="toAdd('')" >添加候选人</el-button>
+          <el-button size="small" type="text" icon="iconfont iconAdd" @click="dialogJob=true" >添加任职人员</el-button>
         </template>
       </ai-bar>
       <ai-table
@@ -52,32 +32,50 @@
           </template>
         </el-table-column>
       </ai-table>
+      <ai-bar title="本届候选人">
+      <template slot="right">
+        <el-button size="small" type="text" icon="iconfont iconAdd" @click="dialogCandidate = true" >添加候选人</el-button>
+      </template>
+      </ai-bar>
+      <ai-table
+        class="detail-table__table"
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="totalJob"
+        :current.sync="current"
+        :size.sync="size"
+        @getList="getJobList">
+        <el-table-column slot="options" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <el-button type="text" @click="jobEdit(row.id)">编辑</el-button>
+            <el-button type="text" @click="jobDelete(row.id)">删除</el-button>
+          </template>
+        </el-table-column>
+      </ai-table>
+      <ai-dialog :visible.sync="dialogJob" title="添加本届任职人" width="720px" @closed="jobForm={}" @onConfirm="handleJobForm">
+        <el-form ref="jobForm" size="small" :model="jobForm" :rules="jobRules" label-width="80px">
+          <el-form-item label="职位" prop="job">
+            <el-input v-model="jobForm.job" clearable placeholder="请输入"/>
+          </el-form-item>
+          <el-form-item label="姓名" prop="name">
+            <el-input v-model="jobForm.name" clearable placeholder="请输入"/>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
+
+      <ai-dialog :visible.sync="dialogCandidate" title="添加本届候选人" width="720px" @closed="CandFrom={}" @onConfirm="handleCandForm">
+        <el-form ref="CandFrom" size="small" :model="CandFrom" :rules="candRules" label-width="80px">
+          <el-form-item label="职位" prop="job">
+            <el-input v-model="CandFrom.job" clearable placeholder="请输入"/>
+          </el-form-item>
+          <el-form-item label="候选人" prop="name">
+            <el-input type="textarea" rows="5" v-model="CandFrom.name" placeholder="请输入候选人姓名，用逗号隔开"/>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
     </template>
 
-    <ai-dialog :visible.sync="dialogJob" title="定制大屏" @closed="custom={}" @onConfirm="handleCustomizedDV">
-      <el-form ref="jobForm" size="small" :model="jobForm" :rules="rules" label-width="80px">
-        <el-form-item label="职位" prop="title">
-          <el-input v-model="jobForm.title" clearable placeholder="请输入"/>
-        </el-form-item>
-        <el-form-item label="姓名" prop="dv">
-          <el-input v-model="jobForm.title" clearable placeholder="请输入"/>
-        </el-form-item>
-      </el-form>
-    </ai-dialog>
-
-    <ai-dialog :visible.sync="dialogCandidate" title="定制大屏" @closed="custom={}" @onConfirm="handleCustomizedDV">
-      <el-form ref="CandFrom" size="small" :model="CandFrom" :rules="rules" label-width="80px">
-        <el-form-item label="大屏标题" prop="title">
-          <el-input v-model="custom.title" clearable placeholder="请填写"/>
-        </el-form-item>
-        <el-form-item label="选择大屏" prop="dv">
-          <ai-select v-model="custom.dv" :selectList="dict.getDict('customizedDVs')"/>
-        </el-form-item>
-        <el-form-item label="静态数据">
-          <el-input type="textarea" rows="5" v-model="custom.meta"/>
-        </el-form-item>
-      </el-form>
-    </ai-dialog>
+    
   </ai-list>
 </template>
 
@@ -99,6 +97,14 @@ export default {
       size: 10,
       dialogJob: false,
       dialogCandidate: false,
+      jobForm: {
+        job: '',
+        name: '',
+      },
+      CandFrom: {
+        job: '',
+        name: '',
+      },
     }
   },
   computed: {
@@ -108,21 +114,34 @@ export default {
         {prop: 'content', label: '姓名'},
         {slot: 'options'},
       ]
+    },
+    jobRules() {
+      return {
+        job: [{required: true, message: "请输入职位"}],
+        name: [{required: true, message: "请输入姓名"}],
+      }
+    },
+    candRules() {
+      return {
+        job: [{required: true, message: "请输入职位"}],
+        name: [{required: true, message: "请输入姓名"}],
+      }
     }
   },
   methods: {
     jobEdit() {},
     jobDelete() {},
     getJobList() {},
-    toEdit() {
+    toEdit(id) {
       this.$emit('change', {
         type: 'addChange',
         params: {
           id: id || ''
         }
       })
-      // this.$route.push('#addChange')
     },
+    handleJobForm() {},
+    handleCandForm() {},
   }
 }
 </script>