From 998b75f0d4aaed03001ec4246cd4f3b4b0743b7e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 23 Nov 2022 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/taskinfo/taskinfoPlan.vue | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/views/taskinfo/taskinfoPlan.vue b/src/views/taskinfo/taskinfoPlan.vue
index d56720c..95f34ef 100644
--- a/src/views/taskinfo/taskinfoPlan.vue
+++ b/src/views/taskinfo/taskinfoPlan.vue
@@ -1,6 +1,6 @@
<template>
<basic-container>
- <avue-crud v-show="!isSetPlanUser" :option="option"
+ <avue-crud v-show="!isSetPlanUser&&!detailVisible" :option="option"
:table-loading="loading"
:data="data"
:page.sync="page"
@@ -11,6 +11,7 @@
@row-update="rowUpdate"
@row-save="rowSave"
@row-del="rowDel"
+ @row-dblclick="rowClick"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@@ -61,21 +62,25 @@
</template>
</avue-crud>
+ <!--设置巡检人-->
<taskplan-user v-show="isSetPlanUser" ref="taskplanUser" @setPlanUser="setPlanUser"></taskplan-user>
+ <!--查看详情-->
+ <taskinfo-plan-detail v-if="detailVisible" ref="detailVisible" :detailInfo="detailInfo" @isDetail="isDetail"></taskinfo-plan-detail>
</basic-container>
</template>
<script>
- import {getList, getDetail, add, update, remove, changeStatus} from "@/api/taskinfo/taskinfoPlan";
+ import {getList, add, update, remove, changeStatus} from "@/api/taskinfo/taskinfoPlan";
import option from "@/const/taskinfo/taskinfoPlan";
import {mapGetters} from "vuex";
import TaskplanUser from "@/views/taskinfo/taskplanUser";
import OpenLayersMap from "@/components/OpenLayersMap/index";
+ import TaskinfoPlanDetail from "@/views/taskinfo/taskinfoPlanDetail";
export default {
- components: {TaskplanUser,OpenLayersMap},
+ components: {TaskinfoPlanDetail, TaskplanUser,OpenLayersMap},
data() {
return {
isSetPlanUser:false,
@@ -89,7 +94,9 @@
},
selectionList: [],
option: option,
- data: []
+ data: [],
+ detailVisible:false,
+ detailInfo:{},
};
},
computed: {
@@ -179,6 +186,8 @@
beforeOpen(done, type) {
if (["add"].includes(type)) {
this.form.status = 2
+ }else if (["edit"].includes(type)) {
+ this.form.routeRange = '\'' + this.form.routeRange + '\''
}
done();
},
@@ -188,6 +197,11 @@
},
searchChange(params, done) {
this.query = params;
+ if (this.query.daterange){
+ this.query.startCreateTime = this.query.daterange[0]
+ this.query.endCreateTime = this.query.daterange[1]
+ this.query.daterange = null
+ }
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
@@ -243,6 +257,14 @@
toData(toData) {
this.form.routeRange = toData
},
+ //点击当前行事件
+ rowClick(val){
+ this.detailInfo = val
+ this.isDetail();
+ },
+ isDetail(){
+ this.detailVisible = !this.detailVisible
+ }
}
};
</script>
--
Gitblit v1.9.3