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

专区管理，code review:bo.dang



See merge request !237

src/components/yqrange/baseinfo.vue

@@ -406,6 +406,7 @@
       },
 
       save(){
+        debugger
         this.submitForm();
       },
       cancle(){

src/router/router.js

@@ -57,6 +57,9 @@ const editSimpleAdvert = r => require.ensure([], () => r(require('../views/educa
 
 const noticeEditor = r => require.ensure([], () => r(require('../views/education/notice-editor.vue')), 'notice-editor')
 
+const activityManagement = r => require.ensure([], () => r(require('../views/activitymanagement/activity-management.vue')), 'activity-management')
+const createActivity = r => require.ensure([], () => r(require('../views/activitymanagement/create-activity.vue')), 'create-activity')
+
 const yqRange = r => require.ensure([], () => r(require('../views/yqrange/yq-range.vue')), 'yq-range')
 const liveManage = r => require.ensure([], () => r(require('../views/yqrange/live-manage.vue')), 'live-manage')
 const roleManage = r => require.ensure([], () => r(require('../views/yqrange/role-manage.vue')), 'role-manage')
@@ -74,6 +77,8 @@ const goodsManage = r => require.ensure([], () => r(require('../views/goods/good
 const createGood = r => require.ensure([], () => r(require('../views/goods/create-good.vue')), 'create-good')
 const orderManage = r => require.ensure([], () => r(require('../views/goods/order-manage.vue')), 'order-manage')
 const orderDetail = r => require.ensure([], () => r(require('../views/goods/order-detail.vue')), 'order-detail')
+const plazaList = r => require.ensure([], () => r(require('../views/plaza/plaza-list.vue')), 'plaza-list')
+const activityMember = r => require.ensure([], () => r(require('../views/activitymanagement/activity-member.vue')), 'activity-member')
 
 
 export default [{
@@ -239,6 +244,15 @@ export default [{
             path: '/yq-range',
             component: yqRange
         },
+        {
+            path: '/activity-management',
+            component: activityManagement
+        },
+        {
+            path:'/create-activity',
+            component: createActivity
+
+        },
         {
             path: '/live-manage',
             component: liveManage
@@ -315,7 +329,14 @@ export default [{
             path: '/order-detail',
             component: orderDetail,
         },
-
+        {
+            path: '/plaza-list',
+            component: plazaList,
+        },
+        {
+            path: '/activity-member',
+            component: activityMember,
+        },
 
       // {
       //   path: '/followup',

src/utils/activitymanagement/activitymanagementApi.js

+import fetch from '../fetch';
+import { getBaseUrl, getSaasDomain, getSaasApiDomain } from '@/utils/index'
+let headers = {
+  'Content-Type': 'application/json;charset=UTF-8',
+  token: localStorage.getItem('storageToken'),
+};
+
+
+export const getOnlineCircleList = () => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/v1/online/list`),
+    method: 'get',
+    description: '获取所有已上线的圈子列表',
+  })
+};
+
+export const getActivityInfoReq = (activityId) => {
+  return fetch({
+  headers,
+  url: getBaseUrl(`circle/sso/activity/info/${activityId}`),
+  method: 'get',
+  description: '后台管理--专区活动信息（查看）',
+  })
+  };
+  export const getActivityList = (params) => {
+    return fetch({
+      headers,
+      url: getBaseUrl(`circle/sso/activity/list`),
+      method: 'get',
+      params: params,
+      description: '专区活动列表与搜索',
+    })
+  };
+  export const removeActivity = (params) => {
+    return fetch({
+      headers,
+      url: getBaseUrl(`circle/sso/activity/remove`),
+      method: 'delete',
+      data: params,
+      description: '后台管理--专区活动删除',
+    })
+  };
+  export const updateActivityStatus = (params) => {
+    return fetch({
+      headers,
+      url: getBaseUrl(`circle/sso/activity/deploy`),
+      method: 'post',
+      data: params,
+      description: '后台管理--专区活动上下线',
+    })
+  };
+
+
+export const getActivityDocList = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/sso/activity/doctor/list`),
+    method: 'get',
+    params: params,
+    description: '后台管理--专区活动成员列表与搜索',
+  })
+};
+
+
+export const removeDoc = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/sso/activity/doctor/remove`),
+    method: 'post',
+    data: params,
+    description: '后台管理--专区活动成员移除',
+    withCredentials: true
+  })
+};
+
+export const importDoc = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/sso/activity/doctor/import`),
+    method: 'post',
+    data: params,
+    description: '后台管理--专区活动成员导入',
+  })
+};
+

src/utils/filter.js

@@ -494,6 +494,17 @@ const vueFilter = {
       return '已通过'
     }
   },
+    auditApplyStatus: (value) => {
+        if (value == 0) {
+            return '-'
+        } else if (value == 1) {
+            return '待审核'
+        } else if (value == 2) {
+            return '已通过'
+        } else if (value == 3) {
+            return '已拒绝'
+        }
+    },
     // 圈子状态 0:暂存 10:待发布（已保存） 20:已发布（已提交待审核、审核被拒绝） 30:已上架（审核通过）40：下架 50：解散
     rangeStatus: (value) => {
         if (value == 0) {
@@ -512,6 +523,14 @@ const vueFilter = {
             return '-'
         }
     },
+    //活动发布状态 1 已经发布 2未发布
+    activityStatus:(value) => {
+        if (value == 1) {
+            return '已发布'
+        }else if (value == 2) {
+            return '未发布'
+        }
+    },
     liveStatusFilter: (value) => {
         if (value == 1) {
             return '预告'
@@ -551,6 +570,34 @@ const vueFilter = {
         }
     },
 
+  circleTypeFilter: (value) => {
+    if(value == 0){
+      return "封闭"
+    }
+    else if(value == 1){
+      return "半开放"
+    }
+    else if(value == 2){
+      return "开放"
+    }
+  },
+
+  tagsFilter: (value) => {
+      let text = "";
+      if(value != null && value.length > 0){
+        for (let i = 0; i < value.length; i++) {
+          if(i == 0){
+            text = text + value[i].name;
+          }
+          else {
+            text = text + "、" + value[i].name;
+          }
+
+        }
+      }
+      return text;
+  }
+
 
 }
 export default vueFilter

src/utils/plaza/plazaApi.js

+import fetch from '../fetch';
+import { getBaseUrl, getSaasDomain, getSaasApiDomain } from '@/utils/index'
+let headers = {
+  'Content-Type': 'application/json;charset=UTF-8',
+  token: localStorage.getItem('storageToken'),
+};
+
+export const getDiseaseList = () => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`sticker/disease/listAll`),
+    method: 'get',
+    description: '疾病标签列表（所有）',
+  })
+};
+
+export const getDeptList = () => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`sticker/subject/childListAll`),
+    method: 'get',
+    description: '科室列表-所有二级',
+  })
+};
+
+export const getSubjectList = () => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`sticker/subject/listAll`),
+    method: 'get',
+    description: '学科列表-所有2级',
+  })
+};
+
+export const getPlazaList = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/sso/square/list`),
+    method: 'post',
+    data: params,
+    description: '后台管理--广场内专区列表与搜索',
+  })
+};
+
+export const savePlaza = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/sso/square/save`),
+    method: 'post',
+    data: params,
+    description: '后台管理--新增编辑广场内专区和标签',
+  })
+};
+
+export const delPlaza = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/sso/square/remove`),
+    method: 'delete',
+    params: params,
+    description: '后台管理--广场内专区移除',
+    withCredentials: true
+  })
+};
+
+
+export const getPlaza = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/sso/square/info?id=${params.id}`),
+    method: 'get',
+    data: params,
+    description: '后台管理--广场内专区信息（查看）',
+    withCredentials: true
+  })
+};
+
+export const getSelectPlazaList = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/sso/square/circle/list/${params.businessId}`),
+    method: 'get',
+    description: '后台管理--待选专区列表',
+  })
+};

src/utils/yqrange/yqrangeApi.js

@@ -294,3 +294,23 @@ export const  postCircleTree = (params) => {
     description: '保存区域',
   })
 };
+
+export const auditList = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/sso/activity/doctor/audit/list?doctorName=${params.doctorName}&titleManager=${params.titleManager}&auditStatus=${params.auditStatus}&pageNo=${params.pageNo}&pageSize=${params.pageSize}`),
+    method: 'get',
+    data: params,
+    description: '医生审核列表',
+  })
+};
+
+export const auditOperation = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl('circle/sso/activity/doctor/audit'),
+    method: 'post',
+    data: params,
+    description: '医生审核',
+  })
+};
\ No newline at end of file

