Merge branch 'dev_0814' of http://121.42.41.42:7070/r/esua-epdc-admin into dev_0814

src/views/modules/user/partymembers-add-or-update.vue

@@ -52,7 +52,7 @@
       </el-form-item>
       <el-form-item label="用户角色" prop="tagIds">
         <el-checkbox-group v-model="dataForm.tagIds">
-          <el-checkbox v-for="item in tagOptions" :key="item.id" :label="item.id">{{item.tagName}}</el-checkbox>
+          <el-checkbox v-for="item in tagOptions" :key="item.tagName" :label="item.id">{{item.tagName}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
     </el-form>
@@ -144,11 +144,10 @@ export default {
           return this.$message.error(res.msg)
         }
         this.tagOptions = res.data
-        console.log(this.tagOptions)
       }).catch(() => {})
     },
     getStreetList () {
-      this.$http.get(`/sys/dept/sublist/0`).then(({ data: res }) => {
+      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -192,6 +191,7 @@ export default {
           ...this.dataForm,
           ...res.data
         }
+        this.dataForm.tagIds = res.data.tagIdsNew
         this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)

src/views/modules/user/partymembers.vue

@@ -85,10 +85,7 @@
           <el-button v-if="$hasPermission('partymembers:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('partymembers:import')" type="primary" @click="importData()">{{ $t('import') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('partymembers:export')" type="primary" @click="exportData()">{{ $t('export') }}</el-button>
+          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
@@ -174,7 +171,7 @@ export default {
       this.dataForm.endTime = this.timeRange[1]
     },
     getStreetList () {
-      this.$http.get(`/sys/dept/sublist/0`).then(({ data: res }) => {
+      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -220,12 +217,9 @@ export default {
       return row.cadreFlag === '1' ? '是' : row.cadreFlag === '0' ? '否' : '未知'
     },
     formatRegist: function (row, column) {
-      console.log(row.registFlag)
       return row.registFlag === '1' ? '是' : row.registFlag === '0' ? '否' : '未知'
     },
     importData () {
-    },
-    exportData () {
     }
   }
 }