Merge branch 'dev-coop-phase3-0918' into release

src/router/router.js

@@ -9,6 +9,7 @@ const itemComponent = r => require.ensure([], () => r(require('../views/educatio
 const createComponent = r => require.ensure([], () => r(require('../views/education/create-component.vue')),'create-component')
 const roleManager = r => require.ensure([], () => r(require('../views/system/role.vue')),'role')
 const addManager = r => require.ensure([], () => r(require('../views/education/add-manager.vue')), 'add-manager')
+const editManager = r => require.ensure([], () => r(require('../views/education/edit-manager.vue')), 'edit-manager')
 const itemRole = r => require.ensure([], () => r(require('../views/system/item-role.vue')), 'item-role')
 const msgPush = r => require.ensure([], () => r(require('../views/msgpush/msg-push.vue')), 'msg-push')
 
@@ -50,6 +51,9 @@ export default [{
         },{
             path: '/add-manager',
             component: addManager
+        },{
+            path: '/edit-manager',
+            component: editManager
         },{
             path: '/item-component',
             component: itemComponent

src/utils/education/educationApi.js

@@ -2,7 +2,7 @@ import fetch from '../fetch';
 import { getBaseUrl } from '@/utils/index';
 
 
-export const uploadExcel = (data,projectId) => {
+export const uploadExcel = (data, projectId) => {
     // return utils.checkAuth(()=>{
     return fetch({
         headers: {
@@ -10,10 +10,40 @@ export const uploadExcel = (data,projectId) => {
             sysCode: 12,
             token: localStorage.getItem('storageToken'),
         },
-        url: getBaseUrl('portal/portalProjectOrRole/importRoleFile?projectId='+projectId),
+        url: getBaseUrl('portal/v2/role/importRoleFile?projectId=' + projectId),
         method: 'post',
         data: data,
         description: '上传excel文件',
     })
     // })
+}
+export const uploadOrgExcel = (data, projectId) => {
+    // return utils.checkAuth(()=>{
+    return fetch({
+        headers: {
+            'Content-Type': 'application/json;charset=UTF-8',
+            sysCode: 12,
+            token: localStorage.getItem('storageToken'),
+        },
+        url: getBaseUrl('portal/new/scope/org/v1/' + projectId + '/import'),
+        method: 'put',
+        data: data,
+        description: '上传excel文件',
+    })
+    // })
+}
+export const uploadPersonExcel = (data, projectId) => {
+    // return utils.checkAuth(()=>{
+    return fetch({
+        headers: {
+            'Content-Type': 'application/json;charset=UTF-8',
+            sysCode: 12,
+            token: localStorage.getItem('storageToken'),
+        },
+        url: getBaseUrl('portal/new/scope/doctor/v1/' + projectId + '/import'),
+        method: 'put',
+        data: data,
+        description: '上传excel文件',
+    })
+    // })
 }
\ No newline at end of file

src/utils/env-config.js

@@ -10,8 +10,8 @@ export const envConfig = {
     // baseUrl: 'https://uat-sc.yunqueyi.com/',
     // baseUrl: 'http://10.177.15.150:10401/',
     // baseUrl: 'http://10.177.15.150:11905/',
-    baseUrl: 'https://dev-sc.yunqueyi.com/',
-    // baseUrl: 'https://test1-sc.yunqueyi.com/',
+    // baseUrl: 'https://dev-sc.yunqueyi.com/',
+    baseUrl: 'https://test1-sc.yunqueyi.com/',
     // baseUrl: 'https://uat-sc.yunqueyi.com/',
     apiUrl: 'https://dev-api.yunqueyi.com/',
     qiniuFileUrl: "https://dev-sc.yunqueyi.com/contents/admin/qiniu/token1",
@@ -27,10 +27,11 @@ export const envConfig = {
     workApiSrc: 'https://dev-work.yunqueyi.com',
     // reportUrl: 'http://10.177.15.150:10401/',
     // reportUrl: 'http://192.168.140.13:10401/',
-    reportUrl: 'https://dev-sc-report.yunqueyi.com/',
-    // reportUrl: 'https://test1-sc-report.yunqueyi.com/',
+    // reportUrl: 'https://dev-sc-report.yunqueyi.com/',
+    reportUrl: 'https://test1-sc-report.yunqueyi.com/',
     // reportUrl: 'https://uat-sc-report.yunqueyi.com/',
     excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
+    itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
   },
   dev: {
     baseUrl: 'https://dev-sc.yunqueyi.com/',
@@ -47,6 +48,7 @@ export const envConfig = {
     workApiSrc: 'https://dev-work.yunqueyi.com',
     reportUrl: 'https://dev-sc-report.yunqueyi.com/',
     excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
+    itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
   },
   test: {
     baseUrl: 'https://test1-sc.yunqueyi.com/',
@@ -63,6 +65,7 @@ export const envConfig = {
     workApiSrc: 'https://test1-work.yunqueyi.com',
     reportUrl: 'https://test1-sc-report.yunqueyi.com/',
     excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
+    itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
   },
   test2: {
     baseUrl: 'https://test2-work.yunqueyi.com/sc/',
@@ -78,6 +81,7 @@ export const envConfig = {
     workApiSrc: 'https://test2-work.yunqueyi.com',
     reportUrl: 'https://test2-sc-report.yunqueyi.com/',
     excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
+    itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
   },
   uat: {
     baseUrl: 'https://uat-sc.yunqueyi.com/',
@@ -94,6 +98,7 @@ export const envConfig = {
     workApiSrc: 'https://uat-work.yunqueyi.com',
     reportUrl: 'https://uat-sc-report.yunqueyi.com/',
     excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
+    itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
   },
   pro: {
     baseUrl: 'https://sc.yunqueyi.com/',
@@ -110,5 +115,6 @@ export const envConfig = {
     workApiSrc: 'https://work.yunqueyi.com',
     reportUrl: 'https://sc-report.yunqueyi.com/',
     excelUrl: 'https://file.yunqueyi.com/File/template/portal/',
+    itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
   }
 }

src/utils/fetch.js

@@ -55,7 +55,8 @@ service.interceptors.request.use(config => {
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = 'BFD804F3A3194FBBBE113962222839F6';
-      config.headers['token'] = 'F8209898391C40A0B8DBC1ED9E157291';
+      // config.headers['token'] = 'F8209898391C40A0B8DBC1ED9E157291';
+      config.headers['token'] = 'E5F82EDD958941C29BCDDDED410ACDB3';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/utils/filter.js

@@ -237,17 +237,17 @@ const vueFilter = {
       return time;
   },
   shieldStatus: (value) => {
-    if(value == 0) {
-        return '已屏蔽';
-    } else if(value == 1) {
+    if(value == 1) {
         return '未屏蔽';
+    } else if(value == 2) {
+        return '已屏蔽';
     }
   },
   shieldButton: (value) => {
-    if(value == 0) {
-        return '取消屏蔽';
-    } else if(value == 1) {
+    if(value == 1) {
         return '屏蔽';
+    } else if(value == 2) {
+        return '取消屏蔽';
     }
   },
   areaText: (value) => {

src/utils/index.js

@@ -212,7 +212,12 @@ export function getReportUrl(url) {
   return getConfigByEnvType('reportUrl') + url
 }
 
-// 获取SC服务器域名地址
+// 获取Excel地址
 export function getExeclUrl(url) {
   return getConfigByEnvType('excelUrl') + url
+}
+
+// 获取教培项目文件地址
+export function getItemFileUrl(url) {
+  return getConfigByEnvType('itemFileUrl') + url
 }
\ No newline at end of file

src/utils/mixins.js

@@ -186,7 +186,15 @@ module.exports = {
                 data: para
             })
         },
-
+        // 通用PUT请求
+        PUT(api, para, callback) {
+            // para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"
+            return fetch({
+                url: getBaseUrl(api),
+                method: 'put',
+                data: para
+            })
+        },
         // 通用POST请求
         POST(api, para, callback) {
             // para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"

src/utils/operation.js

@@ -285,7 +285,7 @@ export function isOverlap(startA, endA, startB, endB) {
 }
 export function setRegionOption(data) {
   let option = [];
-  option[0] = {id: 0, value: 0, label: "全部", leaf: true};
+  option[0] = { id: 0, value: 0, label: "全部", leaf: true };
   for (let i = 0; i < data.length; i++) {
     let obj = data[i];
     obj.label = data[i].provinceName;
@@ -294,6 +294,24 @@ export function setRegionOption(data) {
   }
   return option;
 }
+export function setRegionOption2(data) {
+  let option = [];
+  option[0] = { id: 0, value: '0', label: "全部地区", leaf: true };
+  for (let i = 0; i < data.length; i++) {
+    let obj = data[i];
+    obj.label = data[i].provinceName;
+    obj.value = data[i].provinceId;
+    option.push(obj);
+  }
+  return option;
+}
+export function setAdministrativeId(value) {
+  let areaId = '000';
+  for (let i = 0; i < value.length; i++) {
+    areaId += '_' + value[i];
+  }
+  return areaId;
+}
 export function getRegionOption() {
   let option = [{
     value: 1,
@@ -313,7 +331,7 @@ export function getRegionOption() {
   return option;
 }
 export function getLearnOrganization(data) {
-  if(data.length == 0) {
+  if (data.length == 0) {
     let arr = [];
     return arr;
   }
@@ -480,11 +498,11 @@ export function getRank(xAxisData, seriesData) {
   };
   return option;
 }
-export function getSearchType(formData,checkAll) {
+export function getSearchType(formData, checkAll) {
   let type = 0;
   if (formData.region.length == 1 || formData.region.length == 2) {
     type = formData.region.length;
-    if(formData.region.length == 1 && formData.region[0] == 0) {
+    if (formData.region.length == 1 && formData.region[0] == 0) {
       type = 6;
     }
   } else if (formData.region.length == 3) {
@@ -493,7 +511,7 @@ export function getSearchType(formData,checkAll) {
     } else {
       type = 4;
     }
-  }  else if (formData.region.length == 4) {
+  } else if (formData.region.length == 4) {
     if (formData.organization.length == 0 || checkAll === true) {
       type = 5;
     } else {
@@ -560,23 +578,23 @@ export function getAjustmentList(data) {
 }
 export function removeZero(data) {
   let list = [];
-  for(let i = 0;i<data.length;i++) {
-    if(data[i].value != 0) {
+  for (let i = 0; i < data.length; i++) {
+    if (data[i].value != 0) {
       list.push(data[i]);
     }
   }
   return list;
 }
 export function initRank(data) {
-  let list = [{gradeFlag: -1, gradeName: "全部"}];
-  for(let i=0;i<data.length;i++) {
+  let list = [{ gradeFlag: -1, gradeName: "全部" }];
+  for (let i = 0; i < data.length; i++) {
     list.push(data[i]);
   }
   return list;
 }
 export function getAvgTime(data) {
-  let list = [0,0];
-  if(data != null && data !='') {
+  let list = [0, 0];
+  if (data != null && data != '') {
     list[0] = Math.floor(data / 60);
     list[1] = data % 60;
   }
@@ -584,16 +602,16 @@ export function getAvgTime(data) {
 }
 export function getComponent(data) {
   let list = [];
-  for(let i=0;i<data.length;i++) {
+  for (let i = 0; i < data.length; i++) {
     list.push(data[i].value);
   }
   return list;
 }
 export function getSimpleCheckedNodes(store) {
   const checkedNodes = [];
-  const traverse = function(node) {
+  const traverse = function (node) {
     const childNodes = node.root ? node.root.childNodes : node.childNodes;
-  
+
     childNodes.forEach(child => {
       if (child.checked) {
         checkedNodes.push(child.data);
@@ -606,16 +624,16 @@ export function getSimpleCheckedNodes(store) {
   traverse(store)
   return checkedNodes;
 }
-export function setSelectedKeys(checkedKeys,halfCheckedKeys) {
+export function setSelectedKeys(checkedKeys, halfCheckedKeys) {
   let selected = [];
-  for(let i=0;i<checkedKeys.length;i++) {
+  for (let i = 0; i < checkedKeys.length; i++) {
     let obj = {
       key: checkedKeys[i].id,
       type: 1,
     };
     selected.push(obj);
   }
-  for(let j=0;j<halfCheckedKeys.length;j++) {
+  for (let j = 0; j < halfCheckedKeys.length; j++) {
     let obj = {
       key: halfCheckedKeys[j],
       type: 2,

src/views/education/add-manager.vue

@@ -281,6 +281,9 @@
                   </el-tree>
                 </el-col>
                 <el-col :span="11">
+                  <p class="area-p">
+                    项目范围包含下列区域所有机构和人员({{ tagsRegion.length }})
+                  </p>
                   <el-tag
                     v-for="tag in tagsRegion"
                     :key="tag.name"
@@ -3570,6 +3573,10 @@ export default {
   }
   .second-step {
     margin: 10px 0 0 20px;
+    .area-p {
+      margin-bottom: 15px;
+      font-size: 14px;
+    }
     .span_ecology {
       line-height: 45px;
       margin-left: 8px;

src/views/education/item-manager.vue

@@ -92,7 +92,7 @@
             <span>{{ [scope.row.projectStatus , idType] | statusProject }}</span>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" min-width="200" align="center">
+        <el-table-column fixed="right" label="操作" min-width="300" align="center">
           <template slot-scope="scope">
             <el-button
               @click="changeStatus(scope.row,0)"
@@ -155,6 +155,12 @@
               type="primary"
               size="small"
             >删除</el-button>
+            <el-button
+              @click="toShield(scope.row)"
+              v-show="scope.row.blackModifiable == true"
+              type="primary"
+              size="small"
+            >屏蔽</el-button>
           </template>
         </el-table-column>
         <div slot="empty">
@@ -286,7 +292,10 @@ export default {
   },
   methods: {
     toPage() {
-      this.$router.push("add-manager");
+      this.$router.push("edit-manager");
+    },
+    toShield(row) {
+      this.$router.push("item-shield?projectId="+row.id);
     },
     searchList() {
       this.formInline.pageNo = 1;
@@ -344,7 +353,7 @@ export default {
       let level = row.level;
       if (type === 0) {
         //编辑
-        this.$router.push("add-manager?projectId=" + projectId +"&level="+level);
+        this.$router.push("edit-manager?projectId=" + projectId +"&level="+level);
       } else if (type === 7) {
         //提醒审核
         let req = {

src/views/education/item-shield.vue

@@ -3,25 +3,40 @@
     <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
     <div class="component-content screenSet" id="screenSet">
       <el-radio-group v-model="shieldType" @change="changeType">
-        <el-radio-button label="1">屏蔽机构</el-radio-button>
-        <el-radio-button label="2">屏蔽人员</el-radio-button>
+        <el-radio-button label="0">屏蔽机构</el-radio-button>
+        <el-radio-button label="1">屏蔽人员</el-radio-button>
       </el-radio-group>
-      <el-button class="complete" type="primary" size="small" @click="complete">完成</el-button>
+      <!-- <el-button class="complete" type="primary" size="small" @click="complete">完成</el-button> -->
       <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px;">
         <el-form :model="formInline" ref="formInline" label-width="75px" class="form-inline">
-          <el-col :span="6">
-            <el-form-item label="所属机构：">
-              <el-input size="small" v-model="formInline.organizationName" placeholder="请输入机构名称"></el-input>
+          <el-col :span="6" v-if=" shieldType == 0">
+            <el-form-item label="地区：">
+              <el-cascader
+                size="small"
+                ref="cascaderRegion"
+                :options="optionsRegion"
+                :props="props"
+                v-model="formInline.region"
+                @change="handleChange"
+                filterable
+                change-on-select
+                placeholder="请选择地区"
+              ></el-cascader>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="姓名：">
-              <el-input size="small" v-model="formInline.userName" placeholder="请输入人员名称"></el-input>
+            <el-form-item label="机构：">
+              <el-input size="small" v-model="formInline.hospitalName" placeholder="请输入机构名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" v-if="shieldType == 1">
+            <el-form-item label="名称：">
+              <el-input size="small" v-model="formInline.doctorName" placeholder="请输入人员名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="状态：">
-              <el-select size="small" v-model="formInline.status" placeholder="请选择状态">
+            <el-form-item label="状态类型：">
+              <el-select size="small" v-model="formInline.blackStatus" placeholder="请选择状态">
                 <el-option
                   v-for="(item, index) in statusList"
                   :key="index"
@@ -37,22 +52,30 @@
         </el-form>
       </el-row>
       <el-table :data="tableData" style="width: 100%">
-        <el-table-column prop="userName" label="人员名称" min-width="100" align="center"></el-table-column>
-        <el-table-column prop="hospitalName" label="所属医院" align="center"></el-table-column>
-        <el-table-column prop="departmentName" label="所属科室" align="center" min-width="100"></el-table-column>
-        <el-table-column prop="province" label="所属省份" align="center"></el-table-column>
-        <el-table-column prop="city" label="所属城市" align="center"></el-table-column>
-        <el-table-column prop="county" label="所属区县" align="center"></el-table-column>
-        <el-table-column fixed="right" label="状态" width="200" align="center">
-          <template slot-scope="scope">{{ scope.row.status | shieldStatus }}</template>
+        <el-table-column v-if="shieldType == 0" prop="hospitalName" label="医院名称" align="center"></el-table-column>
+        <el-table-column
+          v-if="shieldType == 0"
+          prop="hospitalLevelGradeName"
+          label="医院级别"
+          align="center"
+        ></el-table-column>
+        <el-table-column v-if="shieldType == 1" prop="doctorName" label="人员名称" align="center"></el-table-column>
+        <el-table-column v-if="shieldType == 1" prop="hospitalName" label="所属医院" align="center"></el-table-column>
+        <el-table-column v-if="shieldType == 1" prop="departmentName" label="所属科室" align="center"></el-table-column>
+        <el-table-column prop="provinceName" label="所属省份" align="center"></el-table-column>
+        <el-table-column prop="cityName" label="所属城市" align="center"></el-table-column>
+        <el-table-column prop="countyName" label="所属区县" align="center"></el-table-column>
+        <el-table-column prop="townName" label="所属街道" align="center"></el-table-column>
+        <el-table-column fixed="right" label="状态" align="center">
+          <template slot-scope="scope"><p v-bind:class="{ 'text-black': scope.row.blackStatus === 2 }">{{ scope.row.blackStatus | shieldStatus }}</p></template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" width="200" align="center">
+        <el-table-column fixed="right" label="操作" width="150" align="center">
           <template slot-scope="scope">
             <el-button
               type="text"
               size="small"
-              @click="changeStatus(scope.row)"
-            >{{ scope.row.status | shieldButton }}</el-button>
+              @click="openDialog(scope.row)"
+            >{{ scope.row.blackStatus | shieldButton }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -68,6 +91,16 @@
           :total="totalRows"
         ></el-pagination>
       </div>
+      <el-dialog title="提醒" :visible.sync="dialogShow" width="30%" center>
+        <p v-if="shieldType == 0 && shieldBlock == 1">屏蔽后该机构将从圈选机构范围内去除，确定继续屏蔽吗？</p>
+        <p v-if="shieldType == 0 && shieldBlock == 2">取消屏蔽后该机构将恢复到圈选范围，确定要取消屏蔽吗？</p>
+        <p v-if="shieldType == 1 && shieldBlock == 1">屏蔽后该人员将从圈选人员范围内去除，确定要继续屏蔽吗？</p>
+        <p v-if="shieldType == 1 && shieldBlock == 2">取消屏蔽后该人员将恢复到圈选范围，确定要取消屏蔽吗？</p>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogShow = false">取 消</el-button>
+          <el-button type="primary" @click="changeStatus()">确 定</el-button>
+        </span>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -76,6 +109,7 @@ import BreadCrumb from "../../components/breadcrumb.vue";
 import { mapGetters } from "vuex";
 import { openLoading, closeLoading } from "../../utils/utils";
 import * as commonUtil from "../../utils/utils";
+import * as operationData from "../../utils/operation";
 let vm = null;
 export default {
   components: {
@@ -85,26 +119,79 @@ export default {
     return {
       curmbFirst: "教培项目",
       curmbSecond: "屏蔽",
-      shieldType: 1,
+      projectId: "",
+      shieldType: 0,
       formInline: {
-        organizationName: "",
-        userName: "",
-        status: "",
+        region: ["0"],
+        administrativeId: "",
+        hospitalName: "",
+        doctorName: "",
+        blackStatus: 0,
         pageNo: 1,
         pageSize: 10
       },
       statusList: [
         {
-          label: "屏蔽",
+          label: "全部",
           value: 0
         },
         {
-          label: "取消屏蔽",
+          label: "未屏蔽",
           value: 1
+        },
+        {
+          label: "已屏蔽",
+          value: 2
+        }
+      ],
+      optionsRegion: [],
+      areaList: [
+        {
+          label: "全部地区",
+          value: 0
         }
       ],
       tableData: [],
-      totalRows: 0
+      totalRows: 0,
+      dialogShow: false,
+      shieldBlock: "",
+      scopeRow: {},
+      administrativeValue: "",
+      props: {
+        lazy: true,
+        lazyLoad(node, resolve) {
+          const { level } = node;
+          console.log("node", node);
+          if (node.level == 1) {
+            let req = {
+              provinceId: node.data.value
+            };
+            vm.GET("basic-data/position/cities", req).then(res => {
+              let newData = vm.setMoreOption(res.data.cityList, "cities");
+              console.log("newData", newData);
+              resolve(newData);
+            });
+          } else if (node.level == 2) {
+            let req = {
+              cityId: node.data.value
+            };
+            vm.GET("basic-data/position/counties", req).then(res => {
+              let newData = vm.setMoreOption(res.data.countyList, "counties");
+              console.log("newData", newData);
+              resolve(newData);
+            });
+          } else if (node.level == 3) {
+            let req = {
+              countyId: node.data.value
+            };
+            vm.GET("basic-data/position/towns", req).then(res => {
+              let newData = vm.setMoreOption(res.data.townList, "towns");
+              console.log("newData", newData);
+              resolve(newData);
+            });
+          }
+        }
+      }
     };
   },
   computed: {
@@ -112,80 +199,204 @@ export default {
   },
   created() {
     vm = this;
-    this.search();
+    vm.projectId = vm.getUrlSearch(window.location.href, "projectId");
+    vm.getRegionOption();
+    vm.search();
+  },
+  // 挂载到Dom完成时
+  mounted: function() {
     // window.onbeforeunload = function(e) {
     //   let pathname = location.href.split("/");
     //   pathname = pathname[pathname.length - 1];
-    //   // console.log(pathname);
+    //   console.log(pathname);
     //   if (pathname == "item-shield") {
     //     e = e || window.event;
     //     if (e) {
-    //       e.returnValue = "关闭提示";
+    //       e.returnValue = "数据不会保存";
     //     }
-    //     return "关闭提示";
+    //     return "数据不会保存";
     //   }
     // };
-  },
-  // 挂载到Dom完成时
-  mounted: function() {
-    window.onbeforeunload = function(e) {
-      let pathname = location.href.split("/");
-      pathname = pathname[pathname.length - 1];
-      console.log(pathname);
-      if (pathname == "item-shield") {
-        e = e || window.event;
-        if (e) {
-          e.returnValue = "数据不会保存";
-        }
-        return "数据不会保存";
-      }
-    };
+
     commonUtil.resizeHeight();
   },
-  beforeRouteLeave(to, from, next) {
-    const answer = window.confirm(
-      "Do you really want to leave? you have unsaved changes!"
-    );
-    if (answer) {
-      next();
-    } else {
-      next(false);
-    }
-  },
-  destroyed() {},
+  // beforeRouteLeave(to, from, next) {
+  //   const answer = window.confirm(
+  //     "Do you really want to leave? you have unsaved changes!"
+  //   );
+  //   if (answer) {
+  //     next();
+  //   } else {
+  //     next(false);
+  //   }
+  // },
   methods: {
+    handleChange(value) {
+      let areaId = "000";
+      for (let i = 0; i < value.length; i++) {
+        areaId += "_" + value[i];
+      }
+      vm.administrativeValue = areaId;
+      if (areaId == "000_0") {
+        vm.administrativeValue = "";
+      }
+      console.log(value, vm.administrativeValue);
+    },
+    //获取地区
+    getRegionOption() {
+      let req = {};
+      openLoading(vm);
+      vm.GET("basic-data/position/provinces", req).then(res => {
+        closeLoading(vm);
+        if (res.code == "000000") {
+          vm.optionsRegion = operationData.setRegionOption2(
+            res.data.provinceList
+          );
+        }
+      });
+    },
+    setMoreOption(data, type) {
+      let option = [];
+      for (let i = 0; i < data.length; i++) {
+        let obj = data[i];
+        if (type == "cities") {
+          obj.label = data[i].cityName;
+          obj.value = data[i].cityId;
+        } else if (type == "counties") {
+          obj.label = data[i].countyName;
+          obj.value = data[i].countyId;
+          // obj.leaf = true;
+        } else if (type == "towns") {
+          obj.label = data[i].townName;
+          obj.value = data[i].townId;
+          obj.leaf = true;
+        }
+        option.push(obj);
+      }
+      return option;
+    },
     searchList() {
       this.formInline.pageNo = 1;
       this.search();
     },
     search() {
-      vm.tableData = [
-        {
-          userName: "云小鹊",
-          hospitalName: "测试医院",
-          departmentName: "呼吸科",
-          province: "上海市",
-          city: "上海市",
-          county: "浦东新区",
-          status: 0
-        }
-      ];
+      if (vm.shieldType == 0) {
+        let req = {
+          administrativeId: vm.administrativeValue,
+          blackStatus: vm.formInline.blackStatus,
+          hospitalName: vm.formInline.hospitalName,
+          pageNo: vm.formInline.pageNo,
+          pageSize: vm.formInline.pageSize,
+          projectId: vm.projectId
+        };
+        openLoading(vm);
+        vm.GET("portal/black/getScopeHospitalWithBlack", req).then(res => {
+          closeLoading(vm);
+          vm.setTable(res);
+          // vm.tableData = res.data.list;
+          // vm.totalRows = res.data.count;
+        });
+      } else if (vm.shieldType == 1) {
+        let req = {
+          blackStatus: vm.formInline.blackStatus,
+          hospitalName: vm.formInline.hospitalName,
+          doctorName: vm.formInline.doctorName,
+          pageNo: vm.formInline.pageNo,
+          pageSize: vm.formInline.pageSize,
+          projectId: vm.projectId
+        };
+        openLoading(vm);
+        vm.GET("portal/black/getScopePeopleWithBlack", req).then(res => {
+          closeLoading(vm);
+          vm.setTable(res);
+          // vm.tableData = res.data.list;
+          // vm.totalRows = res.data.count;
+        });
+      }
+    },
+    setTable(res) {
+      vm.tableData = [];
+      vm.totalRows = 0;
+      if (res.code == "000000") {
+        vm.tableData = res.data.list;
+        vm.totalRows = res.data.count;
+      } else {
+        vm.$message(res.message);
+      }
+    },
+    openDialog(row) {
+      vm.scopeRow = row;
+      vm.shieldBlock = row.blackStatus;
+      vm.dialogShow = true;
     },
     // 屏蔽/取消屏蔽
     changeStatus() {
-      vm.tableData[0].status = 1;
+      let row = vm.scopeRow;
+      let option = "";
+      if (row.blackStatus == 2) {
+        option = 1;
+      } else if (row.blackStatus == 1) {
+        option = 2;
+      }
+      if (vm.shieldType == 0) {
+        //屏蔽机构
+        let req = {
+          blackStatus: option,
+          hospitalId: row.hospitalId,
+          projectId: vm.projectId
+        };
+        openLoading(vm);
+        vm.POST("portal/black/setHospitalBlackStatus", req).then(res => {
+          closeLoading(vm);
+          vm.dialogShow = false;
+          vm.$message(res.message);
+          vm.search();
+        });
+      } else if (vm.shieldType == 1) {
+        //屏蔽人员
+        let req = {
+          blackStatus: option,
+          doctorId: row.doctorId,
+          projectId: vm.projectId
+        };
+        openLoading(vm);
+        vm.POST("portal/black/setPeopleBlackStatus", req).then(res => {
+          closeLoading(vm);
+          vm.dialogShow = false;
+          vm.$message(res.message);
+          vm.search();
+        });
+      }
     },
     //改变
     changeType(value) {
       console.log(value);
-      vm.searchList();
+      vm.resetForm();
+      // vm.searchList();
     },
     complete() {
       console.log("完成");
     },
+    //重置表单
+    resetForm() {
+      vm.formInline = Object.assign(
+        {},
+        {
+          region: ["0"],
+          administrativeId: "",
+          hospitalName: "",
+          doctorName: "",
+          blackStatus: 0,
+          pageNo: 1,
+          pageSize: 10
+        }
+      );
+      vm.searchList();
+    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.formInline.pageSize = val;
+      vm.searchList();
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
@@ -203,6 +414,9 @@ export default {
     .complete {
       float: right;
     }
+    .text-black {
+      color: #D51F35;
+    }
   }
 }
 </style>
\ No newline at end of file

src/views/system/item-role.vue

@@ -213,7 +213,7 @@
       </el-dialog>
       <el-dialog title="导入失败" :visible.sync="dialogFail" width="30%" class="dialog-fail" center>
         <div class="fail-type" v-if="failType == 1">
-          <p>表格不符合格式要求，请修正后再次导入</p>
+          <p>导入数据量已超限额，请修正后再次导入</p>
           <p class="fail-notice">仅支持一次导入5000条数据</p>
         </div>
         <div class="fail-type" v-if="failType == 2">
@@ -384,7 +384,7 @@ export default {
       attachRegionId: "",
 
       creator: false,
-      hospitalMasterAdmin: false,
+      hospitalMasterAdmin: false
     };
   },
   created() {
@@ -493,7 +493,7 @@ export default {
       let req = {};
       req = this.formInline;
       openLoading(vm);
-      vm.GET("portal/portalProjectOrRole/queryRoleList", req).then(res => {
+      vm.GET("portal/v2/role/queryRoleList", req).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
           vm.tableData = res.data.projectRoleInfoModels;
@@ -518,7 +518,8 @@ export default {
         numL2: this.numL2,
         nowL: this.scopeRow.projeceRole
       };
-      vm.GET("portal/portalProjectOrRole/roleLevelUpdate", req).then(res => {
+      // vm.GET("portal/portalProjectOrRole/roleLevelUpdate", req).then(res => {
+      vm.GET("portal/v2/role/roleLevelUpdate", req).then(res => {
         vm.dialog.show = false;
         if (res.code == "000000") {
           console.log(res);
@@ -528,7 +529,7 @@ export default {
             type: "success"
           });
         } else {
-          this.$message.error(res.message);
+          this.$message.error(res.code);
         }
       });
     },
@@ -687,7 +688,8 @@ export default {
         doctorId: row.userId
       };
       openLoading(vm);
-      vm.GET("portal/portalProjectOrRole/getAttachRegion", req).then(res => {
+      // vm.GET("portal/portalProjectOrRole/getAttachRegion", req).then(res => {
+      vm.GET("portal/v2/role/getAttachRegion", req).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
           let administrativeAll = res.data.administrativeAll;
@@ -926,10 +928,7 @@ export default {
         scopeOfAdministrative: vm.getScope()
       };
       console.log("req", req);
-      vm.POST(
-        "portal/portalProjectOrRole/insertOrUpdateAttachRegion",
-        req
-      ).then(res => {
+      vm.POST("portal/v2/role/insertOrUpdateAttachRegion", req).then(res => {
         if (res.code == "000000") {
           vm.$message({
             message: "设置成功",