Merge branch 'feature/dev_party_mange' into dev

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

@@ -443,16 +443,16 @@
             dataRule() {
                 return {
                     partyOrgName: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+                        {required: true, message: "党组织名称不能为空", trigger: 'blur'}
                     ],
                     mySelectOrg: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+                        {required: true, message: "上级党组织不能为空", trigger: 'blur'}
                     ],
                     partyOrgType: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+                        {required: true, message: "党组织类型不能为空", trigger: 'blur'}
                     ],
                     agencyId: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+                        {required: true, message: "行政组织不能为空", trigger: 'blur'}
                     ]
                 }
             }

src/views/modules/partymember/lookMember.vue

@@ -6,7 +6,6 @@
           <el-table ref="ref_table"
                     :data="tableData"
                     border
-                    :height="tableHeight"
                     v-loading="tableLoading"
                     :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                     style="width: 100%"
@@ -21,15 +20,6 @@
                             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"
@@ -70,9 +60,6 @@ export default {
   props: {
   },
   computed: {
-    tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeight : this.clientHeight - 410
-    },
     ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   components: {},
@@ -96,10 +83,10 @@ export default {
         pageSize: this.pageSize
       }
       const url = `/resi/partymember/icPartyMember/page`
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, internalMsg, 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) {
+        return this.$message.error(internalMsg ? internalMsg : msg ? msg : '查询失败')
       }
       if (code === 0) {
         this.tableData =  data.list ? data.list : []