提交修改报表

src/views/core/reportForms/intrusionTestReport.vue

@@ -5,7 +5,7 @@
           v-show="showSearch"
           >
 
-            <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
+            <!-- <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
             <tree-select
               v-model="queryParams.orgId"
               :options="deptOptions"
@@ -18,7 +18,18 @@
               noOptionsText="没有数据"
               noResultsText="没有搜索结果"
             />
-          </el-form-item>
+          </el-form-item> -->
+          <el-form-item label="组织机构">
+                  <org-tree
+                    v-model="queryParams.orgId"
+                    @defaultOrg="getDefaultOrg"
+                    @checkChange="checkChange"
+                    @click="clickTreeNode"
+                  ref="orgTree"
+                  :showCheckSub="false"
+                  ></org-tree>
+              </el-form-item>
+
               <el-form-item label="时间" prop="searchTime">
               <el-date-picker   value-format='yyyy-MM' v-model="queryParams.searchTime"
                                 align="right" type="month" placeholder="请选择查询时间">
@@ -26,7 +37,7 @@
               </el-form-item>
           </el-form>
           <el-row :gutter="10" >
-            <el-col span="1.5">
+            <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
               <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
@@ -73,198 +84,217 @@
     import treeselect from '@riophae/vue-treeselect'
     import "@riophae/vue-treeselect/dist/vue-treeselect.css";
     import {deptTreeSelect,businessTreeSelect} from "@/api/system/public";
-    import orgTree from "@/components/orgTree";
+          //import orgTree from "@/components/orgTree";
+import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
     import { defineComponent } from 'vue';
