|
|
@@ -2,15 +2,15 @@
|
|
|
<div class="app-container">
|
|
|
<el-row :gutter="10">
|
|
|
<!--机构数据-->
|
|
|
- <el-col :span="4" :xs="24">
|
|
|
+ <!-- <el-col :span="4" :xs="24">
|
|
|
<org-tree
|
|
|
v-model="queryParams.orgId"
|
|
|
@defaultOrg="getDefaultOrg"
|
|
|
@checkChange="checkChange"
|
|
|
@click="clickTreeNode"
|
|
|
></org-tree>
|
|
|
- </el-col>
|
|
|
- <el-col :span="20" :xs="24">
|
|
|
+ </el-col> -->
|
|
|
+ <el-col :span="24" :xs="24">
|
|
|
<div class="main-right-box">
|
|
|
<!-- 搜索条件 -->
|
|
|
<div class="main-search-box">
|
|
|
@@ -20,8 +20,24 @@
|
|
|
size="small"
|
|
|
:inline="true"
|
|
|
v-show="showSearch"
|
|
|
- label-width="100px"
|
|
|
>
|
|
|
+ <el-form-item label="任务名称" prop="orgId">
|
|
|
+ <div style="display: flex; width: 460px">
|
|
|
+ <div style="width: 300px; margin-right: 10px">
|
|
|
+ <orgDropDown
|
|
|
+ v-model="queryParams.orgId"
|
|
|
+ placeholder="选择机构"
|
|
|
+ @select="clickTreeNode"
|
|
|
+ orgTreeType="org"
|
|
|
+ />
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <el-checkbox v-model="queryParams.checkSub"
|
|
|
+ >关联下级所有数据</el-checkbox
|
|
|
+ >
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
<!-- <el-row>
|
|
|
<el-col :span="5"> -->
|
|
|
<el-form-item label="任务名称" prop="planId">
|
|
|
@@ -132,7 +148,6 @@
|
|
|
<el-table-column
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- type="index"
|
|
|
fixed
|
|
|
width="60px"
|
|
|
label="序号"
|
|
|
@@ -270,6 +285,7 @@ import { mapGetters } from "vuex";
|
|
|
import DialogDetail from "./dialog.detail";
|
|
|
import DialogScanRecord from "./dialog.scanrecord";
|
|
|
import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
|
|
|
+import orgDropDown from "@/components/orgTree/orgDropDown.vue";
|
|
|
import OrgTree from "@/components/orgTree";
|
|
|
import * as api from "@/api/resumption/taskManger.js";
|
|
|
import { getLabel } from "@/views/commonOption.js";
|
|
|
@@ -278,7 +294,13 @@ import dayjs from "dayjs";
|
|
|
export default {
|
|
|
name: "overviewDetialList",
|
|
|
dicts: ["resumption_plan_cycle", "resumption_status"],
|
|
|
- components: { DialogDetail, DialogScanRecord, DataRangePicker, OrgTree },
|
|
|
+ components: {
|
|
|
+ DialogDetail,
|
|
|
+ DialogScanRecord,
|
|
|
+ DataRangePicker,
|
|
|
+ OrgTree,
|
|
|
+ orgDropDown,
|
|
|
+ },
|
|
|
data() {
|
|
|
let sDate = new Date();
|
|
|
let eDate = new Date();
|
|
|
@@ -345,7 +367,7 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
computed: {
|
|
|
- ...mapGetters(["orgName"]),
|
|
|
+ ...mapGetters(["orgName","orgId"]),
|
|
|
},
|
|
|
methods: {
|
|
|
getLabel,
|
|
|
@@ -396,6 +418,9 @@ export default {
|
|
|
},
|
|
|
// 节点单击事件
|
|
|
clickTreeNode(data) {
|
|
|
+ if(data==null){
|
|
|
+ return;
|
|
|
+ }
|
|
|
this.queryParams.orgId = data.id;
|
|
|
this.selectedOrgName = data.shortName;
|
|
|
this.loadPlanList();
|
|
|
@@ -484,6 +509,8 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
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;
|