机构树调整

src/api/system/org.js

@@ -6,4 +6,14 @@ export function listByTypes (args){
       method: 'post',
       data: args
     })
+  }
+
+  export function wholeTreeByType (orgType){  
+    return request({
+      url: '/system/dept/deptTree/wholetree/bytype',
+      method: 'get',
+      params: {
+        orgType
+      }
+    })
   }

src/components/Pagination/index.vue

@@ -7,7 +7,7 @@
       :layout="layout"
       :page-sizes="pageSizes"
       :pager-count="pagerCount"
-      :total="total"
+      :total="parseInt(total) "
       v-bind="$attrs"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
@@ -23,7 +23,7 @@ export default {
   props: {
     total: {
       required: true,
-      type: Number
+      type: [Number , String]
     },
     page: {
       type: Number,

src/views/check/task/index.vue

@@ -8,6 +8,7 @@
           @defaultKey="getDefaultKey"
           @checkChange="checkChange"
           @click="clickTreeNode"
+          :businessTree="true"
         ></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">

src/views/question/list/index.vue

@@ -7,6 +7,7 @@
           @defaultKey="getDefaultKey"
           @checkChange="checkChange"
           @click="clickTreeNode"
+          :businessTree="true"
         ></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">

src/views/resumption/rule/index.vue

@@ -8,7 +8,7 @@
           @defaultKey="getDefaultKey"
           @checkChange="checkChange"
           @click="clickTreeNode"
-          hangsheTree
+          :customRequest="orgTree"
         ></org-tree>
       </el-col>
 
@@ -194,6 +194,7 @@ import { mapState, mapMutations } from "vuex";
 import DialogEdit from "./dialog.edit";
 import * as api from "@/api/resumption/rule";
 import { getLabel } from "./../../commonOption";
+import {wholeTreeByType} from "@/api/system/org.js"
 
 export default {
   name: "ruletype",
@@ -246,6 +247,9 @@ export default {
   methods: {
     ...mapMutations([]),
     getLabel,
+    orgTree(){
+      return wholeTreeByType(3);
+    },
     refresh() {
       this.queryParams.pageNum = 1;
       this.getList();

src/views/resumption/taskManager/index.vue

@@ -8,6 +8,7 @@
           @defaultKey="getDefaultKey"
           @checkChange="checkChange"
           @click="clickTreeNode"
+          :businessTree="true"
         ></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">

src/views/safetycheck/rule/index.vue

@@ -8,7 +8,7 @@
           @defaultKey="getDefaultKey"
           @checkChange="checkChange"
           @click="clickTreeNode"
-          hangsheTree
+          :customRequest="orgTree"
         ></org-tree>
       </el-col>
 
@@ -217,7 +217,7 @@ import { mapState, mapMutations } from "vuex";
 import DialogEdit from "./dialog.edit";
 import * as api from "@/api/safetycheck/rule";
 import { getLabel } from "./../../commonOption";
-
+import {wholeTreeByType} from "@/api/system/org.js"
 export default {
   name: "safetycheckruletype",
   dicts: ["sys_org_type", "rule_type", "plan_status"],
@@ -270,6 +270,9 @@ export default {
   methods: {
     ...mapMutations([]),
     getLabel,
+    orgTree(){
+      return wholeTreeByType(3);
+    },
     refresh() {
       this.queryParams.pageNum = 1;
       this.getList();