学情报告 type 6

src/utils/operation.js

@@ -484,11 +484,20 @@ 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) {
+      type = 6;
+    }
   } else if (formData.region.length == 3) {
     if (formData.organization.length == 0 || checkAll === true) {
       type = 3;
     } else {
-      type = 4
+      type = 4;
+    }
+  }  else if (formData.region.length == 4) {
+    if (formData.organization.length == 0 || checkAll === true) {
+      type = 5;
+    } else {
+      type = 4;
     }
   }
   return type;

src/views/system/item-role.vue

@@ -419,7 +419,7 @@ export default {
         };
         let fileArray = [
           {
-            type: 6,
+            type: '',
             base64: fileJson
           }
         ];
@@ -716,8 +716,9 @@ export default {
         }),
         allSelectedKeys = savedCheckedKeys.concat(savedHalfCheckedKeys);
 
-      this.allSelectedKeys = allSelectedKeys;
-      this.initCheckList(allSelectedKeys);
+      vm.allSelectedKeys = allSelectedKeys;
+      console.log('vm.allSelectedKeys',vm.allSelectedKeys);
+      vm.initCheckList(allSelectedKeys);
     },
     getTreeCheck() {
       let cData = [],
@@ -967,6 +968,9 @@ export default {
       }
     }
     .dialog-area {
+      .el-tree-node__expand-icon {
+        display: none;
+      }
       .el-dialog {
         height: 700px;
         .el-dialog__body {