src/views/activitymanagement/create-activity.vue

+<template>
+  <div class="yqrange-index-wrapper">
+    <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :curmbThird="curmbThird" :jumPathThird="jumPathThird"></bread-crumb>
+    <div class="yqrange-index-content screenSet" id="screenSet">
+      <el-row class="step-content">
+        <el-col :span="14">
+          <p class="p-title">{{curmbSecond}}</p>
+          </el-col>
+      </el-row>
+      <div class="first-step" v-if="active === 0">
+        <base-info :formData="formData" @returnTypeData="returnTypeData" @returnIsNext="returnIsNext" ref="child">
+        </base-info>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  let vm = null;
+  import BreadCrumb from "@/components/yqrange/breadcrumb-range.vue";
+  import { openLoading, closeLoading } from "../../utils/utils";
+  import BaseInfo from '@/components/activitymanagement/baseinfo.vue';
+  import { getActivityInfoReq} from '@/utils/activitymanagement/activitymanagementApi';
+  import {getMemberSelectOrgSaveReq} from "../../utils/yqrange/yqrangeApi";
+  export default {
+    name: "create-range",
+    components: {
+      BreadCrumb,
+      BaseInfo
+    },
+    data() {
+      return {
+        id: null,
+        enterType: 1,//1.creat 2.edit
+        curmbFirst: '活动管理',
+        curmbSecond: '新建活动',
+        curmbThird:'',
+        jumPathThird: '/activity-management',
+        jumPathFouth:'',
+        active: 0,
+        //页面展示位置
+        stepData: [true, false],
+        formData: {
+          activityId: 0,//活动ID，新增时为空
+          titleManager: '',//后台标题方便管理
+          titleViewMain: '',//前端主标题
+          titleViewSub: '',//前端副标题
+          circleId: "",//圈子ID
+          beginTime:'',//开始时间
+          endTime:'',//结束时间
+          appModuleDto: {
+            linkType: 4, // 跳转类型:1 链接，4 模块， 8 无跳转
+            name: "", // 模块名称
+            paramFlag: 0, // 是否有参数标志1为有2为没有参数
+            paramList: [
+              {
+                id: "",
+                seqNo: '',  // 选择参数的索引值
+                value: '',
+                key: '', // 参数名称，默认param
+                type:''  // 模块参数类型:1 int类型字符串 4String类型 8时间戳类型字符串
+              }
+            ],
+            paramList2: [],
+            type: 0 // 类型:1 列表页，4 详情页
+          },
+          auditFlag:2,
+          listImage: '',//活动列表页图片
+          introImage:'',//介绍页图片url
+          imgUrl1More: {},
+          imgUrl2More: {},
+        },
+      }
+    },
+    created() {
+      vm = this;
+      // 根据ID是否有值判断编辑还是create
+      // debugger
+      const { enterType, id, roleType } = this.$route.query;
+      this.id = id;
+      this.enterType = enterType;
+      this.roleType = roleType;
+
+      if(this.enterType == 2){
+        this.curmbSecond = "编辑活动"
+      }
+      this.curmbThird = this.curmbSecond;
+
+      if(roleType == null || roleType == undefined){
+        let highMainManager = localStorage.getItem('highMainManager');
+        let mainManager = localStorage.getItem('mainManager');
+        let manager = localStorage.getItem('manager');
+        let ordinary = localStorage.getItem('ordinary');
+        if(highMainManager == 1){
+          this.roleType = 4;
+        }
+        else if(mainManager == 1){
+          this.roleType = 2;
+        }
+        else if(manager == 1){
+          this.roleType = 1;
+        }
+        else if(ordinary == 1){
+          this.roleType = 0;
+        }
+      }
+
+      this.formData.roleType = this.roleType;
+
+      //edit
+      if (this.enterType == 2 && this.id != null) {
+        this.getActivityInfo();
+      }
+
+    },
+    methods: {
+      //下一步
+      nextStep() {
+        // debugger
+        this.$refs.child.submitForm();
+      },
+
+      //完成
+      complete() {
+
+        console.log(this.formData.id);
+        let req = {
+          circleId: this.formData.id,
+        };
+        openLoading(vm);
+        getMemberSelectOrgSaveReq(req).then(res => {
+          closeLoading(vm);
+          if (res.code == "000000") {
+            this.$message.success('操作成功');
+            const _this = this;
+            setTimeout(function () {
+              _this.$router.go(-1)
+            }, 2000);
+            // vm.$router.push({ path: "yq-range" });
+          } else {
+            this.$message(res.message);
+          }
+        }).catch(err => {
+          this.$message.error('请求失败');
+        });
+
+      },
+      //  修改编辑基础信息
+      returnIsNext(flag) {
+        if (flag == true) {
+          vm.commitActivityInfo();
+        }
+      },
+      returnTypeData(item) {
+        vm.formData[item.name] = item.val
+      },
+      //获取活动详情
+      getActivityInfo() {
+        getActivityInfoReq(this.id).then(res => {
+          // closeLoading(this);
+          if (res.code == "000000") {
+            this.formData = { ...this.formData, ...res.data };
+
+          } else {
+            vm.$message(res.message);
+          }
+        }).catch(err => {
+          vm.$message.error('请求失败');
+        });
+      },
+      //更新活动信息
+      commitActivityInfo() {
+        let req = vm.formData;
+        vm.POST("circle/sso/activity/save", req).then(res => {
+          if (res.code == "000000") {
+            this.$message.success('保存成功');
+            const _this = this;
+            setTimeout(function () {
+              _this.$router.go(-1)
+            }, 100);
+
+          } else {
+            this.$message(res.message);
+          }
+        });
+      },
+    }
+  }
+</script>
+<style lang="scss">
+  .yqrange-index-wrapper {
+    .yqrange-index-content {
+      background: #fff;
+      padding: 10px;
+
+      .step-content {
+        overflow: hidden;
+        height: 60px;
+        padding: 15px 0 50px 0;
+        border-bottom: 1px solid #efefef;
+
+        .is-text {
+          display: none;
+        }
+
+        .el-steps--simple {
+          background: #fff;
+          padding: 10px 8%;
+        }
+
+        .step-num {
+          display: block;
+          margin-top: 1.5px;
+          font-size: 12px;
+          border: 1px solid #999 !important;
+          border-radius: 50%;
+          width: 25px;
+          height: 18px;
+          line-height: 15px;
+          text-align: center;
+          color: #999;
+        }
+
+        .el-step__title.is-wait {
+          color: #999;
+        }
+
+        .el-step__title.is-process {
+          color: #449284;
+        }
+
+        .is-finish {
+          color: #999 !important;
+        }
+
+        .on-step {
+          color: #449284;
+          border: 1px solid #449284 !important;
+        }
+      }
+    }
+  }
+</style>

