Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test

src/views/configManage/memberRetailRegion/index.vue

@@ -53,7 +53,13 @@
               />
             </el-form-item>
           </el-col>
-
+          <el-col :span="4">
+            <el-form-item :label="$t('收益区域分组')" prop="regionVertexPkId">
+              <el-select v-model="queryParams.regionVertexPkId" clearable>
+                <el-option v-for="item in groupList" :key="item.pkId" :label="item.name" :value="item.pkId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item :label="$t('创建时间')" prop="creationTime">
               <el-date-picker
@@ -140,6 +146,7 @@
             align="center"
             prop="memberCode"
             :label="$t('会员编号')"
+            width="130"
           />
           <el-table-column
             align="center"
@@ -162,6 +169,12 @@
               }}{{ scope.row.countyVal }}
             </template>
           </el-table-column>
+          <el-table-column
+            align="center"
+            prop="regionVertexName"
+            width="160"
+            label="收益区域分组"
+          />
           <el-table-column
             align="center"
             prop="effective"
@@ -181,16 +194,19 @@
             align="center"
             prop="creationTime"
             :label="$t('创建时间')"
+            width="160"
           />
           <el-table-column
             align="center"
             prop="modifiedTime"
             :label="$t('修改时间')"
+            width="160"
           />
           <el-table-column
             align="center"
             prop="effectiveEndDate"
             :label="$t('生效结束时间')"
+            width="160"
           />
           <el-table-column align="center" :label="'操作'" width="150">
             <template slot-scope="scope">
@@ -298,6 +314,7 @@ import { Message } from 'element-ui'
 import { deleteAgreement } from '@/api/configManage'
 import ImageUpload from '@/components/ImageUpload'
 import { areaList } from '@/api/site'
+import { getGroupConfigurationList } from '@/api/systemconfiguration'
 export default {
   name: 'Qxpz',
   components: {
@@ -359,7 +376,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 50,
-        effective: '0'
+        effective: '0',
+        regionVertexPkId: ''
       },
       gradeRangList: [],
       awardsList: [],
@@ -380,15 +398,26 @@ export default {
       getPostionList: [],
       address: '',
       areaData: [],
-      pkIds: ''
+      pkIds: '',
+      groupList: []
     }
   },
   created() {
     this.research()
     this.getsignSource()
     this.getAllArea()
+    this.getGroupList()
   },
   methods: {
+    getGroupList() {
+      getGroupConfigurationList({
+        pageNum: 1,
+        pageSize: 999
+      }).then((res) => {
+        this.groupList = res.rows
+        console.log(this.vertexList, 'vertexList')
+      })
+    },
     handleExport() {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',

src/views/configManage/systemconfiguration/index.vue

@@ -13,6 +13,13 @@
               <el-input v-model="queryParams.vertexName" clearable />
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="区域分组" prop="regionVertexPkId">
+              <el-select v-model="queryParams.regionVertexPkId" clearable>
+                <el-option v-for="item in groupList" :key="item.pkId" :label="item.name" :value="item.pkId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <!-- <el-col :span="4">
             <el-form-item label="体系编号" prop="memberCode">
               <el-input clearable v-model="queryParams.memberCode"></el-input>
@@ -89,7 +96,7 @@
           <el-table-column
             align="center"
             prop="regionVertexName"
-            label="所属区域"
+            label="区域分组"
           />
           <el-table-column
             align="center"
@@ -264,7 +271,8 @@ export default {
         vertexName: '', // 体系名称
         memberCode: '', // 体系编号
         createStartDate: '', // 创建时间起始
-        createEndDate: '' // 创建时间结束
+        createEndDate: '', // 创建时间结束
+        regionVertexPkId: '' // 区域分组
       },
       updateShow: false,
       addOrEdit: '', // 添加还是修改 true添加 false修改