Merge branch 'feature/dev_party_mange' into dev

src/views/modules/communityParty/members/cpts/record.vue

@@ -80,7 +80,7 @@
                 class="btn-color-edit"
                 >取消</el-button>
             </template>
-            <template v-else>
+            <!-- <template v-else>
               <el-button
                 @click="handleChange(scope.row, 'edit')"
                 type="text"
@@ -101,9 +101,7 @@
                   >删除</el-button
                 >
               </el-popconfirm>
-              <!-- <el-button type="text" size="small" :disabled="disabled" class="btn-color-del"
-              @click="del(scope.row)">删除</el-button> -->
-            </template>
+            </template> -->
           </template>
         </el-table-column>
       </el-table>

src/views/modules/communityParty/members/index.vue

@@ -490,7 +490,7 @@ export default {
       }
 
     },
-    handleTimeChangePay (timvale) {
+    handleTimeChangePay (val) {
       if (val.length > 0) {
         this.searchForm.payStatrDate = val[0]
         this.searchForm.payEndDate = val[0]

src/views/modules/partymember/icpartyorg-add-or-update.vue

@@ -42,12 +42,13 @@
                     placeholder="请选择上级党组织"
                     :props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }"
                     @change="handleChangeOrg"
+                    :disabled="dataForm.id || dataForm.orgId ? true : false"
                     clearable />
             </el-form-item>
             <el-form-item label="党组织介绍" prop="introduction">
                 <el-input style="width:300px" v-model="dataForm.introduction" type="textarea" maxlength="500" placeholder="党组织介绍"></el-input>
             </el-form-item>
-            <el-form-item label="位置坐标"
+            <el-form-item label="党组织位置"
                             prop="longitude"
                             style="display: block">
                 <div class="item_width_1">
@@ -70,7 +71,7 @@
                     </div>
                 </div>
 
-                <div id="lon_lat_id" style="margin-top: 10px; display: none">
+                <!-- <div id="lon_lat_id" style="margin-top: 10px; display: none">
                     <span>经度</span>
                     <el-input class="item_width_3"
                             maxlength="50"
@@ -85,7 +86,7 @@
                             :readonly="true"
                             v-model="dataForm.latitude">
                     </el-input>
-                </div>
+                </div> -->
                 </div>
             </el-form-item>
         </el-form>
@@ -123,7 +124,7 @@
                     latitude: '', //纬度
                     address: '',
                     introduction: '', // 党组织介绍
-
+                    orgId: '',
                     customerId: '',
                     staffId:'',
                     orgPidName: '',
@@ -159,8 +160,8 @@
                             this.getInfo()
                         } else {
                             this.initMap()
-                            if(this.dataForm.orgPids) {
-                                this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':')
+                            if(this.dataForm.orgId) {
+                                this.dataForm.mySelectOrg = this.dataForm.orgId
                             } else {
                                 this.dataForm.mySelectOrg = ''
                             }
@@ -220,7 +221,7 @@
                 }
                 this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType:value}}).then(({data: res}) => {
                     if (res.code !== 0) {
-                        return this.$message.error(res.msg)
+                        return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
                     }
                     this.agencyOrgList = this.removeEmptyChildren(res.data)
                 }).catch(() => {})