+export default {
+  dicts: ['sys_normal_disable','sys_org_type','repot_cycle'],
+  name: "Check",
 
-    export default {
-      name: "Check",
-      /** 引入基础minxins*/
-      mixins: [tableList],
-      components: {treeselect,orgTree},
-      dicts: ['sys_normal_disable','sys_org_type','repot_cycle'],
-      data() {
-        return {
-            startDatepickerOptions: {
-        disabledDate(time) {
-          const date = new Date();
-          date.setTime(date.getTime());
-          return time.getTime() < date;
-        },
-      },
-          // 遮罩层
-          loading: true,
-          // 选中数组
-          ids: [],
-          names: [],
-          // 非单个停用
-          single: true,
-          //搜索tree
-          deptName: null,
-          // 非多个停用
-          multiple: true,
-          // 显示搜索条件
-          showSearch: true,
-          //区域
-          roleOptions: [],
-           //全部检查机构
-      orgOptions: [],
-          //搜索tree
-          deptName: null,
-          // 部门树选项
-          deptOptions: [],
-          // 总条数
-          total: 0,
-          //区域集合
-          areaList: [],
-          // 区域采集点表格数据
-          checkList: [],
-          // 弹出层标题
-          title: "",
-          // 是否显示弹出层
-          open: false,
-          orgName:null,
-          // 查询参数
-          queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-            checkName: null,
-            areaId: null,
-            orgId: null,
-            searchTime:new Date(),
-          },
-          // 表单参数
-          form: {},
-          // 表单校验
-          checkList: [],
-          roleOptions: [],
-          defaultKeys: [],
-          //是否关联下级
-          checked: false,
-          defaultProps: {
-            children: "children",
-            label: "name"
-          },
+  /** 引入基础minxins*/
+  mixins: [tableList],
 
-          rules: {
-            areaId: [
-              {required: true, message: '请选择区域', trigger: 'blur'},
-            ],
-            orgType: [
-              {required: true, message: '请选择机构类型', trigger: 'blur'},
-            ],
-            checkName: [
-              {required: true, message: '请输入NFC点位名称', trigger: 'change'}
-            ],
-          },
-          defaultKeys: []
+  components: {treeselect,OrgTree},
 
-        };
+  data() {
+    return {
+        startDatepickerOptions: {
+    disabledDate(time) {
+      const date = new Date();
+      date.setTime(date.getTime());
+      return time.getTime() < date;
+    },
+  },
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      names: [],
+      // 非单个停用
+      single: true,
+      //搜索tree
+      deptName: null,
+      // 非多个停用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      //区域
+      roleOptions: [],
+       //全部检查机构
+  orgOptions: [],
+      //搜索tree
+      deptName: null,
+      // 部门树选项
+      deptOptions: [],
+      // 总条数
+      total: 0,
+      //区域集合
+      areaList: [],
+      // 区域采集点表格数据
+      checkList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      orgName:null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        checkName: null,
+        areaId: null,
+        orgId: null,
+        searchTime:new Date(),
       },
-      created() {
-        this.getDeptTree();
-      this. getList();
+      // 表单参数
+      form: {},
+      // 表单校验
+      checkList: [],
+      roleOptions: [],
+      defaultKeys: [],
+      //是否关联下级
+      checked: false,
+      defaultProps: {
+        children: "children",
+        label: "name"
       },
-      watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-          this.$refs.tree.filter(val);
-        }
+
+      rules: {
+        areaId: [
+          {required: true, message: '请选择区域', trigger: 'blur'},
+        ],
+        orgType: [
+          {required: true, message: '请选择机构类型', trigger: 'blur'},
+        ],
+        checkName: [
+          {required: true, message: '请输入NFC点位名称', trigger: 'change'}
+        ],
       },
-      methods: {
-  /** 查询机构树数据 */
-  getDeptTree() {
-      deptTreeSelect().then((response) => {
-        this.deptOptions = response.data;
-        this.queryParams.orgId=response.data[0].id;
-      });
+      defaultKeys: []
+
+    };
+  },
+
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+
+  created() {
+   // this.getDeptTree();
+  this. getList();
+  },
+
+  methods: {
+    getDefaultOrg(node) {
+      this.queryParams.orgId = node.id;
+      this.selectedOrgName = node.shortName;
+      this.getList();
+    },
+        //单选框状态改变
+        checkChange(state) {
+      this.queryParams.checkSub = state;
+      this.getList();
     },
-        /** treeSelect组件自定义数据*/
-        tenantIdnormalizer(node, instanceId) {
-      if (node.children && !node.children.length) {
-        delete node.children;
+            // 节点单击事件
+            clickTreeNode(data) {
+      if(data==null){
+        return;
       }
-      return {
-        id: node.id,
-        label: node.shortName,
-        children: node.children,
-      };
+      this.queryParams.orgId = data.id;
+      this.selectedOrgName = data.shortName;
+      this.getList();
     },
-        getPageIndex($index) {
-          //表格序号
-          return (
-            (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
-          );
-        },
-        handleExport() {
-      this.download('core/resumptionReport/intrusionTestExport', {
-        ...this.queryParams
-      }, `${'【'+this.orgName+'】'+'-报警测试报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+    /** treeSelect组件自定义数据*/
+    tenantIdnormalizer(node, instanceId) {
+  if (node.children && !node.children.length) {
+    delete node.children;
+  }
+  return {
+    id: node.id,
+    label: node.shortName,
+    children: node.children,
+  };
+},
+    getPageIndex($index) {
+      //表格序号
+      return (
+        (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+      );
     },
+    handleExport() {
+  this.download('core/resumptionReport/intrusionTestExport', {
+    ...this.queryParams
+  }, `${'【'+this.orgName+'】'+'-报警测试报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+},
 
 
-        getList() {
-          this.loading = true;
-          listIntrusionTestReport(this.queryParams).then(response => {
-            this.checkList = response.data;
-            this.title=response.title;
-        this.orgName=response.orgName;
-            this.loading = false;
-          });
-        },
-        getAllOrg() {
-          selectAllOrg().then(response => {
-        this.orgOptions = response.data;
-      })
+    getList() {
+      this.loading = true;
+      listIntrusionTestReport(this.queryParams).then(response => {
+        this.checkList = response.data;
+        this.title=response.title;
+    this.orgName=response.orgName;
+        this.loading = false;
+      });
     },
+    getAllOrg() {
+      selectAllOrg().then(response => {
+    this.orgOptions = response.data;
+  })
+},
 
 
-        // 取消按钮
-        cancel() {
-          this.open = false;
-          this.reset();
-        },
-        // 表单重置
-        reset() {
-          this.form = {
-            id: null,
-            checkName: null,
-            areaId: null,
-            orgId: null,
-            createTime: null,
-            updateTime: null,
-            updateId: null,
-            createBy: null,
-            delFlag: null,
-            updateBy: null
-          };
-          this.resetForm("form");
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-          this.queryParams.pageNum = 1;
-          this.getList();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-          this.resetForm("queryForm");
-          this.handleQuery();
-          this.getDeptTree();
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-          this.ids = selection.map(item => item.id)
-          this.names = selection.map(item => item.checkName)
-          this.single = selection.length !== 1
-          this.multiple = !selection.length
-        },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        checkName: null,
+        areaId: null,
+        orgId: null,
+        createTime: null,
+        updateTime: null,
+        updateId: null,
+        createBy: null,
+        delFlag: null,
+        updateBy: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+     // this.getDeptTree();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.names = selection.map(item => item.checkName)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
 
-      }
-    };
-  </script>
-  <style lang="scss" scoped>
+  }
+};
+</script>
+
+<style lang="scss" scoped>
   ::v-deep.formTreeItem {
     .el-form-item__content {
       width: 264px;
     }
   }
-  </style>
+  </style>

src/views/core/reportForms/monitorAccessReport.vue

@@ -4,7 +4,7 @@
           <el-form :model="queryParams" ref="queryForm" size="small"  :inline="true"
           v-show="showSearch">
 
-            <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
+            <!-- <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
             <tree-select
               v-model="queryParams.orgId"
               :options="deptOptions"
@@ -17,8 +17,17 @@
               noOptionsText="没有数据"
               noResultsText="没有搜索结果"
             />
-          </el-form-item>
-
+          </el-form-item> -->
+          <el-form-item label="组织机构">
+                  <org-tree
+                    v-model="queryParams.orgId"
+                    @defaultOrg="getDefaultOrg"
+                    @checkChange="checkChange"
+                    @click="clickTreeNode"
+                  ref="orgTree"
+                  :showCheckSub="false"
+                  ></org-tree>
+              </el-form-item>
 
         <el-form-item label="周期" prop="startTime">
 
@@ -75,218 +84,249 @@
     import treeselect from '@riophae/vue-treeselect'
     import "@riophae/vue-treeselect/dist/vue-treeselect.css";
     import {deptTreeSelect,businessTreeSelect} from "@/api/system/public";
-    import orgTree from "@/components/orgTree";
-    export default {
-      name: "Check",
-      /** 引入基础minxins*/
-      mixins: [tableList],
-      components: {treeselect,orgTree},
-      dicts: ['sys_normal_disable','sys_org_type','repot_cycle'],
-      data() {
-        return {
-          // 遮罩层
-          loading: true,
-          // 选中数组
-          ids: [],
-          names: [],
-          // 非单个停用
-          single: true,
-          //搜索tree
-          deptName: null,
-          // 非多个停用
-          multiple: true,
-          // 显示搜索条件
-          showSearch: true,
-          //区域
-          roleOptions: [],
-           //全部检查机构
-          orgOptions: [],
-          //搜索tree
-          deptName: null,
-          // 部门树选项
-          deptOptions: [],
-          // 总条数
-          total: 0,
-          //区域集合
-          areaList: [],
-          // 区域采集点表格数据
-          checkList: [],
-          // 弹出层标题
-          title: "",
-          // 是否显示弹出层
-          open: false,
-          orgName:null,
-          // 查询参数
-          queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-            checkName: null,
-            areaId: null,
-            orgId: null,
-            year:null,
-            cycle:null,
-            startTime:new Date(),
-            endTime:null,
-          },
-          weeks:new Date(),
+   // import orgTree from "@/components/orgTree";
+    import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
+export default {
+  dicts: ['sys_normal_disable','sys_org_type','repot_cycle'],
+  name: "Check",
 
-          // 周期开始时间
-          startDate: '',
-          // 周期结束时间
-          endDate: '',
-          // 周期时间
-          finalDate: '',
-          // 表单参数
-          form: {},
-          // 表单校验
-          checkList: [],
-          roleOptions: [],
-          defaultKeys: [],
-          //是否关联下级
-          checked: false,
-          defaultProps: {
-            children: "children",
-            label: "name"
-          },
+  /** 引入基础minxins*/
+  mixins: [tableList],
 
-          rules: {
-            areaId: [
-              {required: true, message: '请选择区域', trigger: 'blur'},
-            ],
-            orgType: [
-              {required: true, message: '请选择机构类型', trigger: 'blur'},
-            ],
-            checkName: [
-              {required: true, message: '请输入NFC点位名称', trigger: 'change'}
-            ],
-          },
-          defaultKeys: []
+  components: {treeselect,OrgTree},
 
-        };
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      names: [],
+      // 非单个停用
+      single: true,
+      //搜索tree
+      deptName: null,
+      // 非多个停用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      //区域
+      roleOptions: [],
+       //全部检查机构
+      orgOptions: [],
+      //搜索tree
+      deptName: null,
+      // 部门树选项
+      deptOptions: [],
+      // 总条数
+      total: 0,
+      //区域集合
+      areaList: [],
+      // 区域采集点表格数据
+      checkList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      orgName:null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        checkName: null,
+        areaId: null,
+        orgId: null,
+        year:null,
+        cycle:null,
+        startTime:new Date(),
+        endTime:null,
       },
-      created() {
-        this.getDeptTree();
-      this. getList();
+      weeks:new Date(),
+
+      // 周期开始时间
+      startDate: '',
+      // 周期结束时间
+      endDate: '',
+      // 周期时间
+      finalDate: '',
+      // 表单参数
+      form: {},
+      // 表单校验
+      checkList: [],
+      roleOptions: [],
+      defaultKeys: [],
+      //是否关联下级
+      checked: false,
+      defaultProps: {
+        children: "children",
+        label: "name"
       },
-      watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-          this.$refs.tree.filter(val);
-        }
+
+      rules: {
+        areaId: [
+          {required: true, message: '请选择区域', trigger: 'blur'},
+        ],
+        orgType: [
+          {required: true, message: '请选择机构类型', trigger: 'blur'},
+        ],
+        checkName: [
+          {required: true, message: '请输入NFC点位名称', trigger: 'change'}
+        ],
       },
-      methods: {
+      defaultKeys: []
 
-        p(s) {
-      return s < 10 ? '0' + s : s
+    };
+  },
+
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+
+  created() {
+    //this.getDeptTree();
+  this. getList();
+  },
+
+  methods: {
+
+    p(s) {
+  return s < 10 ? '0' + s : s
+},
+// 时间
+setWeekNum() {
+  const newTime = this.weeks.getTime();
+  const day = this.weeks.getDay();
+  const oneDayTime = 24 * 60 * 60 * 1000;
+  const fromTime = newTime - day * oneDayTime;
+  const endTime = newTime + (7 - day) * oneDayTime;
+  const fromDate = new Date(fromTime);
+  this.startDate = fromDate.getFullYear() + '-' + this.p((fromDate.getMonth() + 1)) + '-' + this.p(fromDate.getDate() + 1);
+  const toDate = new Date(endTime);
+  this.endDate = toDate.getFullYear() + '-' + this.p((toDate.getMonth() + 1)) + '-' + this.p(toDate.getDate());
+  this.queryParams.startDate = this.startDate;
+  this.queryParams.endDate = this.endDate;
+},
+/** 查询机构树数据 */
+getDeptTree() {
+  deptTreeSelect().then((response) => {
+    this.deptOptions = response.data;
+    this.queryParams.orgId=response.data[0].id;
+  });
+},
+    //单选框状态改变
+    checkChange(state) {
+      this.queryParams.checkSub = state;
+
+      this.getList();
+    },
+        // 节点单击事件
+        clickTreeNode(data) {
+      if(data==null){
+        return;
+      }
+      this.queryParams.orgId = data.id;
+      this.selectedOrgName = data.shortName;
+      // this.loadPlanList();
+     // this.loadRoles(data.id);
+      this.getList();
     },
-    // 时间
-    setWeekNum() {
-      const newTime = this.weeks.getTime();
-      const day = this.weeks.getDay();
-      const oneDayTime = 24 * 60 * 60 * 1000;
-      const fromTime = newTime - day * oneDayTime;
-      const endTime = newTime + (7 - day) * oneDayTime;
-      const fromDate = new Date(fromTime);
-      this.startDate = fromDate.getFullYear() + '-' + this.p((fromDate.getMonth() + 1)) + '-' + this.p(fromDate.getDate() + 1);
-      const toDate = new Date(endTime);
-      this.endDate = toDate.getFullYear() + '-' + this.p((toDate.getMonth() + 1)) + '-' + this.p(toDate.getDate());
-      this.queryParams.startDate = this.startDate;
-      this.queryParams.endDate = this.endDate;
+getDefaultOrg(node) {
+      this.queryParams.orgId = node.id;
+      this.selectedOrgName = node.shortName;
+      this.getList();
+      //this.loadRoles(node.id);
+      // this.loadPlanList();
     },
-  /** 查询机构树数据 */
-  getDeptTree() {
-      deptTreeSelect().then((response) => {
-        this.deptOptions = response.data;
-        this.queryParams.orgId=response.data[0].id;
+    /** treeSelect组件自定义数据*/
+    tenantIdnormalizer(node, instanceId) {
+  if (node.children && !node.children.length) {
+    delete node.children;
+  }
+  return {
+    id: node.id,
+    label: node.shortName,
+    children: node.children,
+  };
+},
+    getPageIndex($index) {
+      //表格序号
+      return (
+        (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+      );
+    },
+    handleExport() {
+  this.download('core/monitorAccessReport/export', {
+    ...this.queryParams
+  }, `${'【'+this.orgName+'】'+'-监控调阅统计报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+},
+
+    getList() {
+      this.loading = true;
+      listReport(this.queryParams).then(response => {
+        this.checkList = response.data;
+        this.title=response.title;
+         this.orgName = response.orgName;
+        this.loading = false;
       });
     },
-        /** treeSelect组件自定义数据*/
-        tenantIdnormalizer(node, instanceId) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.id,
-        label: node.shortName,
-        children: node.children,
+    getAllOrg() {
+      selectAllOrg().then(response => {
+    this.orgOptions = response.data;
+  })
+},
+
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        checkName: null,
+        areaId: null,
+        orgId: null,
+        createTime: null,
+        updateTime: null,
+        updateId: null,
+        createBy: null,
+        delFlag: null,
+        updateBy: null
       };
+      this.resetForm("form");
     },
-        getPageIndex($index) {
-          //表格序号
-          return (
-            (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
-          );
-        },
-        handleExport() {
-      this.download('core/monitorAccessReport/export', {
-        ...this.queryParams
-      }, `${'【'+this.orgName+'】'+'-监控调阅统计报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
     },
-
-        getList() {
-          this.loading = true;
-          console.log(this.queryParams.searchTime,'searchTime');
-          listReport(this.queryParams).then(response => {
-            this.checkList = response.data;
-            this.title=response.title;
-             this.orgName = response.orgName;
-            this.loading = false;
-          });
-        },
-        getAllOrg() {
-          selectAllOrg().then(response => {
-        this.orgOptions = response.data;
-      })
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+     // this.getDeptTree();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.names = selection.map(item => item.checkName)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
     },
 
+  }
+};
+</script>
 
-        // 取消按钮
-        cancel() {
-          this.open = false;
-          this.reset();
-        },
-        // 表单重置
-        reset() {
-          this.form = {
-            id: null,
-            checkName: null,
-            areaId: null,
-            orgId: null,
-            createTime: null,
-            updateTime: null,
-            updateId: null,
-            createBy: null,
-            delFlag: null,
-            updateBy: null
-          };
-          this.resetForm("form");
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-          this.queryParams.pageNum = 1;
-          this.getList();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-          this.resetForm("queryForm");
-          this.handleQuery();
-          this.getDeptTree();
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-          this.ids = selection.map(item => item.id)
-          this.names = selection.map(item => item.checkName)
-          this.single = selection.length !== 1
-          this.multiple = !selection.length
-        },
-
-      }
-    };
-  </script>
-  <style lang="scss" scoped>
+<style lang="scss" scoped>
   ::v-deep.formTreeItem {
     .el-form-item__content {
       width: 264px;
     }
   }
-  </style>
+  </style>

src/views/core/reportForms/resumptionReport.vue

@@ -4,7 +4,7 @@
           <el-form :model="queryParams" ref="queryForm" size="small"  :inline="true"
           v-show="showSearch">
 
-            <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
+            <!-- <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
             <tree-select
               v-model="queryParams.orgId"
               :options="deptOptions"
@@ -17,7 +17,18 @@
               noOptionsText="没有数据"
               noResultsText="没有搜索结果"
             />
-          </el-form-item>
+          </el-form-item> -->
+          <el-form-item label="组织机构">
+                  <org-tree
+                    v-model="queryParams.orgId"
+                    @defaultOrg="getDefaultOrg"
+                    @checkChange="checkChange"
+                    @click="clickTreeNode"
+                  ref="orgTree"
+                  :showCheckSub="false"
+                  ></org-tree>
+              </el-form-item>
+
           <el-form-item label="统计周期" prop="cycle">
             <el-select v-model="queryParams.cycle" placeholder="请选择统计周期"  @change="clean">
     <el-option
@@ -99,196 +110,216 @@
     import treeselect from '@riophae/vue-treeselect'
     import "@riophae/vue-treeselect/dist/vue-treeselect.css";
     import {deptTreeSelect,businessTreeSelect} from "@/api/system/public";
-    import orgTree from "@/components/orgTree";
-    export default {
-      name: "Check",
-      /** 引入基础minxins*/
-      mixins: [tableList],
-      components: {treeselect,orgTree},
-      dicts: ['sys_normal_disable','sys_org_type','repot_cycle'],
-      data() {
-        return {
-          options: [{
-          value: 1,
-          label: '日'
-        }, {
-          value: 2,
-          label: '月'
-        }],
-          // 遮罩层
-          loading: true,
-          // 选中数组
-          ids: [],
-          names: [],
-          // 非单个停用
-          single: true,
-          //搜索tree
-          deptName: null,
-          // 非多个停用
-          multiple: true,
-          // 显示搜索条件
-          showSearch: true,
-          //区域
-          roleOptions: [],
-           //全部检查机构
-      orgOptions: [],
-          //搜索tree
-          deptName: null,
-          // 部门树选项
-          deptOptions: [],
-          // 总条数
-          total: 0,
-          //区域集合
-          areaList: [],
-          // 区域采集点表格数据
-          checkList: [],
-          // 弹出层标题
-          title: "",
-          // 是否显示弹出层
-          open: false,
-          orgName:null,
-          // 查询参数
-          queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-            checkName: null,
-            areaId: null,
-            orgId: null,
-            searchTime:new Date(),
-            cycle:1
-          },
-          // 表单参数
-          form: {},
-          // 表单校验
-          checkList: [],
-          roleOptions: [],
-          defaultKeys: [],
-          //是否关联下级
-          checked: false,
-          defaultProps: {
-            children: "children",
-            label: "name"
-          },
+    //import orgTree from "@/components/orgTree";
+import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
+export default {
+  dicts: ['sys_normal_disable','sys_org_type','repot_cycle'],
+  name: "Check",
+
+  /** 引入基础minxins*/
+  mixins: [tableList],
 
-          rules: {
-            areaId: [
-              {required: true, message: '请选择区域', trigger: 'blur'},
-            ],
-            orgType: [
-              {required: true, message: '请选择机构类型', trigger: 'blur'},
-            ],
-            checkName: [
-              {required: true, message: '请输入NFC点位名称', trigger: 'change'}
-            ],
-          },
-          defaultKeys: []
+  components: {treeselect,OrgTree},
 
-        };
+  data() {
+    return {
+      options: [{
+      value: 1,
+      label: '日'
+    }, {
+      value: 2,
+      label: '月'
+    }],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      names: [],
+      // 非单个停用
+      single: true,
+      //搜索tree
+      deptName: null,
+      // 非多个停用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      //区域
+      roleOptions: [],
+       //全部检查机构
+  orgOptions: [],
+      //搜索tree
+      deptName: null,
+      // 部门树选项
+      deptOptions: [],
+      // 总条数
+      total: 0,
+      //区域集合
+      areaList: [],
+      // 区域采集点表格数据
+      checkList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      orgName:null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        checkName: null,
+        areaId: null,
+        orgId: null,
+        searchTime:new Date(),
+        cycle:1
       },
-      created() {
-        this.getDeptTree();
-      this. getList();
+      // 表单参数
+      form: {},
+      // 表单校验
+      checkList: [],
+      roleOptions: [],
+      defaultKeys: [],
+      //是否关联下级
+      checked: false,
+      defaultProps: {
+        children: "children",
+        label: "name"
       },
-      watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-          this.$refs.tree.filter(val);
-        }
+
+      rules: {
+        areaId: [
+          {required: true, message: '请选择区域', trigger: 'blur'},
+        ],
+        orgType: [
+          {required: true, message: '请选择机构类型', trigger: 'blur'},
+        ],
+        checkName: [
+          {required: true, message: '请输入NFC点位名称', trigger: 'change'}
+        ],
       },
-      methods: {
-  /** 查询机构树数据 */
-  getDeptTree() {
-      deptTreeSelect().then((response) => {
-        this.deptOptions = response.data;
-        this.queryParams.orgId=response.data[0].id;
-      });
+      defaultKeys: []
+
+    };
+  },
+
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+
+  created() {
+  //  this.getDeptTree();
+  this. getList();
+  },
+
+  methods: {
+    getDefaultOrg(node) {
+      this.queryParams.orgId = node.id;
+      this.selectedOrgName = node.shortName;
+      this.getList();
+    },
+        //单选框状态改变
+        checkChange(state) {
+      this.queryParams.checkSub = state;
+      this.getList();
     },
-        /** treeSelect组件自定义数据*/
-        tenantIdnormalizer(node, instanceId) {
-      if (node.children && !node.children.length) {
-        delete node.children;
+            // 节点单击事件
+            clickTreeNode(data) {
+      if(data==null){
+        return;
       }
-      return {
-        id: node.id,
-        label: node.shortName,
-        children: node.children,
-      };
+      this.queryParams.orgId = data.id;
+      this.selectedOrgName = data.shortName;
+      this.getList();
     },
-        getPageIndex($index) {
-          //表格序号
-          return (
-            (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
-          );
-        },
-        handleExport() {
-      this.download('core/resumptionReport/export', {
-        ...this.queryParams
-      }, `${'【'+this.orgName+'】'+'-履职报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+    /** treeSelect组件自定义数据*/
+    tenantIdnormalizer(node, instanceId) {
+  if (node.children && !node.children.length) {
+    delete node.children;
+  }
+  return {
+    id: node.id,
+    label: node.shortName,
+    children: node.children,
+  };
+},
+    getPageIndex($index) {
+      //表格序号
+      return (
+        (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+      );
     },
+    handleExport() {
+  this.download('core/resumptionReport/export', {
+    ...this.queryParams
+  }, `${'【'+this.orgName+'】'+'-履职报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+},
 
 
-        getList() {
-          this.loading = true;
-          listReport(this.queryParams).then(response => {
-            this.checkList = response.data;
-            this.title=response.title;
-            this.orgName=response.orgName;
-            this.loading = false;
-          });
-        },
+    getList() {
+      this.loading = true;
+      listReport(this.queryParams).then(response => {
+        this.checkList = response.data;
+        this.title=response.title;
+        this.orgName=response.orgName;
+        this.loading = false;
+      });
+    },
 
 
-    clean() {
-     this.queryParams.searchTime=new Date();
+clean() {
+ this.queryParams.searchTime=new Date();
 
+},
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        checkName: null,
+        areaId: null,
+        orgId: null,
+        createTime: null,
+        updateTime: null,
+        updateId: null,
+        createBy: null,
+        delFlag: null,
+        updateBy: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    //  this.getDeptTree();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.names = selection.map(item => item.checkName)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
     },
-        // 取消按钮
-        cancel() {
-          this.open = false;
-          this.reset();
-        },
-        // 表单重置
-        reset() {
-          this.form = {
-            id: null,
-            checkName: null,
-            areaId: null,
-            orgId: null,
-            createTime: null,
-            updateTime: null,
-            updateId: null,
-            createBy: null,
-            delFlag: null,
-            updateBy: null
-          };
-          this.resetForm("form");
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-          this.queryParams.pageNum = 1;
-          this.getList();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-          this.resetForm("queryForm");
-          this.handleQuery();
-          this.getDeptTree();
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-          this.ids = selection.map(item => item.id)
-          this.names = selection.map(item => item.checkName)
-          this.single = selection.length !== 1
-          this.multiple = !selection.length
-        },
 
-      }
-    };
-  </script>
-  <style lang="scss" scoped>
+  }
+};
+</script>
+
+<style lang="scss" scoped>
   ::v-deep.formTreeItem {
     .el-form-item__content {
       width: 264px;
     }
   }
-  </style>
+  </style>

src/views/core/reportForms/safetyInspectReport.vue

@@ -11,7 +11,7 @@
   </el-select>
   </el-form-item> -->
 
-        <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
+        <!-- <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
           <tree-select
             v-model="queryParams.orgId"
             :options="deptOptions"
@@ -24,11 +24,21 @@
             noOptionsText="没有数据"
             noResultsText="没有搜索结果"
           />
-        </el-form-item>
+        </el-form-item> -->
+        <el-form-item label="组织机构">
+                  <org-tree
+                    v-model="queryParams.orgId"
+                    @defaultOrg="getDefaultOrg"
+                    @checkChange="checkChange"
+                    @click="clickTreeNode"
+                  ref="orgTree"
+                  :showCheckSub="false"
+                  ></org-tree>
+              </el-form-item>
 
         <el-form-item label="机构类型" prop="orgType">
           <el-select style="width: 100%;" v-model="queryParams.orgType" placeholder="请选择机构类型"
-                     @change="changeSelect">
+                  >
             <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
                        :value="`${dict.value}`"></el-option>
           </el-select>
@@ -43,10 +53,6 @@
           </el-date-picker>
         </el-form-item>
 
-        <!-- <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item> -->
       </el-form>
 
       <el-row :gutter="10" >
@@ -105,14 +111,17 @@ import {listReport, selectAllOrg} from "@/api/core/reportForms/safetyInspectRepo
 import treeselect from '@riophae/vue-treeselect'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {deptTreeSelect, businessTreeSelect} from "@/api/system/public";
-import orgTree from "@/components/orgTree";
-
+//import orgTree from "@/components/orgTree";
+import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 export default {
+  dicts: ['sys_normal_disable', 'sys_org_type'],
   name: "Check",
+
   /** 引入基础minxins*/
   mixins: [tableList],
-  components: {treeselect, orgTree},
-  dicts: ['sys_normal_disable', 'sys_org_type'],
+
+  components: {treeselect,OrgTree},
+
   data() {
     return {
       // 遮罩层
@@ -181,25 +190,40 @@ export default {
 
     };
   },
-  created() {
-    this.getDeptTree();
-    this.getList();
-  },
+
   watch: {
     // 根据名称筛选部门树
     deptName(val) {
       this.$refs.tree.filter(val);
     }
   },
-  methods: {
 
-    /** 查询机构树数据 */
-    getDeptTree() {
-      deptTreeSelect().then((response) => {
-        this.deptOptions = response.data;
-        this.queryParams.orgId = response.data[0].id;
-      });
+  created() {
+    //this.getDeptTree();
+    this.getList();
+  },
+
+  methods: {
+    getDefaultOrg(node) {
+      this.queryParams.orgId = node.id;
+      this.selectedOrgName = node.shortName;
+      this.getList();
     },
+        //单选框状态改变
+        checkChange(state) {
+      this.queryParams.checkSub = state;
+      this.getList();
+    },
+            // 节点单击事件
+            clickTreeNode(data) {
+      if(data==null){
+        return;
+      }
+      this.queryParams.orgId = data.id;
+      this.selectedOrgName = data.shortName;
+      this.getList();
+    },
+
     /** treeSelect组件自定义数据*/
     tenantIdnormalizer(node, instanceId) {
       if (node.children && !node.children.length) {
@@ -257,7 +281,8 @@ export default {
         updateId: null,
         createBy: null,
         delFlag: null,
-        updateBy: null
+        updateBy: null,
+        orgType:null
       };
       this.resetForm("form");
     },
@@ -270,7 +295,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.handleQuery();
-      this.getDeptTree();
+      //this.getDeptTree();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -283,10 +308,11 @@ export default {
   }
 };
 </script>
+
 <style lang="scss" scoped>
 ::v-deep.formTreeItem {
   .el-form-item__content {
     width: 264px;
   }
 }
-</style>
+</style>

src/views/core/reportForms/selfInspectReport.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="main-search-box">
     <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" size="small">
-      <el-form-item class="formTreeItem" label="组织机构" prop="orgId">
+      <!-- <el-form-item class="formTreeItem" label="组织机构" prop="orgId">
         <tree-select
           v-model="queryParams.orgId"
           :noChildrenText="''"
@@ -15,7 +15,18 @@
           noResultsText="没有搜索结果"
           placeholder="请选择归属机构"
         />
-      </el-form-item>
+      </el-form-item> -->
+      <el-form-item label="组织机构">
+                  <org-tree
+                    v-model="queryParams.orgId"
+                    @defaultOrg="getDefaultOrg"
+                    @checkChange="checkChange"
+                    @click="clickTreeNode"
+                  ref="orgTree"
+                  :showCheckSub="false"
+                  ></org-tree>
+              </el-form-item>
+      
       <el-form-item label="统计周期" prop="cycle">
         <el-select v-model="queryParams.cycle" placeholder="请选择统计周期">
           <el-option
@@ -90,14 +101,17 @@ import {listSelfReport, selectAllOrg} from "@/api/core/reportForms/safetyInspect
 import treeselect from '@riophae/vue-treeselect'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {deptTreeSelect} from "@/api/system/public";
-import orgTree from "@/components/orgTree";
-
+//import orgTree from "@/components/orgTree";
+import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 export default {
+  dicts: ['sys_normal_disable', 'sys_org_type'],
   name: "Check",
+
   /** 引入基础minxins*/
   mixins: [tableList],
-  components: {treeselect, orgTree},
-  dicts: ['sys_normal_disable', 'sys_org_type'],
+
+  components: {treeselect, OrgTree},
+
   data() {
     return {
       options: [{
@@ -174,25 +188,40 @@ export default {
 
     };
   },
-  created() {
-    this.getDeptTree();
-    this.getList();
-  },
+
   watch: {
     // 根据名称筛选部门树
     deptName(val) {
       this.$refs.tree.filter(val);
     }
   },
-  methods: {
 
-    /** 查询机构树数据 */
-    getDeptTree() {
-      deptTreeSelect().then((response) => {
-        this.deptOptions = response.data;
-        this.queryParams.orgId = response.data[0].id;
-      });
+  created() {
+    this.getList();
+  },
+
+  methods: {
+    getDefaultOrg(node) {
+      this.queryParams.orgId = node.id;
+      this.selectedOrgName = node.shortName;
+      this.getList();
+    },
+        //单选框状态改变
+        checkChange(state) {
+      this.queryParams.checkSub = state;
+      this.getList();
     },
+            // 节点单击事件
+            clickTreeNode(data) {
+      if(data==null){
+        return;
+      }
+      this.queryParams.orgId = data.id;
+      this.selectedOrgName = data.shortName;
+      this.getList();
+    },
+
+
     /** treeSelect组件自定义数据*/
     tenantIdnormalizer(node, instanceId) {
       if (node.children && !node.children.length) {
@@ -263,7 +292,6 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.handleQuery();
-      this.getDeptTree();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -276,10 +304,11 @@ export default {
   }
 };
 </script>
+
 <style lang="scss" scoped>
 ::v-deep.formTreeItem {
   .el-form-item__content {
     width: 264px;
   }
 }
-</style>
+</style>

src/views/core/reportForms/serviceBankReport.vue

@@ -4,7 +4,7 @@
           <el-form :model="queryParams" ref="queryForm" size="small"  :inline="true"
           v-show="showSearch">
 
-            <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
+            <!-- <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
             <tree-select
               v-model="queryParams.orgId"
               :options="deptOptions"
@@ -17,7 +17,18 @@
               noOptionsText="没有数据"
               noResultsText="没有搜索结果"
             />
-          </el-form-item>
+          </el-form-item> -->
+          <el-form-item label="组织机构">
+                  <org-tree
+                    v-model="queryParams.orgId"
+                    @defaultOrg="getDefaultOrg"
+                    @checkChange="checkChange"
+                    @click="clickTreeNode"
+                  ref="orgTree"
+                  :showCheckSub="false"
+                  ></org-tree>
+              </el-form-item>
+
               <el-form-item label="时间" prop="searchTime">
               <el-date-picker   value-format='yyyy-MM' v-model="queryParams.searchTime"
                                 align="right" type="month" placeholder="请选择查询时间">
@@ -79,198 +90,219 @@
     import treeselect from '@riophae/vue-treeselect'
     import "@riophae/vue-treeselect/dist/vue-treeselect.css";
     import {deptTreeSelect,businessTreeSelect} from "@/api/system/public";
-    import orgTree from "@/components/orgTree";
+       //import orgTree from "@/components/orgTree";
+import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
     import { defineComponent } from 'vue';
+export default {
+  dicts: ['sys_normal_disable','sys_org_type','repot_cycle'],
+  name: "Check",
 
-    export default {
-      name: "Check",
-      /** 引入基础minxins*/
-      mixins: [tableList],
-      components: {treeselect,orgTree},
-      dicts: ['sys_normal_disable','sys_org_type','repot_cycle'],
-      data() {
-        return {
-            startDatepickerOptions: {
-        disabledDate(time) {
-          const date = new Date();
-          date.setTime(date.getTime());
-          return time.getTime() < date;
-        },
-      },
-          // 遮罩层
-          loading: true,
-          // 选中数组
-          ids: [],
-          names: [],
-          // 非单个停用
-          single: true,
-          //搜索tree
-          deptName: null,
-          // 非多个停用
-          multiple: true,
-          // 显示搜索条件
-          showSearch: true,
-          //区域
-          roleOptions: [],
-           //全部检查机构
-      orgOptions: [],
-          //搜索tree
-          deptName: null,
-          // 部门树选项
-          deptOptions: [],
-          // 总条数
-          total: 0,
-          //区域集合
-          areaList: [],
-          // 区域采集点表格数据
-          checkList: [],
-          // 弹出层标题
-          title: "",
-          // 是否显示弹出层
-          open: false,
-          // 查询参数
-          queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-            checkName: null,
-            areaId: null,
-            orgId: null,
-            searchTime:new Date()
-          },
-          orgName:null,
-          // 表单参数
-          form: {},
-          // 表单校验
-          checkList: [],
-          roleOptions: [],
-          defaultKeys: [],
-          //是否关联下级
-          checked: false,
-          defaultProps: {
-            children: "children",
-            label: "name"
-          },
+  /** 引入基础minxins*/
+  mixins: [tableList],
 
-          rules: {
-            areaId: [
-              {required: true, message: '请选择区域', trigger: 'blur'},
-            ],
-            orgType: [
-              {required: true, message: '请选择机构类型', trigger: 'blur'},
-            ],
-            checkName: [
-              {required: true, message: '请输入NFC点位名称', trigger: 'change'}
-            ],
-          },
-          defaultKeys: []
+  components: {treeselect,OrgTree},
 
-        };
+  data() {
+    return {
+        startDatepickerOptions: {
+    disabledDate(time) {
+      const date = new Date();
+      date.setTime(date.getTime());
+      return time.getTime() < date;
+    },
+  },
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      names: [],
+      // 非单个停用
+      single: true,
+      //搜索tree
+      deptName: null,
+      // 非多个停用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      //区域
+      roleOptions: [],
+       //全部检查机构
+  orgOptions: [],
+      //搜索tree
+      deptName: null,
+      // 部门树选项
+      deptOptions: [],
+      // 总条数
+      total: 0,
+      //区域集合
+      areaList: [],
+      // 区域采集点表格数据
+      checkList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        checkName: null,
+        areaId: null,
+        orgId: null,
+        searchTime:new Date()
       },
-      created() {
-        this.getDeptTree();
-      this. getList();
+      orgName:null,
+      // 表单参数
+      form: {},
+      // 表单校验
+      checkList: [],
+      roleOptions: [],
+      defaultKeys: [],
+      //是否关联下级
+      checked: false,
+      defaultProps: {
+        children: "children",
+        label: "name"
       },
-      watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-          this.$refs.tree.filter(val);
-        }
+
+      rules: {
+        areaId: [
+          {required: true, message: '请选择区域', trigger: 'blur'},
+        ],
+        orgType: [
+          {required: true, message: '请选择机构类型', trigger: 'blur'},
+        ],
+        checkName: [
+          {required: true, message: '请输入NFC点位名称', trigger: 'change'}
+        ],
       },
-      methods: {
-  /** 查询机构树数据 */
-  getDeptTree() {
-      deptTreeSelect().then((response) => {
-        this.deptOptions = response.data;
-        this.queryParams.orgId=response.data[0].id;
-      });
+      defaultKeys: []
+
+    };
+  },
+
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+
+  created() {
+   // this.getDeptTree();
+  this. getList();
+  },
+
+  methods: {
+    getDefaultOrg(node) {
+      this.queryParams.orgId = node.id;
+      this.selectedOrgName = node.shortName;
+      this.getList();
+    },
+        //单选框状态改变
+        checkChange(state) {
+      this.queryParams.checkSub = state;
+      this.getList();
     },
-        /** treeSelect组件自定义数据*/
-        tenantIdnormalizer(node, instanceId) {
-      if (node.children && !node.children.length) {
-        delete node.children;
+            // 节点单击事件
+            clickTreeNode(data) {
+      if(data==null){
+        return;
       }
-      return {
-        id: node.id,
-        label: node.shortName,
-        children: node.children,
-      };
+      this.queryParams.orgId = data.id;
+      this.selectedOrgName = data.shortName;
+      this.getList();
     },
-        getPageIndex($index) {
-          //表格序号
-          return (
-            (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
-          );
-        },
-        handleExport() {
-      this.download('core/resumptionReport/serviceBankExport', {
-        ...this.queryParams
-      }, `${'【'+this.orgName+'】'+'-离行式自助银行巡检报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+
+
+    /** treeSelect组件自定义数据*/
+    tenantIdnormalizer(node, instanceId) {
+  if (node.children && !node.children.length) {
+    delete node.children;
+  }
+  return {
+    id: node.id,
+    label: node.shortName,
+    children: node.children,
+  };
+},
+    getPageIndex($index) {
+      //表格序号
+      return (
+        (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+      );
     },
+    handleExport() {
+  this.download('core/resumptionReport/serviceBankExport', {
+    ...this.queryParams
+  }, `${'【'+this.orgName+'】'+'-离行式自助银行巡检报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+},
 
 
-        getList() {
-          this.loading = true;
-          listServiceBankReport(this.queryParams).then(response => {
-            this.checkList = response.data;
-            this.title=response.title;
-            this.orgName=response.orgName;
-            this.loading = false;
-          });
-        },
-        getAllOrg() {
-          selectAllOrg().then(response => {
-        this.orgOptions = response.data;
-      })
+    getList() {
+      this.loading = true;
+      listServiceBankReport(this.queryParams).then(response => {
+        this.checkList = response.data;
+        this.title=response.title;
+        this.orgName=response.orgName;
+        this.loading = false;
+      });
     },
+    getAllOrg() {
+      selectAllOrg().then(response => {
+    this.orgOptions = response.data;
+  })
+},
 
 
-        // 取消按钮
-        cancel() {
-          this.open = false;
-          this.reset();
-        },
-        // 表单重置
-        reset() {
-          this.form = {
-            id: null,
-            checkName: null,
-            areaId: null,
-            orgId: null,
-            createTime: null,
-            updateTime: null,
-            updateId: null,
-            createBy: null,
-            delFlag: null,
-            updateBy: null
-          };
-          this.resetForm("form");
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-          this.queryParams.pageNum = 1;
-          this.getList();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-          this.resetForm("queryForm");
-          this.handleQuery();
-          this.getDeptTree();
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-          this.ids = selection.map(item => item.id)
-          this.names = selection.map(item => item.checkName)
-          this.single = selection.length !== 1
-          this.multiple = !selection.length
-        },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        checkName: null,
+        areaId: null,
+        orgId: null,
+        createTime: null,
+        updateTime: null,
+        updateId: null,
+        createBy: null,
+        delFlag: null,
+        updateBy: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    //  this.getDeptTree();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.names = selection.map(item => item.checkName)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+
+  }
+};
+</script>
 
-      }
-    };
-  </script>
-  <style lang="scss" scoped>
+<style lang="scss" scoped>
   ::v-deep.formTreeItem {
     .el-form-item__content {
       width: 264px;
     }
   }
-  </style>
+  </style>

src/views/core/reportForms/standbyPowerReport.vue

@@ -3,7 +3,7 @@
       <div class="main-search-box">
           <el-form :model="queryParams" ref="queryForm" size="small"  :inline="true"
           v-show="showSearch">
-            <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
+            <!-- <el-form-item label="组织机构" prop="orgId" class="formTreeItem">
             <tree-select
               v-model="queryParams.orgId"
               :options="deptOptions"
@@ -16,21 +16,30 @@
               noOptionsText="没有数据"
               noResultsText="没有搜索结果"
             />
-          </el-form-item>
+          </el-form-item> -->
+          <el-form-item label="组织机构">
+                  <org-tree
+                    v-model="queryParams.orgId"
+                    @defaultOrg="getDefaultOrg"
+                    @checkChange="checkChange"
+                    @click="clickTreeNode"
+                  ref="orgTree"
+                  :showCheckSub="false"
+                  ></org-tree>
+              </el-form-item>
+              
               <el-form-item label="统计季度" prop="searchTime">
                 <QuarterPicker format="yyyy年q季度" value-format="yyyy-MM" placeholder="请选择季报基准期" v-model="queryParams.searchTime" />
               </el-form-item>
           </el-form>
           <el-row :gutter="10">
-            <el-col span="1.5">
+            <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-col>
-            <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
-                         v-hasPermi="['core:resumptionReport:export']">导出数据
-              </el-button>
+                         v-hasPermi="['core:resumptionReport:export']">导出数据</el-button>
             </el-col>
+      
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>
         </div>
@@ -64,15 +73,7 @@
 
     </div>
   </template>
-  <!-- <script setup lang="ts">
-  import { ref } from "vue";
-  import Quarter from '@/views/core/reportForms/z.vue';
-
-  const quarterValue = ref("");
 
-  const disabledQuarter = (val: Date) => {if (val <= new Date()) return false;return true;
-  };
-  </script>  -->
 
   <script>
     import tableList from '@/mixins/tableList'
@@ -80,227 +81,255 @@
     import treeselect from '@riophae/vue-treeselect'
     import "@riophae/vue-treeselect/dist/vue-treeselect.css";
     import {deptTreeSelect,businessTreeSelect} from "@/api/system/public";
-    import orgTree from "@/components/orgTree";
+   //import orgTree from "@/components/orgTree";
+import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
     import QuarterPicker from '@/views/components/QuarterPicker/index.vue'
-    export default {
-      name: "Check",
-      /** 引入基础minxins*/
-      mixins: [tableList],
-      components: {treeselect,orgTree,QuarterPicker },
-      dicts: ['sys_normal_disable','sys_org_type','repot_cycle'],
-      data() {
-        return {
-            startDatepickerOptions: {
-        disabledDate(time) {
-          const date = new Date();
-          date.setTime(date.getTime());
-          return time.getTime() < date;
-        },
-      },
-          // 遮罩层
-          loading: true,
-          // 选中数组
-          ids: [],
-          names: [],
-          // 非单个禁用
-          single: true,
-          //搜索tree
-          deptName: null,
-          // 非多个禁用
-          multiple: true,
-          // 显示搜索条件
-          showSearch: true,
-          //区域
-          roleOptions: [],
-           //全部检查机构
-      orgOptions: [],
-          //搜索tree
-          deptName: null,
-          // 部门树选项
-          deptOptions: [],
-          // 总条数
-          total: 0,
-          //区域集合
-          areaList: [],
-          // 区域采集点表格数据
-          checkList: [],
-          // 弹出层标题
-          title: "",
-          // 是否显示弹出层
-          open: false,
-          // 查询参数
-          queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-            checkName: null,
-            areaId: null,
-            orgId: null,
-            searchTime:new Date()
-          },
-          orgName:null,
-          // 表单参数
-          form: {},
-          // 表单校验
-          checkList: [],
-          roleOptions: [],
-          defaultKeys: [],
-          //是否关联下级
-          checked: false,
-          defaultProps: {
-            children: "children",
-            label: "name"
-          },
+export default {
+  dicts: ['sys_normal_disable','sys_org_type','repot_cycle'],
+  name: "Check",
 
-          rules: {
-            areaId: [
-              {required: true, message: '请选择区域', trigger: 'blur'},
-            ],
-            orgType: [
-              {required: true, message: '请选择机构类型', trigger: 'blur'},
-            ],
-            checkName: [
-              {required: true, message: '请输入NFC点位名称', trigger: 'change'}
-            ],
-          },
-          defaultKeys: []
+  /** 引入基础minxins*/
+  mixins: [tableList],
 
-        };
-      },
-      created() {
-        this.getDeptTree();
-      this. getList();
+  components: {treeselect,OrgTree,QuarterPicker },
 
-      if (this.defaultValue) {
-        let value = this.defaultValue
-        let arr = value.split('-')
-        this.year = arr[0].slice(0, 4)
-        let str = arr[0].slice(4, 6) + '-' + arr[1].slice(4, 6)
-        let arrAll = this.valueArr
-        this.showValue = `${this.year}年${arrAll.indexOf(str) + 1}季度`
-      };
-      },
-      watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-          this.$refs.tree.filter(val);
-        }
-      },
-      methods: {
-        prev () {
-        this.year = this.year * 1 - 1
+  data() {
+    return {
+        startDatepickerOptions: {
+    disabledDate(time) {
+      const date = new Date();
+      date.setTime(date.getTime());
+      return time.getTime() < date;
+    },
+  },
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      names: [],
+      // 非单个禁用
+      single: true,
+      //搜索tree
+      deptName: null,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      //区域
+      roleOptions: [],
+       //全部检查机构
+  orgOptions: [],
+      //搜索tree
+      deptName: null,
+      // 部门树选项
+      deptOptions: [],
+      // 总条数
+      total: 0,
+      //区域集合
+      areaList: [],
+      // 区域采集点表格数据
+      checkList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        checkName: null,
+        areaId: null,
+        orgId: null,
+        searchTime:new Date()
       },
-      next () {
-        this.year = this.year * 1 + 1
+      orgName:null,
+      // 表单参数
+      form: {},
+      // 表单校验
+      checkList: [],
+      roleOptions: [],
+      defaultKeys: [],
+      //是否关联下级
+      checked: false,
+      defaultProps: {
+        children: "children",
+        label: "name"
       },
-      selectSeason (i) {
-        for (let j in $('.season-item')) {
-          $('.season-item').eq(j).css('color', '#fff')
-        }
-        $('.season-item').eq(i).css('color', '#249bff')
-        this.season = i + 1
-        let arr = this.valueArr[i].split('-')
-        this.getValue(this.year + arr[0] + '-' + this.year + arr[1])
-        this.showSeason = false
-        this.showValue = `${this.year}年${this.season}季度`
-        this.$emit('getQuarter', this.year, this.season)
+
+      rules: {
+        areaId: [
+          {required: true, message: '请选择区域', trigger: 'blur'},
+        ],
+        orgType: [
+          {required: true, message: '请选择机构类型', trigger: 'blur'},
+        ],
+        checkName: [
+          {required: true, message: '请输入NFC点位名称', trigger: 'change'}
+        ],
       },
+      defaultKeys: []
 
+    };
+  },
 
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
 
-  /** 查询机构树数据 */
-  getDeptTree() {
-      deptTreeSelect().then((response) => {
-        this.deptOptions = response.data;
-        this.queryParams.orgId=response.data[0].id;
-      });
+  created() {
+  //  this.getDeptTree();
+  this. getList();
+
+  if (this.defaultValue) {
+    let value = this.defaultValue
+    let arr = value.split('-')
+    this.year = arr[0].slice(0, 4)
+    let str = arr[0].slice(4, 6) + '-' + arr[1].slice(4, 6)
+    let arrAll = this.valueArr
+    this.showValue = `${this.year}年${arrAll.indexOf(str) + 1}季度`
+  };
+  },
+
+  methods: {
+    getDefaultOrg(node) {
+      this.queryParams.orgId = node.id;
+      this.selectedOrgName = node.shortName;
+      this.getList();
     },
-        /** treeSelect组件自定义数据*/
-        tenantIdnormalizer(node, instanceId) {
-      if (node.children && !node.children.length) {
-        delete node.children;
+        //单选框状态改变
+        checkChange(state) {
+      this.queryParams.checkSub = state;
+      this.getList();
+    },
+            // 节点单击事件
+            clickTreeNode(data) {
+      if(data==null){
+        return;
       }
-      return {
-        id: node.id,
-        label: node.shortName,
-        children: node.children,
-      };
+      this.queryParams.orgId = data.id;
+      this.selectedOrgName = data.shortName;
+      this.getList();
     },
-        getPageIndex($index) {
-          //表格序号
-          return (
-            (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
-          );
-        },
-        handleExport() {
-      this.download('core/resumptionReport/standbyPowerExport', {
-        ...this.queryParams
-      }, `${'【'+this.orgName+'】'+'-备用电源维护报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+
+  //   prev () {
+  //   this.year = this.year * 1 - 1
+  // },
+  // next () {
+  //   this.year = this.year * 1 + 1
+  // },
+  // selectSeason (i) {
+  //   for (let j in $('.season-item')) {
+  //     $('.season-item').eq(j).css('color', '#fff')
+  //   }
+  //   $('.season-item').eq(i).css('color', '#249bff')
+  //   this.season = i + 1
+  //   let arr = this.valueArr[i].split('-')
+  //   this.getValue(this.year + arr[0] + '-' + this.year + arr[1])
+  //   this.showSeason = false
+  //   this.showValue = `${this.year}年${this.season}季度`
+  //   this.$emit('getQuarter', this.year, this.season)
+  // },
+
+
+
+/** 查询机构树数据 */
+getDeptTree() {
+  deptTreeSelect().then((response) => {
+    this.deptOptions = response.data;
+    this.queryParams.orgId=response.data[0].id;
+  });
+},
+    /** treeSelect组件自定义数据*/
+    tenantIdnormalizer(node, instanceId) {
+  if (node.children && !node.children.length) {
+    delete node.children;
+  }
+  return {
+    id: node.id,
+    label: node.shortName,
+    children: node.children,
+  };
+},
+    getPageIndex($index) {
+      //表格序号
+      return (
+        (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+      );
     },
+    handleExport() {
+  this.download('core/resumptionReport/standbyPowerExport', {
+    ...this.queryParams
+  }, `${'【'+this.orgName+'】'+'-备用电源维护报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+},
 
 
-        getList() {
-          this.loading = true;
-          listStandbyPowerReport(this.queryParams).then(response => {
-            this.checkList = response.data;
-            this.title=response.title;
-            this.orgName=response.orgName;
-            this.loading = false;
-          });
-        },
-        getAllOrg() {
-          selectAllOrg().then(response => {
-        this.orgOptions = response.data;
-      })
+    getList() {
+      this.loading = true;
+      listStandbyPowerReport(this.queryParams).then(response => {
+        this.checkList = response.data;
+        this.title=response.title;
+        this.orgName=response.orgName;
+        this.loading = false;
+      });
     },
+    getAllOrg() {
+      selectAllOrg().then(response => {
+    this.orgOptions = response.data;
+  })
+},
 
 
-        // 取消按钮
-        cancel() {
-          this.open = false;
-          this.reset();
-        },
-        // 表单重置
-        reset() {
-          this.form = {
-            id: null,
-            checkName: null,
-            areaId: null,
-            orgId: null,
-            createTime: null,
-            updateTime: null,
-            updateId: null,
-            createBy: null,
-            delFlag: null,
-            updateBy: null
-          };
-          this.resetForm("form");
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-          this.queryParams.pageNum = 1;
-          this.getList();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-          this.resetForm("queryForm");
-          this.handleQuery();
-          this.getDeptTree();
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-          this.ids = selection.map(item => item.id)
-          this.names = selection.map(item => item.checkName)
-          this.single = selection.length !== 1
-          this.multiple = !selection.length
-        },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        checkName: null,
+        areaId: null,
+        orgId: null,
+        createTime: null,
+        updateTime: null,
+        updateId: null,
+        createBy: null,
+        delFlag: null,
+        updateBy: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+     // this.getDeptTree();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.names = selection.map(item => item.checkName)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
 
-      }
-    };
-  </script>
-  <style lang="scss" scoped>
+  }
+};
+</script>
+
+<style lang="scss" scoped>
   ::v-deep.formTreeItem {
     .el-form-item__content {
       width: 264px;
     }
   }
-  </style>
+  </style>

src/views/evaluateTable/index.vue

@@ -15,7 +15,7 @@
               v-show="showSearch"
 
             >
-              <el-form-item label="组织机构:" class="formTreeItem">
+              <!-- <el-form-item label="组织机构:" class="formTreeItem">
                 <tree-select
                   v-model="queryParams.orgId"
                   :options="deptOptions"
@@ -29,7 +29,18 @@
                   noOptionsText="没有数据"
                   noResultsText="没有搜索结果"
                 />
+              </el-form-item> -->
+              <el-form-item label="组织机构">
+                  <org-tree
+                    v-model="queryParams.orgId"
+                    @defaultOrg="getDefaultOrg"
+                    @checkChange="checkChange"
+                    @click="clickTreeNode"
+                  ref="orgTree"
+                  :showCheckSub="false"
+                  ></org-tree>
               </el-form-item>
+              
               <el-form-item label="外包评价名称:" label-width="50">
                 <el-select v-model="queryParams.planId" @change="changeHandler">
                   <el-option
@@ -101,11 +112,13 @@ import { findAllRole } from "@/api/system/role";
 import { list, getPlanList } from "@/api/evaluateTable/evaluateTable.js";
 import { newDateMonth } from "@/utils/index.js";
 import { deptTreeSelect } from "@/api/system/public";
+    import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 export default {
   name: "SocWebIndex",
 
-  components: {
+  components: {OrgTree
   },
+
   data() {
     const { params, query } = this.$route;
     return {
@@ -131,24 +144,49 @@ export default {
       deptOptions: [], //机构数组
     };
   },
-  created() {
-    this.getDeptTree();
-    this.getevlauteList();
+
+  computed: {
+    ...mapGetters(["orgId"]),
   },
+
   watch: {
     queryParams() {
       this.getList();
     },
   },
+
+  created() {
+   // this.getDeptTree();
+    this.getevlauteList();
+  },
+
   mounted() {
     if (this.deptOptions) {
       this.queryParams.orgId = this.orgId;
     }
   },
-  computed: {
-    ...mapGetters(["orgId"]),
-  },
+
   methods: {
+    getDefaultOrg(node) {
+      this.queryParams.orgId = node.id;
+      this.selectedOrgName = node.shortName;
+      this.getList();
+    },
+        //单选框状态改变
+        checkChange(state) {
+      this.queryParams.checkSub = state;
+      this.getList();
+    },
+            // 节点单击事件
+            clickTreeNode(data) {
+      if(data==null){
+        return;
+      }
+      this.queryParams.orgId = data.id;
+      this.selectedOrgName = data.shortName;
+      this.getList();
+    },
+
     changeHandler() {
       this.getList();
     },
@@ -231,9 +269,10 @@ this.orgName=res.orgName;
     },
     //导出
     exportExcel() {},
-  },
+  }
 };
 </script>
+
 <style lang="scss" scoped>
 ::v-deep.formTreeItem {
   .el-form-item__content {
@@ -295,4 +334,4 @@ this.orgName=res.orgName;
   letter-spacing: 3px;
   font-weight: bold;
 }
-</style>
+</style>

src/views/resumption/taskManager/index.vue

@@ -282,16 +282,19 @@ import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import * as api from "@/api/resumption/taskManger.js";
 import { getLabel } from "@/views/commonOption.js";
 import dayjs from "dayjs";
-
 export default {
-  name: "overviewDetialList",
   dicts: ["resumption_plan_cycle", "resumption_status"],
+  name: "overviewDetialList",
+
   components: {
     DialogDetail,
     DialogScanRecord,
     DataRangePicker,
     OrgTree
   },
+
+  props: {},
+
   data() {
     let sDate = new Date();
     let eDate = new Date();
@@ -328,7 +331,11 @@ export default {
       ],
     };
   },
-  props: {},
+
+  computed: {
+    ...mapGetters(["orgName","orgId"]),
+  },
+
   watch: {
     // org: {
     //   deep: true,
@@ -358,9 +365,24 @@ export default {
       //this.queryParams.type = this.$route.params.type.toUpperCase();
     },
   },
-  computed: {
-    ...mapGetters(["orgName","orgId"]),
+
+  async mounted() {
+    this.queryParams.orgId=this.orgId
+    console.info("this.queryParams.orgId",this.queryParams.orgId)
+    // let tabs=this.$tab;
+    // debugger
+    // const { params, query } = this.$route;
+    // if (this.loginUser && this.loginUser.org && this.loginUser.org.id) {
+    //   if (query == undefined || query.orgId == undefined) {
+    //     this.queryParams.orgId = this.loginUser.org.id;
+    //   }
+    // }
+    // this.loadRoles(this.queryParams.orgId);
+    // await this.loadtypes();
+    // this.loadPlanList();
+    // await this.refresh();
   },
+
   methods: {
     getLabel,
     dayjs,
@@ -500,23 +522,7 @@ export default {
         return "color:" + color;
       }
     },
-  },
-  async mounted() {
-    this.queryParams.orgId=this.orgId
-    console.info("this.queryParams.orgId",this.queryParams.orgId)
-    // let tabs=this.$tab;
-    // debugger
-    // const { params, query } = this.$route;
-    // if (this.loginUser && this.loginUser.org && this.loginUser.org.id) {
-    //   if (query == undefined || query.orgId == undefined) {
-    //     this.queryParams.orgId = this.loginUser.org.id;
-    //   }
-    // }
-    // this.loadRoles(this.queryParams.orgId);
-    // await this.loadtypes();
-    // this.loadPlanList();
-    // await this.refresh();
-  },
+  }
 };
 </script>
 
@@ -524,4 +530,4 @@ export default {
 .el-form--inline .el-form-item {
   display: inline-flex;
 }
-</style>
+</style>