Merge branch 'dev-circle-nine-20201231' of...

Merge branch 'dev-circle-nine-20201231' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-circle-nine-20201231

src/views/activitymanagement/activity-member.vue

@@ -266,23 +266,6 @@
       vm.idType = localStorage.getItem("storageIdType");
 
       this.init();
-      if(vm.idType == 1){
-        this.showImportFlag = true;
-      }
-      else {
-        setTimeout(() => {
-          let highMainManager = localStorage.getItem('highMainManager');
-          let mainManager = localStorage.getItem('mainManager');
-          let manager = localStorage.getItem('manager');
-          if(highMainManager == 1 || mainManager == 1 || manager == 1){
-            this.showImportFlag = true;
-          }
-          else {
-            this.showImportFlag = false;
-          }
-        },1000);
-
-      }
     },
     mounted() {
     },
@@ -299,7 +282,6 @@
         this.getList()
       },
       getList(first) {
-        let idType = localStorage.getItem("storageIdType");
         let req = {
           activityId: this.id,
           hospitalName: this.memberForm.hospitalName,

src/views/plaza/plaza-list.vue

@@ -638,7 +638,12 @@
         savePlaza(params).then((res) => {
           closeLoading(this);
           if(res.code == "000000") {
-            this.$message.success("添加成功");
+            if(vm.editFlag){
+              this.$message.success("编辑成功！");
+            }
+            else {
+              this.$message.success("添加成功！");
+            }
             vm.dialogVisible = false;
             vm.getPlazaList("", "");
           } else {

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',