Merge branch 'dev-fixCircle-20210308' into 'release'

小生态1.9.5日期兼容及专区成员优化 code reviewer:张平



See merge request !250

src/components/yqrange/mebman.vue

@@ -33,7 +33,7 @@
         @setPleTotal="setPleTotal"
         ref='renyaun'
       ></renyaun>
-    
+
     </div>
   </div>
 </template>
@@ -43,7 +43,7 @@ import * as commonUtil from "@/utils/utils";
 import org from '@/components/yqrange/member-management/org'
 import renyaun from '@/components/yqrange/member-management/renyuan'
 import region from '@/components/yqrange/member-management/region'
-import { getCircleRole } from '@/utils/yqrange/rangeApi'
+import { getCircleRole, getTotalNumber } from '@/utils/yqrange/rangeApi'
 export default {
   props: {
     circleId: {
@@ -92,8 +92,25 @@ export default {
   // 挂载到Dom完成时
   mounted: function() {
     // commonUtil.resizeHeight();
+    this.getTotalNum();
   },
   methods: {
+    getTotalNum(){
+      let param = {
+        circleId: this.circleId,
+        districtIds: '000',
+        idType: this.roleType,
+      }
+      getTotalNumber(param).then(res => {
+        if (res.code == '000000') {
+          const { orgTotal, peopleTotal } = res.data;
+          this.orgTotal = orgTotal;
+          this.pleTotal = peopleTotal;
+        }
+      }).catch(err => {
+        console.log('网络出现点儿问题，稍后重试')
+      })
+    },
     getRole() {
       getCircleRole(this.circleId).then((res) => {
         if(res.code == '000000') {
@@ -102,7 +119,7 @@ export default {
             this.role = 1
           }
         }
-          
+
       })
     },
     checkTab(v) {
@@ -114,7 +131,7 @@ export default {
       }else if (v ==2) {
         this.orgbtn = ''
         this.plebtn = 'primary'
-        this.areabtn = '' 
+        this.areabtn = ''
       } else {
         this.areabtn = 'primary'
         this.orgbtn = ''
@@ -122,10 +139,10 @@ export default {
       }
     },
     setOrgTotal(n) {
-      this.orgTotal = n
+      // this.orgTotal = n
     },
     setPleTotal(n) {
-      this.pleTotal = n
+      // this.pleTotal = n
     },
     //刷新机构和人员
     setOrgAndPeople(){

src/utils/yqrange/rangeApi.js

@@ -48,8 +48,8 @@ export const getMemberSelectOrgOptionReq = (data) => {
     description: ' 圈子设置选择机构保存',
     })
     };
- 
- 
+
+
 
 
 export const getOrgProvincesReq = (idType,circleId,type=1) => {
@@ -68,4 +68,14 @@ export const getCircleRole = (circleId) => {
     method: 'get',
     description: '根据圈子 获取人的角色',
   })
-};
\ No newline at end of file
+};
+
+export const getTotalNumber = (data) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/memberSelect/orgPeopleTotal/related/search`),
+    method: 'post',
+    data: data,
+    description: '查询已选机构、人员',
+  })
+};

src/views/activitymanagement/activity-management.vue

@@ -55,9 +55,9 @@
         <el-table-column prop="createdName" label="创建者"  align="center"></el-table-column>
         <el-table-column prop="modifiedName" label="最后修改" align="center"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" min-width="100" align="center">
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <span>{{ scope.row.createdTime | liveDateFilter }}</span>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column prop="status" label="状态"  align="center">
           <template slot-scope="scope">

src/views/shortvideo/video-manage.vue

@@ -70,9 +70,9 @@
         <el-table-column prop="circleName" label="圈子名称"  align="center"></el-table-column>
         <el-table-column prop="desc" label="视频描述" align="center" min-width="150" show-overflow-tooltip></el-table-column>
         <el-table-column prop="createdTime" label="上传时间" align="center">
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <span>{{ scope.row.createdTime | liveDateFilter }}</span>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column prop="publisherName" label="发布者"  align="center"></el-table-column>
         <el-table-column prop="publisherAddress" label="所在省市" align="center" min-width="100" show-overflow-tooltip></el-table-column>
@@ -82,9 +82,9 @@
           </template>
         </el-table-column>
         <el-table-column prop="modifiedTime" label="更新时间" align="center">
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <span>{{ scope.row.modifiedTime | liveDateFilter }}</span>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column prop="reviserName" label="最后修改人" align="center"></el-table-column>
         <el-table-column label="操作" min-width="200" align="center">

src/views/yqrange/yq-range.vue

@@ -37,9 +37,9 @@
       <el-table :data="tableData" class="item-table" style="width: 100%;margin-top: 10px;">
         <el-table-column prop="id" label="圈子ID" min-width="100" align="center"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" min-width="100" align="center">
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <span>{{ scope.row.createdTime | liveDateFilter }}</span>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column prop="name" label="圈子名称" min-width="100" align="center"></el-table-column>
         <el-table-column prop="numberOfPeople" label="圈子人数" min-width="100" align="center"></el-table-column>