对接部门和分享修复

src/components/yqrange/baseinfo.vue

@@ -99,13 +99,21 @@
       </el-radio-group>
     </el-form-item>
 
-    <el-form-item label="对接部门" prop="deptId" v-if="deptFlag">
+    <el-form-item label="允许分享圈子" prop="allowShare" v-if="formData.type == 1 || formData.type == 2 " class="required-label">
+      <el-radio-group v-model="formData.allowShare" size="small">
+        <el-radio :label="0" class="label-type">不允许</el-radio>
+        <el-radio :label="1" class="label-type">允许</el-radio>
+      </el-radio-group>
+    </el-form-item>
+
+
+    <el-form-item label="对接部门" prop="deptId" v-if="deptFlag" class="required-label">
 
       <el-select
         v-model="formData.deptId"
+        @change="returnTypeData('deptId')"
         placeholder="请选择该小圈的对接部门"
-        size="small"
-        clearable>
+        size="small">
         <el-option
           v-for="(item,index) in deptList"
           :key="index"
@@ -116,14 +124,6 @@
 
     </el-form-item>
 
-
-    <el-form-item label="允许分享圈子" prop="allowShare" v-if="formData.type == 1 || formData.type == 2 ">
-      <el-radio-group v-model="formData.allowShare" size="small">
-        <el-radio :label="0" class="label-type">不允许</el-radio>
-        <el-radio :label="1" class="label-type">允许</el-radio>
-      </el-radio-group>
-    </el-form-item>
-
     <div style="margin-top: 60px;margin-left: 250px;">
       <el-button type="primary" @click="save()" center>保存</el-button>
       <el-button @click="cancle()">取 消</el-button>
@@ -240,6 +240,9 @@
           ],
           type: [
             { required: true, message: "请选择圈子类型", trigger: "blur" },
+          ],
+          deptId: [
+            { required: true, message: "请选择对接部门", trigger: "blur" }
           ]
         },
         imgMouseOver1: false,
@@ -285,14 +288,21 @@
         if (!this.formData.headUrl){
           this.uploadImgMessage1 = true;
         }
+
         this.$refs[formName].validate(valid => {
-          if (valid&&this.formData.headUrl!="") {
+          if (valid && vm.formData.headUrl!="") {
             flag = true;
           } else {
             console.log("error submit!!");
             flag = false;
           }
         });
+
+        if(flag){
+          if(this.formData.deptId == ""){
+            this.formData.deptId = 0;
+          }
+        }
         this.$emit('returnIsNext', flag);
       },
       //上传圈子头像
@@ -422,7 +432,8 @@
         getCircleDept(params).then(res => {
           closeLoading(vm);
           if (res.code == "000000") {
-            vm.deptFlag = res.data;
+            // vm.deptFlag = res.data;
+            vm.deptFlag = true;
             // this.$message.success('操作成功');
           }
         }).catch(err => {

src/views/yqrange/create-range.vue

@@ -62,8 +62,8 @@
           idType: localStorage.getItem("storageIdType"),
           roleType: null,
           type: 0,
-          deptId: 0,
-          allowShare: 0
+          deptId: "",
+          allowShare: 1
         }
       }
     },
@@ -145,11 +145,11 @@
       //  修改编辑基础信息
       returnIsNext(flag) {
         if (flag == true) {
-          this.commitQuanziInfo();
+          vm.commitQuanziInfo();
         }
       },
       returnTypeData(item) {
-        this.formData[item.name] = item.val
+        vm.formData[item.name] = item.val
       },
       //获取圈子详情
       getCircleInfo() {
@@ -157,15 +157,18 @@
           // closeLoading(this);
           if (res.code == "000000") {
             this.formData = { ...this.formData, ...res.data };
+            if(vm.formData.deptId == 0){
+              vm.formData.deptId = "";
+            }
           } else {
-            this.$message(res.message);
+            vm.$message(res.message);
           }
         }).catch(err => {
-          this.$message.error('请求失败');
+          vm.$message.error('请求失败');
         });
       },
       commitQuanziInfo() {
-        let req = this.formData;
+        let req = vm.formData;
         console.log("commitQuanziInfo() : name = " + req.name + ", headUrl = " + req.headUrl
           + ", coverUrl = " + req.coverUrl + ", introduce = " + req.introduce + ", dynamicFlag = " + req.dynamicFlag)
         vm.POST("circle/circle/save", req).then(res => {