src/views/activitymanagement/range-apply.vue

+<template>
+  <div class="yqrange-index-wrapper">
+    <bread-crumb :curmbFirst="curmbFirst"></bread-crumb>
+    <div class="yqrange-index-content">
+      <el-form ref="searchForm" :model="searchForm" label-width="75px" label-suffix=":" :inline="true">
+        <el-row :gutter="30" type="flex" style="margin-top: 10px">
+          <el-col :span="8">
+              <el-input v-model="searchForm.doctorName" size="small" placeholder="请输入报名人姓名"></el-input>
+          </el-col>
+          <el-col :span="9">
+            <el-input v-model="searchForm.titleManager" size="small" placeholder="请输入活动后台标题"></el-input>
+          </el-col>
+          <el-col :span="9">
+              <el-select
+                v-model="searchForm.auditStatus"
+                placeholder="全部审核状态"
+                size="small">
+                <el-option
+                  v-for="item in statusList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+          </el-col>
+
+
+          <el-col :span="7" style="text-align: right">
+            <el-button type="primary" size="small" @click="search">搜索</el-button>
+            <el-button type="default" size="small" @click="resetForm" style="margin-left:0;">取消搜索</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table :data="tableData" class="item-table" style="width: 100%;margin-top: 10px;">
+        <el-table-column prop="doctorName" label="报名人" min-width="100" align="center"></el-table-column>
+        <el-table-column prop="activityName" label="报名参加活动" min-width="150" align="center"></el-table-column>
+        <el-table-column prop="departmentName" label="所属科室" min-width="100" align="center"></el-table-column>
+        <el-table-column prop="hospitalName" label="所属医院" min-width="100" align="center"></el-table-column>
+        <el-table-column prop="provinceName" label="所属省份" min-width="100" align="center"></el-table-column>
+        <el-table-column prop="cityName" label="所属城市" min-width="100" align="center"></el-table-column>
+        <el-table-column prop="countyName" label="所属区县" min-width="100" align="center"></el-table-column>
+        <el-table-column prop="townName" label="所属街道" min-width="100" align="center"></el-table-column>
+        <el-table-column prop="auditStatus" label="审核状态" min-width="100" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.auditStatus | auditApplyStatus }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" min-width="200" align="center">
+          <template slot-scope="scope"> <!-- 0全部 1待审核 2已通过 3已拒绝 -->
+            <div>
+              <el-button @click="approve(scope.row)" type="text" size="small" v-if="scope.row.auditStatus == 1">通过</el-button>
+              <el-button @click="reject(scope.row)" type="text" size="small" v-if="scope.row.auditStatus == 1">拒绝</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination">
+        <el-pagination
+          background
+          @size-change="handleSizeChange"
+          @current-change="handleNumChange"
+          :current-page="searchForm.pageNo"
+          :page-sizes="[10, 30, 50, 100]"
+          :page-size="searchForm.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="totalRows"
+        ></el-pagination>
+      </div>
+
+    </div>
+  </div>
+
+</template>
+<script>
+  import { openLoading, closeLoading } from "../../utils/utils";
+  import BreadCrumb from "@/components/breadcrumb.vue";
+  import { auditList, auditOperation, applyList, applyUpdate} from "../../utils/yqrange/yqrangeApi";
+  export default {
+    components: {
+      BreadCrumb
+    },
+    data(){
+      return{
+        curmbFirst: '审核列表',
+        showAllFlag: false,
+        showNewFlag: false,
+        searchForm: {
+          doctorName: '',
+          titleManager: '',
+          // endTime: '',
+          auditStatus: 0,
+          pageNo: 1,
+          pageSize: 10,
+        },
+        totalRows: 0,
+        tableData: [],
+        dialogSettingVisible: false,
+        settingForm:{
+          circleId: null,
+          settingData: []
+        },
+        statusList: [
+          {
+            value: 0,
+            label: "全部"
+          },
+          {
+            value: 1,
+            label: "待审核"
+          },
+          {
+            value: 2,
+            label: "已通过"
+          },
+          {
+            value: 3,
+            label: "已拒绝"
+          },
+        ],
+        dialogVisible: false
+      }
+    },
+    created() {
+      // this.initPrivilege();
+      this.search(1);
+    },
+    methods: {
+
+      initPrivilege(){
+        let idType = localStorage.getItem('storageIdType');
+        // if(idType == null || idType == ""){
+        //   idType = 2;
+        //   localStorage.setItem('storageIdType', idType);
+        // }
+        // this.searchForm.userType = idType;
+
+        // 内部用户:运营人员
+        if(idType == "1"){
+          this.showAllFlag = true;
+          this.showNewFlag = true;
+        }
+        // 外部用户
+        else if(idType == "2"){
+          this.showAllFlag = false;
+          setTimeout(() => {
+            this.getUserAuth();
+          },1500)
+
+        }
+
+      },
+      // 外部用户权限
+      getUserAuth(){
+
+        let highMainManager = localStorage.getItem('highMainManager');
+        let mainManager = localStorage.getItem('mainManager');
+        let manager = localStorage.getItem('manager');
+
+        if(highMainManager == "1" || mainManager == "1"){
+          this.showNewFlag = true;
+        }
+        else if(manager == "1"){
+          this.showNewFlag = false;
+        }
+        // localStorage.setItem('ordinary', vm.setStoreData(ordinary))
+
+      },
+
+      // 搜索
+      search(first){
+        this.searchForm.pageNo = 1;
+        this.searchList(first);
+      },
+
+      searchList(first) {
+        if(!first) {
+          console.log('查询圈子')
+          openLoading(this);
+        }
+        let params = this.searchForm;
+        console.log("searchList() : params = " + JSON.stringify(params))
+        auditList(params).then((res) => {
+          closeLoading(this);
+          if(res.code == "000000") {
+            this.tableData = res.data.activityDoctorAuditModelList;
+            this.totalRows = res.data.total;
+          } else {
+            this.tableData = [];
+          }
+        }).catch((error) => {
+          // this.$message({
+          //   message: error,
+          //   type: 'error'
+          // });
+          this.$message.error("请重试");
+        })
+      },
+
+      resetForm() {
+        this.searchForm.doctorName = "";
+        this.searchForm.titleManager = "";
+        this.searchForm.auditStatus = 0;
+        console.log('重置')
+        this.search();
+      },
+
+
+      // 更新圈子状态（上线，下线）
+      updateStatus(params){
+        console.log("updateStatus() : params = " + JSON.stringify(params));
+        auditOperation(params).then((res) => {
+          closeLoading(this);
+          if(res.code == "000000") {
+            this.$message.success("成功");
+            this.searchList();
+          } else {
+            this.$message.success("失败");
+          }
+        }).catch((error) => {
+          // this.$message({
+          //   message: error,
+          //   type: 'error'
+          // });
+          this.$message.error("请重试");
+        })
+      },
+
+      // 1:待审核，2.通过，3:拒绝
+      approve(row){
+        let params = {
+          "accept": true,
+          "auditRecordId": row.auditRecordId,
+        };
+
+        this.updateStatus(params);
+      },
+
+      //拒绝
+      reject(row) {
+        let params = {
+          "accept": false,
+          "auditRecordId": row.auditRecordId,
+        };
+        this.$confirm(`拒绝后"${row.doctorName}"将无法访问"${row.activityName}"`, `确认拒绝`, {
+          confirmButtonText: '拒绝',
+          cancelButtonText: '取消',
+          type: 'warning',
+          customClass: 'range-make-box',
+        }).then(() => {
+          //  confirm
+          this.updateStatus(params);
+        }).catch(() => {
+          //  cancel
+        });
+      },
+
+
+
+      // 关闭
+      handleSettingClose(){
+        this.dialogSettingVisible = false;
+      },
+
+      handleSizeChange(val) {
+        this.searchForm.pageSize = val;
+        this.search();
+      },
+      handleNumChange(val) {
+        this.searchForm.pageNo = val;
+        this.searchList();
+      },
+    },
+  }
+</script>
+<style lang="scss">
+  .yqrange-index-wrapper{
+    .yqrange-index-content{
+      background: #fff;
+      padding: 10px;
+      .header-title{
+        padding: 10px 12px;
+        font-size: 12px;
+        color: #449284;
+        border-bottom: 1px solid #efefef;
+      }
+    }
+    .el-button--text{
+      color: #449284;
+      font-size: 14px;
+      &::after{
+        content: '';
+        position: relative;
+        height: 14px;
+        /*border-right: 1px solid #EBEEF5;*/
+        border-right: 1px solid #aaaaaa;
+        padding-right: 10px;
+      }
+      &:last-of-type{
+        &::after{
+          content: '';
+          position: relative;
+          width: 1px;
+          height: 14px;
+          border-right: none;
+        }
+      }
+    }
+  }
+  /*.range-make-box{*/
+  /*.el-message-box__btns{*/
+  /*margin-top: 30px;*/
+  /*}*/
+  /*}*/
+</style>

