2.2.0二期逻辑update

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;
@@ -296,6 +296,7 @@ export function setRegionOption(data) {
 }
 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;
@@ -304,6 +305,13 @@ export function setRegionOption2(data) {
   }
   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,
@@ -323,7 +331,7 @@ export function getRegionOption() {
   return option;
 }
 export function getLearnOrganization(data) {
-  if(data.length == 0) {
+  if (data.length == 0) {
     let arr = [];
     return arr;
   }
@@ -490,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) {
@@ -503,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 {
@@ -570,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;
   }
@@ -594,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);
@@ -616,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/item-shield.vue

@@ -296,7 +296,7 @@ export default {
       } else if (vm.shieldType == 1) {
         let req = {
           blackStatus: vm.formInline.blackStatus,
-          hospitalName: vm.formInline.organizationName,
+          hospitalName: vm.formInline.hospitalName,
           doctorName: vm.formInline.doctorName,
           pageNo: vm.formInline.pageNo,
           pageSize: vm.formInline.pageSize,
@@ -332,9 +332,10 @@ export default {
           projectId: vm.projectId
         };
         openLoading(vm);
-        vm.GET("portal/black/setHospitalBlackStatus", req).then(res => {
+        vm.POST("portal/black/setHospitalBlackStatus", req).then(res => {
           closeLoading(vm);
           vm.dialogShow = false;
+          vm.$message(res.message);
           vm.search();
         });
       } else if (vm.shieldType == 1) {
@@ -345,9 +346,10 @@ export default {
           projectId: vm.projectId
         };
         openLoading(vm);
-        vm.GET("portal/black/setPeopleBlackStatus", req).then(res => {
+        vm.POST("portal/black/setPeopleBlackStatus", req).then(res => {
           closeLoading(vm);
           vm.dialogShow = false;
+          vm.$message(res.message);
           vm.search();
         });
       }