小生态7.2优化

src/components/yqrange/baseinfo.vue

@@ -98,6 +98,31 @@
       </el-radio-group>
     </el-form-item>
 
+    <el-form-item label="对接部门" prop="dept_id" v-if="deptFlag">
+
+      <el-select
+        v-model="formData.dept_id"
+        placeholder="请选择该小圈的对接部门"
+        size="small"
+        clearable>
+        <el-option
+          v-for="(item,index) in deptList"
+          :key="index"
+          :label="item.label"
+          :value="item.value"
+        ></el-option>
+      </el-select>
+
+    </el-form-item>
+
+
+    <el-form-item label="允许分享圈子" prop="allowShare" v-if="shareFlag">
+      <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>
@@ -126,6 +151,7 @@
   let vm = null;
   import { openLoading, closeLoading } from "../../utils/utils";
   import { doUpload, getFilePath } from "../../utils/qiniu-util";
+  import { getCircleDept } from "../../utils/yqrange/yqrangeApi";
   import Cropper from '@/components/common/cropper.vue'
   export default {
     name: "baseinfo",
@@ -142,6 +168,17 @@
     },
     created() {
       vm = this;
+
+      this.isDept();
+      // const mobilePhone = localStorage.getItem("mobilePhone");
+      //
+      // if(mobilePhone == "13341740525" || mobilePhone == "18251938586"){
+      //   this.deptFlag = true;
+      // }
+      // else {
+      //   this.deptFlag = false;
+      // }
+
     },
     data() {
       let checkProjectStr = (rule, value, callback) => {
@@ -215,6 +252,20 @@
             label: '管理员可发布'
           },
         ],
+        deptList: [
+          {
+            value: 1,
+            label: '铁军部'
+          }, {
+            value: 2,
+            label: '医疗事业部'
+          },{
+            value: 3,
+            label: '商业化部'
+          },
+        ],
+        deptFlag: false,
+        shareFlag: false
       }
     },
 
@@ -354,6 +405,29 @@
       },
       changeType(){
 
+        if(vm.formData.type == 1 || vm.formData.type == 2){
+          vm.shareFlag = true;
+        }
+        else {
+          vm.shareFlag = false;
+        }
+
+      },
+      isDept(){
+        let params = {
+          type: 2
+        };
+        openLoading(vm);
+        getCircleDept(params).then(res => {
+          closeLoading(vm);
+          if (res.code == "000000") {
+            vm.deptFlag = res.data;
+            // this.$message.success('操作成功');
+          }
+        }).catch(err => {
+          this.$message.error('请求失败');
+        });
+
       }
     }
   }

src/components/yqrange/member-management/org.vue

@@ -6,14 +6,14 @@
         <i class="text" @click="dialogOrgFn()">添加机构</i>
       </el-col>
       <el-col class="add-organization" v-if="showImportFlag">
-        <el-upload
-          class="bg-uploader"
-          action="#"
-          :show-file-list="false"
-          :before-upload="beforeUploadOrg">
+        <!--<el-upload-->
+          <!--class="bg-uploader"-->
+          <!--action="#"-->
+          <!--:show-file-list="false"-->
+          <!--:before-upload="beforeUploadOrg">-->
           <i class="el-icon-document-add"></i>
-          <i class="text">批量导入</i>
-        </el-upload>
+          <i class="text" @click="batchImport()">批量导入</i>
+        <!--</el-upload>-->
       </el-col>
       <el-col class="organization-search">
         <el-form :inline="true" :model="formOrganization" class="demo-form-inline" >
@@ -99,17 +99,64 @@
     </el-dialog>
 
     <el-dialog
-      title="导入错误提示"
+      title=""
       :visible.sync="dialogVisible"
       width="500px"
       :close-on-click-modal="false"
       @close="handleErrorClose"
       center
     >
-      <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-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>-->
+
+      <div v-if="importSuccessFlag">
+      <span>本次成功导入{{importNum}}数据</span>
+      </div>
+      <div v-if="!importSuccessFlag">
+        <span>有{{importNum}}数据不符合格式要求，请修正后再次导入</span>
+        <span><a>下载错误数据</a></span>
+
+      </div>
+
+
+    </el-dialog>
+
+
+    <el-dialog
+      title="批量导入"
+      :visible.sync="dialogImportVisible"
+      width="650px"
+      :close-on-click-modal="false"
+      @close="handleImportClose"
+      center>
+
+      <div style="float:left;width: 250px;height: 150px;">
+      <span>1.下载模板，填写信息</span>
+      <br>
+        <div>
+          <el-button type="primary" size="small" style="float:left; margin-top: 30px;" @click="download1">下载模板1</el-button>
+        <span style="float:left; margin-top: 72px;margin-left: -90px;">填写机构明细导入</span>
+        </div>
+        <div>
+        <el-button type="primary" size="small" style="margin-top: 30px;margin-left: 48px;" @click="download2">下载模板2</el-button>
+        <span style="float: right;margin-top:10px;">填写机构ID导入</span>
+        </div>
+      </div>
+      <div style="float:left;margin-left: 90px;width: 1px;height: 100px; background: #c8cbd2;"></div>
+      <div style="margin-left: 400px;">
+      <span>2.上传填写好的文件</span>
+      <br>
+     <el-upload
+        class="bg-uploader"
+        action="#"
+        :show-file-list="false"
+        :before-upload="beforeUploadOrg">
+       <el-button type="primary" size="small" style="margin-top: 30px;">上传文件</el-button>
+     </el-upload>
+
+      </div>
     </el-dialog>
 
   </div>
@@ -192,6 +239,10 @@ export default {
       dialogVisible: false,
       dialogErrorData: [],
       showImportFlag: false,
+      dialogImportVisible: false,
+      importMsg: "",
+      importSuccessFlag: false,
+      importNum: 0
     }
   },
   components: {
@@ -206,7 +257,8 @@ export default {
       this.showImportFlag = true;
     }
     else {
-      this.showImportFlag = false;
+      // this.showImportFlag = false;
+      this.showImportFlag = true;
     }
   },
   mounted() {
@@ -504,6 +556,24 @@ export default {
       this.dialogVisible = false;
     },
 
+
+    batchImport(){
+      this.dialogImportVisible = true;
+    },
+
+    handleImportClose(){
+      this.dialogImportVisible = false;
+    },
+
+    download1(){
+      const url = "https://files.yunqueyi.com/template/import_hospital_by_detail.xlsx";
+      window.location.href = url;
+    },
+    download2(){
+      const url = "https://files.yunqueyi.com/template/import_hospital_by_id.xlsx";
+      window.location.href = url;
+    }
+
   }
 }
 </script>

src/utils/yqrange/yqrangeApi.js

@@ -161,4 +161,14 @@ export const applyUpdate = (params) => {
   })
 };
 
+export const getCircleDept = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`circle/circle/judge/menu/${params.type}`),
+    method: 'get',
+    data: params,
+    description: '参数为类型目前2为是否有圈子设置所属部门的权限,返回结果为true/false',
+  })
+};
+
 

src/views/yqrange/create-range.vue

@@ -61,7 +61,9 @@
           dynamicFlag: '',
           idType: localStorage.getItem("storageIdType"),
           roleType: null,
-          type: 0
+          type: 0,
+          dept_id: "",
+          allowShare: 0
         }
       }
     },