src/views/yqrange/create-range.vue

@@ -25,6 +25,23 @@
       <!--<div class="second-step" v-else-if="active === 1">-->
         <!--<organzation :formData="formData" ref="org"></organzation>-->
       <!--</div>-->
+
+      <el-dialog
+        title=""
+        :show-close="false"
+        :visible.sync="confirmVisible"
+        :close-on-click-modal="false"
+        width="600px"
+        center
+      >
+        <p style="text-align: center;">{{confirmMessage}}</p>
+        <span slot="footer" class="dialog-footer">
+        <!--<el-button @click="confirmDelete">删 除</el-button>-->
+        <el-button type="primary" @click="hideConfirm">确定</el-button>
+      </span>
+      </el-dialog>
+
+
     </div>
   </div>
 </template>
@@ -64,7 +81,9 @@
           type: 0,
           deptId: "",
           allowShare: 1
-        }
+        },
+        confirmMessage: "",
+        confirmVisible: false,
       }
     },
     created() {
@@ -184,11 +203,32 @@
               _this.$router.go(-1)
             }, 100);
 
-          } else {
+          }
+          else if(res.code == "224027"){
+
+            vm.confirmMessage = `圈子已被加入广场中，请先至广场管理移除该圈子后再操作`;
+            vm.confirmVisible = true;
+
+
+            // this.$confirm(`圈子已被加入广场中，请先至广场管理移除该圈子后再操作`, '', {
+            //   confirmButtonText: '确定',
+            //   type: 'warning',
+            //   customClass: 'range-make-box',
+            // }).then(() => {
+            //   //  confirm
+            // }).catch(() => {
+            //   //  cancel
+            // });
+          }
+          else {
             this.$message(res.message);
           }
         });
       },
