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

components/index.js

@@ -5,6 +5,15 @@ let components = [];
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
 const install = function (Vue) {
   if (install.installed) return;
+  // 声明全局业务对象类
+  const models = require.context('./model', true, /\.js$/)
+  if (models) {
+    const model = {}
+    models.keys().map(e => {
+      model[e.replace(/\.[\/\\]([^\\\/]+)\.js$/, '$1')] = models(e).default
+    })
+    Vue.prototype.MODEL = model
+  }
   // 遍历注册全局组件
   let contexts = require.context('.', true, /[\\\/]Ai([^\\\/]+)\.vue$/);
   if (contexts) {

components/model/PartyOrg.js

@@ -0,0 +1,25 @@
+import http from "dvcp-ui/lib/js/request";
+
+export default class PartyOrg {
+  constructor(id) {
+    this.id = id
+    this.loaded = false
+    this.init().finally(() => this.loaded = true)
+  }
+
+  init() {
+    return PartyOrg.getInfo(this.id).then(data => {
+      Object.entries(data).map(([k, v]) => this[k] = v)
+    })
+  }
+
+  static getInfo(id) {
+    return http.post("/app/partyOrganization/queryOrgById", null, {
+      params: {id}
+    }).then(res => {
+      if (res?.data) {
+        return res.data
+      }
+    })
+  }
+}

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

@@ -234,6 +234,15 @@ export default {
     confirm() {
       this.$refs.form.validate((valid) => {
           if (valid) {
+            if(this.form.electionMethod == 0) {
+              if(this.form.chooseNumber != this.form.candidateUsers.length) {
+                return this.$message.error('候选人数与应选人数应相等')
+              }
+            } else if(this.form.electionMethod == 1) {
+              if(this.form.chooseNumber >= this.form.candidateUsers.length) {
+                return this.$message.error('候选人数应多于应选人数')
+              }
+            }
             this.instance.post(`/app/appgeneralelectioninfo/addOrUpdate`,{
               ...this.form
             }).then(res => {

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

@@ -17,10 +17,9 @@
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size" @getList="getList" :col-configs="colConfigs" :dict="dict">
           <el-table-column slot="options" label="操作" fixed="right" align="center">
             <template slot-scope="{ row }">
-              <!-- <el-button v-show="row.status==0" type="text" @click.native="toAdd(row.id, true)">编辑</el-button> -->
               <el-button type="text" @click.native="toAdd(row.id)">详情</el-button>
-              <el-button type="text" :disabled="row.status==2" @click.native="startEnd(row.id, false)">结束</el-button>
+              <el-button type="text" v-show="row.status!=2" :disabled="row.status==2" @click.native="startEnd(row.id, row.status)">{{row.status == 0? '开启':'结束'}}</el-button>
-              <el-button type="text" @click.native="toStatistics(row.id)">统计</el-button>
+              <el-button type="text" v-show="row.status != 0" @click.native="toStatistics(row.id)">统计</el-button>
               <el-button type="text" @click.native="handleDelete(row.id)">删除</el-button>
             </template>
           </el-table-column>
@@ -82,7 +81,7 @@ export default {
         }
       })
     },
-    toAdd(id,flag) {
+    toAdd(id) {
       this.$emit('change', {
         type: 'electionAdd',
         params: {
@@ -107,12 +106,24 @@ export default {
       }
       this.getList()
     },
-    // 结束
+    // 开启、结束
     startEnd(id, status) {
-      this.$confirm('投票正在进行中，确定要提前结束吗？').then(() => {
+      let title = ''
-        this.instance.post(`/app/appgeneralelectioninfo/start-end?id=${id}&start=${status}`).then(res=>{
+      let bool = null
+      let tips = ''
+      if(status == 0) {
+        title = '未到投票开始时间，确定要提前开始吗？'
+        bool = true
+        tips = '开启成功'
+      } else if(status == 1) {
+        title = '投票正在进行中，确定要提前结束吗？'
+        bool = false
+        tips = '结束成功'
+      }
+      this.$confirm(title).then(() => {
+        this.instance.post(`/app/appgeneralelectioninfo/start-end?id=${id}&start=${bool}`).then(res=>{
           if(res.code == 0) {
-            this.$message.success('结束成功')
+            this.$message.success(tips)
             this.getList()
           }
         })

project/pingchang/apps/AppOrganizationChange/AppOrganizationChange.vue

@@ -15,9 +15,15 @@ import organizationSetting from "./components/organizationSetting.vue";
 export default {
   name: "AppOrganizationChange",
   label: "组织换届",
+  provide() {
+    return {
+      ...this.$props
+    }
+  },
   props: {
     instance: Function,
     dict: Object,
+    permissions: Function
   },
   components: {
     List,
@@ -36,7 +42,6 @@ export default {
   },
   data() {
     return {
-      component: "List",
       params: {},
       include: [],
       selected: {},
@@ -47,10 +52,6 @@ export default {
       this.params = data.params;
     },
   },
-  created() {
-    let {organizationId: id, organizationName: name} = this.user.info
-    this.selected = {id, name}
-  }
 }
 </script>
 

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

@@ -1,11 +1,7 @@
 <template>
   <ai-list class="List">
     <template slot="title">
-      <ai-title title="组织换届" isShowBottomBorder>
+      <ai-title title="组织换届" isShowBottomBorder/>
-        <template slot="rightBtn">
-          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toSetting('')">换届设置</el-button>
-        </template>
-      </ai-title>
     </template>
     <template #left>
       <ai-tree-menu title="组织目录" searchPlaceholder="请输入组织名称" @search="onSearch">
@@ -19,15 +15,16 @@
       </ai-tree-menu>
     </template>
     <template slot="content" class="content">
+      <ai-title title="届次信息">
+        <template #rightBtn>
+          <el-button size="small" type="primary" @click="toSetting(selected.id)" v-if="permissions('app_apporganizationchangeconfig')">换届设置</el-button>
+        </template>
+      </ai-title>
       <el-tabs v-model="currIndex">
         <el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
-          <component :ref="tab.name" v-if="currIndex == String(i)" :is="tab.comp" lazy :instance="instance" :selected="selected"
+          <component :ref="tab.name" v-if="currIndex==i" :is="tab.comp" lazy :selected="selected" v-on="$listeners"/>
-                     :dict="dict" :permissions="permissions" v-on="$listeners"/>
         </el-tab-pane>
       </el-tabs>
-      <div class="add_btn">
-        <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">新增换届</el-button>
-      </div>
     </template>
   </ai-list>
 </template>
@@ -39,12 +36,7 @@ import history from './history.vue'
 
 export default {
   name: 'List',
-  props: {
+  inject: ['permissions', 'instance', 'dict'],
-    instance: Function,
-    permissions: Function,
-    dict: Object,
-    selected: Object
-  },
   data() {
     return {
       tabs: [
@@ -52,6 +44,7 @@ export default {
         {label: '历史届次', name: 'history', comp: history, permission: ''}
       ],
       currIndex: '0',
+      selected: null
     }
   },
   components: {
@@ -60,25 +53,15 @@ export default {
   },
   computed: {
     ...mapState(['user']),
-
-    orgTree() {
-      return this.$refs.tree?.$refs?.partyTree
-    },
   },
-
   methods: {
-    showNeighbourSetting(id) {
-      this.$router.push({query: {id}, hash: "#ns"})
-    },
     onTreeChange(e) {
-      this.$emit("update:selected", e)
+      this.selected = e
       this.$refs[this.tabs[Number(this.currIndex)].name][0].getList(e.id)
     },
-
     onSearch(v) {
-      this.orgTree.filter(v)
+      this.$refs.tree?.$refs?.partyTree?.filter(v)
     },
-
     filterNode(value, data) {
       if (!value) return true
       return data.name.indexOf(value) !== -1
@@ -86,9 +69,13 @@ export default {
     toAdd(id) {
       this.$router.push({hash: "#add", query: {id}})
     },
-    toSetting(id) {
+    toSetting(oid) {
-      this.$router.push({hash: "#setting", query: {id}})
+      this.$router.push({hash: "#setting", query: {oid}})
     }
+  },
+  created() {
+    const {organizationId: id, organizationName: name} = this.user.info
+    this.selected = {id, name}
   }
 }
 </script>
@@ -135,6 +122,7 @@ export default {
 
     .ai-list__content--right-wrapper {
       width: 100%;
+      padding-top: 0;
     }
   }
 

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

@@ -99,6 +99,16 @@ export default {
     }
   },
   methods: {
+    // getDetail() {
+    //   const {id: organizationId} = this.$route.query
+    //   organizationId && this.instance.post(`/app/apporganizationgeneralelection/queryDetailByOrganizationId`, null, {
+    //     params: {organizationId}
+    //   }).then(res => {
+    //     if (res?.data) {
+    //       this.form = res.data
+    //     }
+    //   })
+    // },
     cancel() {
       this.$router.push({})
     },

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

@@ -1,56 +1,64 @@
 <template>
   <section class="moment">
-    <ai-title title="总体概况" class="mar-b8">
+    <template v-if="detail.id">
-      <template slot="rightBtn">
+      <ai-title title="总体概况" class="mar-b8">
-        <el-button size="small" type="text" icon="iconfont iconEdit" @click="toEdit('')">修改</el-button>
+        <template slot="rightBtn">
-      </template>
+          <el-button size="small" type="text" icon="iconfont iconEdit" @click="toEdit(oid)">修改</el-button>
-    </ai-title>
-    <ai-wrapper>
-      <ai-info-item label="本届换届时间" :value="111"/>
-      <ai-info-item label="换届类型" :value="111"/>
-      <ai-info-item label="下届换届时间" :value="111"/>
-      <ai-info-item label="当前届次" :value="111"/>
-    </ai-wrapper>
-    <ai-title title="本届任职" class="mar-b8">
-      <template slot="rightBtn">
-        <el-button size="small" type="text" icon="iconfont iconAdd" @click="dialogJob=true">添加任职人员</el-button>
-      </template>
-    </ai-title>
-    <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-title>
-    </ai-table>
+      <ai-wrapper>
-    <ai-title title="本届候选人" class="mar-b8">
+        <ai-info-item label="本届换届时间" :value="detail.changeTime"/>
-      <template slot="rightBtn">
+        <ai-info-item label="换届类型" :value="dict.getLabel('organizationChangeType',detail.type)"/>
-        <el-button size="small" type="text" icon="iconfont iconAdd" @click="dialogCandidate = true">添加候选人</el-button>
+        <ai-info-item label="下届换届时间" :value="detail.nextChangeTime"/>
-      </template>
+        <ai-info-item label="当前届次" :value="detail.sessionTime"/>
-    </ai-title>
+      </ai-wrapper>
-    <ai-table
+      <ai-title title="本届任职" class="mar-b8">
-        class="detail-table__table"
+        <template slot="rightBtn">
-        :tableData="tableData"
+          <el-button size="small" type="text" icon="iconfont iconAdd" @click="dialogJob=true">添加任职人员</el-button>
-        :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-title>
-    </ai-table>
+      <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-title title="本届候选人" class="mar-b8">
+        <template slot="rightBtn">
+          <el-button size="small" type="text" icon="iconfont iconAdd" @click="dialogCandidate = true">添加候选人</el-button>
+        </template>
+      </ai-title>
+      <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>
+    </template>
+    <ai-empty>
+      <div>暂无换届信息</div>
+      <el-row type="flex" justify="center" class="mar-t8">
+        <ai-highlight content="请点击【@v】完善基础内容后,再进行后续操作" value="换届设置"/>
+      </el-row>
+    </ai-empty>
     <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">
@@ -77,15 +85,10 @@
 <script>
 export default {
   name: "moment",
-  props: {
+  inject: ['permissions', 'instance', 'dict'],
-    instance: Function,
-    permissions: Function,
-    dict: Object,
-    selected: Object,
-  },
   data() {
     return {
-      isEdit: false,
+      detail: {},
       tableData: [],
       totalJob: 0,
       current: 1,
@@ -121,10 +124,11 @@ export default {
         job: [{required: true, message: "请输入职位"}],
         name: [{required: true, message: "请输入姓名"}],
       }
-    }
+    },
+    oid: v => v.$attrs.selected.id
   },
-  mounted() {
+  created() {
-    this.getList(this.selected.id)
+    this.getList()
   },
   methods: {
     jobEdit() {
@@ -136,10 +140,13 @@ export default {
     toEdit(id) {
       this.$router.push({hash: "#add", query: {id}})
     },
-    getList(id) {
+    getList() {
-      this.instance.post(`/app/apporganizationgeneralelection/queryDetailByOrganizationId?organizationId=${id}`).then(res => {
+      const {oid: organizationId} = this
+      organizationId && this.instance.post(`/app/apporganizationgeneralelection/queryDetailByOrganizationId`, null, {
+        params: {organizationId}
+      }).then(res => {
         if (res?.data) {
-          console.log(res, '111');
+          this.detail = res.data
         }
       })
     },

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

@@ -1,45 +1,5 @@
 <template>
   <section class="organizationSetting">
-    <!-- <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="isEdit = true">修改</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="选举方式">
-                {{ info.electionMethod==0? '等额':'差额'}}
-                <el-tooltip class="item" effect="dark" content="差额选举：候选人数多于应选人数的选举方式；
-                  等额选举：候选人数与应选人数相等的选举方式。" placement="top">
-                  <i class="el-icon-info" style="margin-right: 8px"></i>
-                </el-tooltip>
-              </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>
       <ai-title slot="title" title="换届设置" isShowBottomBorder isShowBack @onBackClick="cancel(true)"/>
       <template slot="content">
@@ -51,27 +11,12 @@
             </div>
             <div class="add-form">
               <el-form ref="form" :model="form" :rules="formRules" size="small" label-width="150px">
-                <el-form-item label="单位名称">
+                <el-form-item label="组织名称">{{ org.name }}</el-form-item>
-                  <div>{{ user.info.organizationName }}</div>
+                <el-form-item label="成立时间">{{ $dateFormat(org.createTime) }}</el-form-item>
-                </el-form-item>
-
-                <el-form-item label="成立时间">
-                  <div>{{ createTime }}</div>
-                </el-form-item>
-
                 <el-form-item label="换届类型" prop="type">
                   <el-radio v-model="form.type" label="0">三年换届</el-radio>
                   <el-radio v-model="form.type" label="1">五年换届</el-radio>
                 </el-form-item>
-
-                <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.organizationId" @origin="handlePartyOrgSelect"/>
-                    </template>
-                  </el-input>
-                </el-form-item>
-
                 <el-form-item label="换届提醒人" prop="userList">
                   <ai-person-select :instance="instance" :customClicker="true" :chooseUserList="chooseUserList"
                                     :url="`/app/appparty/list?partyOrgId=${form.organizationId}`" headerTitle="党员列表"
@@ -100,11 +45,7 @@ import {mapState} from 'vuex'
 
 export default {
   name: "organizationSetting",
-  props: {
+  inject: ['permissions', 'instance', 'dict'],
-    instance: Function,
-    dict: Object,
-  },
-
   data() {
     let validUser = (rule, value, callback) => {
       if (!value.length) {
@@ -127,35 +68,27 @@ export default {
         userList: [{required: true, validator: validUser, trigger: "blur"}],
       },
       chooseUserList: [],
-      createTime: '',
     }
   },
   computed: {
-    ...mapState(['user'])
+    ...mapState(['user']),
+    org: v => new v.MODEL.PartyOrg(v.$route.query.oid)
   },
   created() {
+    this.form.organizationId = this.$route.query.oid
     this.getDetail()
-    this.getOrganization()
   },
   methods: {
     cancel() {
       this.$router.back()
     },
-    // 查询组织关系
-    getOrganization() {
-      this.instance.post(`/app/partyOrganization/queryPartyOrganizationServiceList`).then(res => {
-        if (res?.data) {
-          let data = res.data.filter(item => item.id == this.user.info.organizationId)
-          this.createTime = data[0].createTime
-        }
-      })
-    },
     getDetail() {
-      this.instance.post(`/app/apporganizationchangeconfig/queryDetailByOrganizationId?organizationId=${this.user.info.organizationId}`).then((res) => {
+      const {oid: organizationId} = this.$route.query
+      this.instance.post(`/app/apporganizationchangeconfig/queryDetailByOrganizationId`, null, {
+        params: {organizationId}
+      }).then((res) => {
         if (res?.data) {
-          // this.chooseCandidateList = res.data.candidateUsers
+          this.form = res.data
-          // this.chooseVoteList = res.data.voteUsers
-          console.log(res);
         }
       })
     },
@@ -165,26 +98,18 @@ export default {
     selectVote(e) {
       this.form.voteUsers = e
     },
-    handlePartyOrgSelect(v) {
-      if (v) {
-        this.form.organizationId = v[0]?.id
-        this.form.organizationName = v[0]?.name
-
-      }
-    },
     confirm() {
       // 换届设置
       this.$refs.form.validate((valid) => {
         if (valid) {
+          const {id: organizationId, name: organizationName} = this.org
           this.instance.post(`/app/apporganizationchangeconfig/update`, {
-            ...this.form
+            ...this.form, organizationId, organizationName
           }).then(res => {
             if (res.code == 0) {
               this.$message.success('提交成功')
               this.cancel(true)
             }
-          }).catch((err) => {
-            console.log(err);
           })
         }
       })