Merge branch 'dev-circle-nine-20201231' into 'release'

活动成员管理优化，code review:bo.dang



See merge request !238

src/views/activitymanagement/activity-member.vue

@@ -44,7 +44,7 @@
         align="center"
         width="140">
         <template slot-scope="scope">
-          <el-button @click="detel(scope.row)" type="text" size="small" style="color:red" v-if="scope.row.source != 1">删除</el-button>
+          <el-button @click="detel(scope.row)" type="text" size="small" style="color:red">删除</el-button>
         </template>
       </el-table-column>
       <div slot="empty">
@@ -59,20 +59,6 @@
                      :current-page="memberForm.pageNum" :page-sizes="[10, 30, 50, 100, 200]" :page-size="memberForm.pageSize"
                      layout="total, sizes, prev, pager, next, jumper" :total="totalPeople"></el-pagination>
     </div>
-    <el-dialog
-      title="添加人员"
-      :visible.sync="dialogOrg"
-      width="80%"
-      top="5vh"
-      :before-close="handleClose">
-      <add-member
-        v-if="dialogOrg"
-        :circleId='circleId'
-        :roleType='roleType'
-        @addPeople="addPeople"
-        @handleClose="handleClose">
-      </add-member>
-    </el-dialog>
     <!-- 删除 弹窗 -->
     <el-dialog
       title="确认删除"
@@ -89,20 +75,6 @@
       </span>
     </el-dialog>
 
-    <!--<el-dialog-->
-    <!--title="导入错误提示"-->
-    <!--:visible.sync="dialogVisible"-->
-    <!--width="500px"-->
-    <!--:close-on-click-modal="false"-->
-    <!--@close="handleErrorClose"-->
-    <!--center-->
-    <!--&gt;-->
-    <!--<el-table :data="dialogErrorData" align="center">-->
-    <!--<el-table-column property="rowNumber" label="行数" align="center"></el-table-column>-->
-    <!--<el-table-column property="wrongData" label="错误提示" align="center"></el-table-column>-->
-    <!--</el-table>-->
-    <!--</el-dialog>-->
-
     <el-dialog
       :title="dialogTitle"
       :visible.sync="dialogVisible"
@@ -217,27 +189,12 @@
         jumPathThird: '/activity-management',
         administrativeValue: "",
         optionsRegion: [],
-        sourceList: [
-          {
-            label: '全部',
-            value: 0
-          },
-          {
-            label: '可访问本圈的地区/机构',
-            value: 1
-          },
-          {
-            label: '手动添加',
-            value: 2
-          },
-        ],
         activityDoctorModelList: [],
         totalPeople: 10,
         selectionList:[],
         memberForm: {
-          name: '',
-          orgName: '',
-          source: 0,
+          hospitalName: '',
+          doctorName: '',
           pageNum: 1,
           pageSize: 10
         },
@@ -272,9 +229,8 @@
     methods: {
       init() {
         this.memberForm.pageNum = 1;
-        this.memberForm.name = "";
-        this.memberForm.orgName = "";
-        this.memberForm.source = 0
+        this.memberForm.hospitalName = "";
+        this.memberForm.doctorName = "";
         this.getList(1)
       },
       serch() {
@@ -298,7 +254,6 @@
           if (res.code == "000000") {
             this.activityDoctorModelList = res.data.activityDoctorModelList;
             this.totalPeople = res.data.total;
-            this.setPleTotal()
           } else {
             this.$message(res.message);
           }
@@ -353,21 +308,9 @@
         this.detelMessage = ''
         this.clickItem = null
       },
-      setPleTotal() {
-        this.$emit('setPleTotal',this.totalPeople)
-      },
-      dialogMemberFn() {
-        this.dialogOrg = true
-      },
       handleClose() {
         this.dialogOrg = false
       },
-      addPeople() {
-        this.dialogOrg = false
-        this.init()
-      },
-
-
       // 批量导入
       beforeUploadDoc(file) {