Merge branch 'feature/dev_party_mange' into dev

3 years ago · 451e7ca91d
7 changed files with 331 additions and 207 deletions
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@ -42,18 +42,17 @@ export default {
  methods: {
    // 获取数据列表
    query () {
-      this.dataListLoading = true
-      this.$http.get(
+      const params = {
+        order: this.order,
+        orderField: this.orderField,
+        page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
+        limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
+        ...this.dataForm
+      }
+      this.post = true
+      this.$http.post(
        this.mixinViewModuleOptions.getDataListURL,
-        {
-          params: {
-            order: this.order,
-            orderField: this.orderField,
-            page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
-            limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
-            ...this.dataForm
-          }
-        }
+        params
      ).then(({ data: res }) => {
        this.dataListLoading = false
        if (res.code !== 0) {
--- a/src/views/modules/communityParty/members/cpts/points.vue
+++ b/src/views/modules/communityParty/members/cpts/points.vue
@ -4,7 +4,8 @@
    <el-form label-width="140px" :model="form" :inline="true" 
    :disabled="disabled" :rules="rules" ref="ruleForm" 
      class="form-wr">
-      <el-form-item label="评分周期" prop="year">
+      <div>
+        <el-form-item label="评分周期" prop="year">
        <div class="flex-div">
          <!-- <div class="mr10">评分周期</div> -->
          <div class="mr10">
@ -39,6 +40,7 @@
          </div>
        </div>
      </el-form-item>
+      </div>
      <el-form-item label="基础积分分值" prop="basePoint">
        <el-input v-model="form.basePoint" type="number" placeholder="请输入" class="input-width" clearable />
      </el-form-item>
--- a/src/views/modules/partymember/icpartymemberpoint.vue
+++ b/src/views/modules/partymember/icpartymemberpoint.vue
@ -1,228 +1,339 @@
 <template>
  <!-- <el-card shadow="never" class="aui-card--fill"> -->
-    <div class="mod-rent__rentDeath resi-container">
-      <el-card ref="searchCard" class="search-card">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-      <el-form-item  prop="mySelectOrg" label="所属党组织">
+  <div class="mod-rent__rentDeath resi-container">
+    <el-card ref="searchCard" class="search-card">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+        label-width="100px"
+      >
+        <el-form-item prop="mySelectOrg" label="所属党组织">
          <el-cascader
-              style="width:300px"
-              v-model="mySelectOrg"
-              :options="orgList"
-              placeholder="请选择党组织"
-              :props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }"
-              @change="handleChangeOrg"
-              clearable />
-      </el-form-item>
-        <el-form-item label="姓名"
-                      prop="name">
-          <el-input v-model="dataForm.name"
-                    size="small"
-                    class="list_item_width_1"
-                    clearable
-                    placeholder="请输入姓名">
+            style="width: 300px"
+            v-model="mySelectOrg"
+            :options="orgList"
+            placeholder="请选择党组织"
+            :props="{
+              checkStrictly: true,
+              label: 'partyOrgName',
+              value: 'id',
+              children: 'children'
+            }"
+            @change="handleChangeOrg"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input
+            v-model="dataForm.name"
+            size="small"
+            class="list_item_width_1"
+            clearable
+            placeholder="请输入姓名"
+          >
          </el-input>
        </el-form-item>
-                <el-form-item label="手机"
-                      prop="mobile">
-          <el-input v-model="dataForm.mobile"
-                    size="small"
-                    class="list_item_width_1"
-                    clearable
-                    placeholder="请输入手机">
+        <el-form-item label="手机" prop="mobile">
+          <el-input
+            v-model="dataForm.mobile"
+            size="small"
+            class="list_item_width_1"
+            clearable
+            placeholder="请输入手机"
+          >
          </el-input>
        </el-form-item>
-        <el-form-item label="身份证"
-                      prop="idCard">
-          <el-input v-model="dataForm.idCard"
-                    size="small"
-                    class="list_item_width_1"
-                    clearable
-                    placeholder="请输入身份证">
+        <el-form-item label="身份证" prop="idCard">
+          <el-input
+            v-model="dataForm.idCard"
+            size="small"
+            class="list_item_width_1"
+            clearable
+            placeholder="请输入身份证"
+          >
          </el-input>
        </el-form-item>
-        <br/>
+        <br />
        <el-form-item label="评分年度" prop="year">
          <el-date-picker
-                  v-model="dataForm.year"
-                  type="year"
-                  placeholder="选择年"
-                  value-format="yyyy">
+            v-model="dataForm.year"
+            type="year"
+            placeholder="选择年"
+            value-format="yyyy"
+          >
          </el-date-picker>
        </el-form-item>
        <el-form-item>
-          <el-button @click="getDataList()" size="small">{{ $t('query') }}</el-button>
+          <el-button
+            class="diy-button--search"
+            @click="getDataList()"
+            size="small"
+            >{{ $t('query') }}</el-button
+          >
        </el-form-item>
        <el-form-item>
-          <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
+          <el-button class="diy-button--reset" size="small" @click="resetForm"
+            >重置</el-button
+          >
        </el-form-item>
      </el-form>
-      </el-card>
-      <el-card class="resi-card-table">
-        <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-          <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
-          <el-table-column label="序号" header-align="center" align="center" width="50px">
-            <template slot-scope="scope">
-              {{scope.$index+1}}
-            </template>
-          </el-table-column>
-          <el-table-column prop="year" label="年度" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="partyOrg" label="所属党组织" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="totalScore" label="总分" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="basePoint" label="基础积分分值" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="reviewPoint" label="民主评议积分分值" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="inspirePoint" label="激励积分分值" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="warnPoint" label="警示扣分分值" header-align="center" align="center"></el-table-column>
-          <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
-        </el-table>
-        <el-pagination
-          :current-page="page"
-          :page-sizes="[10, 20, 50, 100]"
-          :page-size="limit"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="pageSizeChangeHandle"
-          @current-change="pageCurrentChangeHandle">
-        </el-pagination>
-      </el-card>
-    </div>
+    </el-card>
+    <el-card class="resi-card-table">
+      <el-table
+        class="resi-table"
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%"
+        :height="tableHeight"
+      >
+        <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
+        <el-table-column
+          label="序号"
+          header-align="center"
+          align="center"
+          width="50px"
+        >
+          <template slot-scope="scope">
+            {{ scope.$index + 1 }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="year"
+          label="年度"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="partyOrg"
+          label="所属党组织"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="name"
+          label="姓名"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="idCard"
+          label="身份证"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="mobile"
+          label="手机号"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="totalScore"
+          label="总分"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="basePoint"
+          label="基础积分分值"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="reviewPoint"
+          label="民主评议积分分值"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="inspirePoint"
+          label="激励积分分值"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="warnPoint"
+          label="警示扣分分值"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="remark"
+          label="备注"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+    </el-card>
+  </div>
  <!-- </el-card> -->
 </template>

 <script>
-    import mixinViewModule from '@/mixins/view-module'
-    export default {
-      mixins: [mixinViewModule],
-      data () {
-        return {
-          mixinViewModuleOptions: {
-            getDataListURL: '/resi/partymember/icPartyMemberPoint/getList',
-            getDataListIsPage: true
-          },
-          mySelectOrg: '',
-          orgList: [],
-          dataForm: {
-            id: '',
-            orgId: '',
-            name: '',
-            idCard: '',
-            mobile: '',
-            year: ''
-          }
-        }
-      },
-      created() {
-        this.getOrgList()
+import mixinViewModule from '@/mixins/view-module'
+import { mapGetters } from 'vuex'
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/resi/partymember/icPartyMemberPoint/getList',
+        getDataListIsPage: true
      },
-      methods: {
-          resetForm(formName) {
-              for(const n in this.dataForm) {
-                  this.dataForm[n] = ''
-              }
-              this.getDataList()
-              this.mySelectOrg = ''
-          },
-          handleSizeChange (val) {
-              console.log(`每页 ${val} 条`)
-              this.pageSize = val
-              this.getDataList()
-          },
-          handleCurrentChange (val) {
-              console.log(`当前页: ${val}`)
-              this.currentPage = val
-              this.getDataList()
-          },
-          // 获取党组织列表
-          getOrgList() {
-            return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: localStorage.getItem('agencyId')}}).then(({data: res}) => {
-                if (res.code !== 0) {
-                    return this.$message.error(res.msg)
-                }
-                this.orgList = res.data
-            }).catch(() => {})
-          },
-          // 党组织选中事件
-          handleChangeOrg(e) {
-              if (this.mySelectOrg.length > 0 && this.mySelectOrg) {
-                  this.dataForm.orgId = this.mySelectOrg[this.mySelectOrg.length - 1]
-              } else {
-                  this.dataForm.orgId = ''
-              }
-          },
+      mySelectOrg: '',
+      orgList: [],
+      searchH: 0,
+      dataForm: {
+        id: '',
+        orgId: '',
+        name: '',
+        idCard: '',
+        mobile: '',
+        year: ''
      }
    }
+  },
+  computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 230 + this.iframeHeigh
+      const _h = this.clientHeight - 230 - this.searchH
+      return this.$store.state.inIframe ? h : _h
+    }
+  },
+  created() {
+    this.getOrgList()
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.searchH = this.$refs.searchCard.$el.offsetHeight
+      console.log('tableHeight', this.tableHeight)
+    })
+  },
+  methods: {
+    resetForm(formName) {
+      for (const n in this.dataForm) {
+        this.dataForm[n] = ''
+      }
+      this.getDataList()
+      this.mySelectOrg = ''
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getDataList()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.currentPage = val
+      this.getDataList()
+    },
+    // 获取党组织列表
+    getOrgList() {
+      return this.$http
+        .get('/resi/partymember/icPartyOrg/getTreelist', {
+          params: { agencyId: localStorage.getItem('agencyId') }
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.orgList = res.data
+        })
+        .catch(() => {})
+    },
+    // 党组织选中事件
+    handleChangeOrg(e) {
+      if (this.mySelectOrg.length > 0 && this.mySelectOrg) {
+        this.dataForm.orgId = this.mySelectOrg[this.mySelectOrg.length - 1]
+      } else {
+        this.dataForm.orgId = ''
+      }
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
-  @import "@/assets/scss/buttonstyle.scss";
+@import '@/assets/scss/buttonstyle.scss';

-  .resi-container .resi-card-table {
-    ::v-deep .el-table th {
-      color: #fff;
-      background-color: rgba(33, 149, 254, 1);
-      // border-right: 1px solid rgba(33, 149, 254, 1);
-    }
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
  }
-  .resi-table {
-    ::v-deep .el-button--text {
-      text-decoration: underline;
-    }
-    ::v-deep .btn-color-del {
-      margin-left: 10px;
-      color: rgba(213, 16, 16, 1);
-    }
-    ::v-deep .btn-color-edit {
-      color: rgba(0, 167, 169, 1);
-    }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
  }
-  .form-wr {
-    .input-width {
-      width: 260px;
-
-    }
-    .input-width-textarea {
-      width: 500px;
-    }
-    .imsg-list {
-      display: flex;
-      align-items: center;
-      .imgs-item {
-        position: relative;
-        margin-right: 10px;
-        .el-icon-delete {
-          position: absolute;
-          top: 0;
-          right: 0;
-          font-size: 18px;
-          color: red;
-          z-index: 3;
-          cursor: pointer;
-        }
-      }
-    }
+  ::v-deep .btn-color-del {
+    margin-left: 10px;
+    color: rgba(213, 16, 16, 1);
+  }
+  ::v-deep .btn-color-edit {
+    color: rgba(0, 167, 169, 1);
+  }
+}
+.form-wr {
+  .input-width {
+    width: 260px;
  }
-  .div-content {
-    width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+  .input-width-textarea {
+    width: 500px;
  }
-  .resi-row-btn {
+  .imsg-list {
    display: flex;
-    margin-bottom: 13px;
-    .el-button {
-      margin-left: 10px;
-      border: 0;
+    align-items: center;
+    .imgs-item {
+      position: relative;
+      margin-right: 10px;
+      .el-icon-delete {
+        position: absolute;
+        top: 0;
+        right: 0;
+        font-size: 18px;
+        color: red;
+        z-index: 3;
+        cursor: pointer;
+      }
    }
-    // .el-button--success {
-    //   background: rgba(34, 193, 195, 1);
-    // }
-    // .el-button--warning {
-    //   background: rgba(254, 179, 73, 1);
-    // }
-    // .el-button--danger {
-    //   background: rgba(254, 98, 82, 1);
-    // }
  }
+}
+.div-content {
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.resi-row-btn {
+  display: flex;
+  margin-bottom: 13px;
+  .el-button {
+    margin-left: 10px;
+    border: 0;
+  }
+  // .el-button--success {
+  //   background: rgba(34, 193, 195, 1);
+  // }
+  // .el-button--warning {
+  //   background: rgba(254, 179, 73, 1);
+  // }
+  // .el-button--danger {
+  //   background: rgba(254, 98, 82, 1);
+  // }
+}
 </style>
--- a/src/views/modules/visual/communityParty/dialogInfo.vue
+++ b/src/views/modules/visual/communityParty/dialogInfo.vue
@ -29,6 +29,11 @@
              <span class="item-field">活动标题：</span>
              <span>{{ info.title }}</span>
            </div>
+            <div class="item">
+              <span class="item-field">活动目标：</span>
+              <span>{{ info.target }}</span>
+            </div>
+            
            <div class="item">
              <span class="item-field">活动内容：</span>
              <span class="item-content" v-html="info.content"></span>
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@ -445,7 +445,7 @@ export default {
      const url = "/gov/org/agency/maporg"
      let params = {
        orgId: this.orgId,
-        level: this.orgLevel
+        level: this.orgType
      }

      const { data, code, msg } = await requestPost(url, params)
@ -454,7 +454,7 @@ export default {

        this.orgData = data
        this.orgId = this.orgData.id
-        this.orgLevel = this.orgData.level
+        this.orgType = this.orgData.level
        this.parentPolygon = []
        this.parentPolygon = data.children.map(item => {
          return {
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@ -815,8 +815,11 @@ export default {
    },
    handleClickRow(val) {
      console.log('click-row----', val)
+      if (!val.icResiUser) {
+        return this.$message.warning('该党员居民信息未完善')
+      }
      this.$router.push({
-        path: `/main-shuju/visual-basicinfo-people/${val.userId}`,
+        path: `/main-shuju/visual-basicinfo-people/${val.icResiUser}`,
      });
    },
    handleCascader(val) {
--- a/src/views/modules/visual/communityParty/unitInfo.vue
+++ b/src/views/modules/visual/communityParty/unitInfo.vue
@ -41,6 +41,10 @@
                <span class="item-field">活动标题：</span>
                <span>{{ info.title }}</span>
              </div>
+              <div class="item">
+                <span class="item-field">活动目标：</span>
+                <span>{{ info.target }}</span>
+              </div>
              <div class="item">
                <span class="item-field">活动内容：</span>
                <span class="item-content" v-html="info.content"></span>