+
+      hideConfirm(){
+        vm.confirmVisible = false;
+      }
     }
   }
 </script>

src/views/yqrange/yq-range.vue

@@ -118,6 +118,22 @@
 
 
       </el-dialog>
+
+          <el-dialog
+            title=""
+            :show-close="false"
+            :visible.sync="confirmVisible"
+            :close-on-click-modal="false"
+            width="600px"
+            center
+          >
+            <p style="text-align: center;">{{confirmMessage}}</p>
+            <span slot="footer" class="dialog-footer">
+        <!--<el-button @click="confirmDelete">删 除</el-button>-->
+        <el-button type="primary" @click="hideConfirm">确定</el-button>
+      </span>
+          </el-dialog>
+
         </el-tab-pane>
 
         <el-tab-pane label="审核列表" name="second" v-if="showApplyFlag">
@@ -168,7 +184,9 @@ export default {
         circleId: null,
         settingData: []
       },
-      idType: ""
+      idType: "",
+      confirmMessage: "",
+      confirmVisible: false,
     }
   },
   created() {
@@ -321,7 +339,13 @@ export default {
             this.$message.success("解散成功");
           }
           this.searchList();
-        } else {
+        }
+        else if(res.code == "224027") {
+
+          this.confirmMessage = `圈子已被加入广场中，请先至广场管理移除该圈子后再操作`;
+          this.confirmVisible = true;
+        }
+        else {
           if(status == "40"){
             this.$message.error("下线失败，请重试");
           } else if(status == "30") {
@@ -349,6 +373,10 @@ export default {
 
     },
 
+    hideConfirm(){
+      this.confirmVisible = false;
+    },
+
     rangeManage(row) {
       this.$router.push({
         path: '/range-manage',