@@ -229,8 +230,8 @@
             getOrgList() {
                 return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId}}).then(({data: res}) => {
                     if (res.code !== 0) {
-                        return this.$message.error(res.msg)
-                    }                
+                        return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
+                    }        
                     this.orgList = this.removeEmptyChildren(res.data)
                     this.orgList.unshift({
                         partyOrgName: '一级组织',
@@ -268,14 +269,16 @@
             getInfo() {
                 this.$http.get(`/resi/partymember/icPartyOrg/${this.dataForm.id}`).then(({data: res}) => {
                     if (res.code !== 0) {
-                        return this.$message.error(res.msg)
+                        return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
                     }
                     this.dataForm = {
                         ...this.dataForm,
                         ...res.data
                     }
                     // 党组织组织
-                    this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':')
+                    this.dataForm.mySelectOrg = this.dataForm.id
+                    // this.dataForm.mySelectOrg.push(this.dataForm.id)
+                    console.log(JSON.stringify(this.dataForm.mySelectOrg))
                     // 行政组织
                     this.dataForm.agencyId = this.dataForm.agencyId
                     this.initMap()
@@ -292,7 +295,7 @@
                                 orgType:this.dataForm.partyOrgType}
                     }).then(({data: res}) => {
                     if (res.code !== 0) {
-                        return this.$message.error(res.msg)
+                        return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
                     }
                     this.agencyOrgList = res.data
                 }).catch(() => {
@@ -308,7 +311,7 @@
             document.getElementById('app').innerHTML = ''
             if (document.getElementById('app')) {
                 document.getElementById('mapSeach_id').style.display = "block"
-                document.getElementById('lon_lat_id').style.display = "block"
+                // document.getElementById('lon_lat_id').style.display = "block"
             }
 
             // 定义地图中心点坐标
@@ -416,13 +419,16 @@
             },
             // 表单提交
             dataFormSubmitHandle: debounce(function () {
+                if (!this.dataForm.latitude || !this.dataForm.longitude) {
+                    return this.$message.error('请滑动地图选择党组织位置')
+                }
                 this.$refs['dataForm'].validate((valid) => {
                     if (!valid) {
                         return false
                     }
                     this.$http[!this.dataForm.id ? 'post' : 'put']('/resi/partymember/icPartyOrg/', this.dataForm).then(({data: res}) => {
                         if (res.code !== 0) {
-                            return this.$message.error(res.msg)
+                            return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
                         }
                         this.$message({
                             message: this.$t('prompt.success'),
@@ -450,13 +456,6 @@
                     partyOrgType: [
                         {required: true, message: this.$t('validate.required'), trigger: 'blur'}
                     ],
-
-                    longitude: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    latitude: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
                     agencyId: [
                         {required: true, message: this.$t('validate.required'), trigger: 'blur'}
                     ]

src/views/modules/partymember/icpartyorgtree.vue

@@ -19,12 +19,12 @@
           <el-table-column label="操作" align="center" width="300">
               <template slot-scope="scope">
                 <el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
-                          @click="handleLook(scope.row.agencyId)"
+                          @click="handleLook(scope.row.agencyPids, scope.row.id, scope.row)"
                           type="text"
                           size="small"
                           class="div-table-button--detail">{{'查看党员'}}</el-button>
                 <el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
-                          @click="addOrUpdateHandle('', scope.row.orgPids)"
+                          @click="addOrUpdateHandle('', scope.row.id)"
                           type="text"
                           size="small"
                           class="div-table-button--add">新增下级</el-button>
@@ -98,7 +98,7 @@
         }
         await this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: this.dataForm}).then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
           } else {
             this.tableData = res.data
           }
@@ -106,12 +106,12 @@
         this.tableLoading = false
       },
       // 新增 / 修改
-      addOrUpdateHandle (id, orgPids) {
+      addOrUpdateHandle (id, orgId) {
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
           this.$refs.addOrUpdate.dataForm.id = id
           // 新增下级需要传
-          this.$refs.addOrUpdate.dataForm.orgPids = orgPids // 党组织
+          this.$refs.addOrUpdate.dataForm.orgId = orgId // 党组织
           
           this.$refs.addOrUpdate.init()
         })
@@ -125,7 +125,7 @@
         }).then(() => {
         this.$http.delete('/resi/partymember/icPartyOrg/delete', {'data': [id]}).then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
           }
           this.$message({
             message: this.$t('prompt.success'),
@@ -139,10 +139,10 @@
         }).catch(() => {})
       },
       // 查看党员
-      handleLook(agencyId) {
+      handleLook(agencyPids, id, row) {
         this.lookMemberShow = true
         this.$nextTick(() => {
-            this.$refs.ref_table_Member.initForm(agencyId)
+            this.$refs.ref_table_Member.initForm(agencyPids.split(':')[agencyPids.split(':').length - 1], id)
         })
       },
       lookMemberClose () {

src/views/modules/partymember/lookMember.vue

@@ -21,6 +21,25 @@
                             label="身份证号">
             </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-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page.sync="pageNo"
+            :page-sizes="[20, 50, 100, 200]"
+            :page-size="parseInt(pageSize)"
+            layout="sizes, prev, pager, next, total"
+            :total="total"
+          >
+          </el-pagination>
         </div>
       </div>
     </div>
@@ -41,7 +60,11 @@ export default {
       // 列表相关
       tableData: [],
       tableLoading: false,
-      orgPids: ''
+      agencyId: '',
+      partyOrgId: '',
+      pageNo: 1,
+      pageSize: 20,
+      total: 1,
     }
   },
   props: {
@@ -54,8 +77,9 @@ export default {
   },
   components: {},
   methods: {
-    initForm (agencyId) {
-      this.orgPids = agencyId
+    initForm (agencyId, id) {
+      this.agencyId = agencyId
+      this.partyOrgId = id
       this.tableLoading = true
       this.loadTable()
     },
@@ -66,17 +90,32 @@ export default {
     // 查询列表
     async loadTable () {
       let params = {
-        partyOrgId: this.orgPids,
-        pageNo: 1,
-        pageSize: 10000000
+        agencyId: this.agencyId,
+        partyOrgId: this.partyOrgId,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize
       }
       const url = `/resi/partymember/icPartyMember/page`
       const { data, code, msg } = await requestPost(url, params)
       this.tableLoading = false
+      if (res.code !== 0) {
+        return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
+      }
       if (code === 0) {
         this.tableData =  data.list ? data.list : []
+        this.total = data.total || 0;
       }
-    }
+    },
+    handleSizeChange (val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.loadTable()
+    },
+    handleCurrentChange (val) {
+      console.log(`当前页: ${val}`);
+        this.pageNo = val;
+        this.loadTable();
+    },
   },
 }
 </script>