From cc03d2d54e4cd3991930a7bbcaa67691a79e1304 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 06 Aug 2021 17:09:09 +0800
Subject: [PATCH] 派遣时间范围搜索，单位附件上传 ++
---
src/views/dispatch/dispatchChildoperable.vue | 68 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index fd346fc..d42a35b 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -232,6 +232,7 @@
search: true,
overHidden: true,
type: "tree",
+ searchSpan: 5,
cascaderItem: ["name"],
// cascaderItem: ["city", "area"],
props: {
@@ -253,6 +254,8 @@
prop: "name",
labelWidth: 120,
type: "tree",
+ search: true,
+ searchSpan: 5,
cell: true,
props: {
label: "realName",
@@ -340,7 +343,7 @@
valueFormat: "yyyy-MM-dd hh:mm:ss",
labelWidth: 120,
searchSpan: 4,
- search: true,
+ // search: true,
overHidden: true,
rules: [
{
@@ -369,6 +372,28 @@
// search: true,
// searchSpan: 5,
// overHidden: true
+ },
+ {
+ label: "派遣时间",
+ prop: "releaseTimeRange",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ searchValue: [this.getStartTime(), this.getEndTime()],
+ searchRange: true,
+ searchSpan: 5,
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入时间",
+ trigger: "blur",
+ },
+ ],
},
{
label: "派遣地址",
@@ -684,6 +709,26 @@
this.onLoad1(this.page1, this.query1);
},
+ getStartTime() {
+ if (
+ this.$route.query.startTime != undefined &&
+ this.$route.query.startTime != null &&
+ this.$route.query.startTime != ""
+ ) {
+ return this.$route.query.startTime;
+ }
+ return "";
+ },
+ getEndTime() {
+ if (
+ this.$route.query.endTime != undefined &&
+ this.$route.query.endTime != null &&
+ this.$route.query.endTime != ""
+ ) {
+ return this.$route.query.endTime;
+ }
+ return "";
+ },
//
onLoad1(page, params = {}) {
this.loading1 = true;
@@ -693,10 +738,29 @@
// params["dispatcherUnitId"] = this.id;
// console.log(params, "get");
// console.log(page);
+ var values;
+ const { releaseTimeRange } = this.query1;
+ if (releaseTimeRange) {
+ values = {
+ ...params,
+ beginTime: releaseTimeRange[0],
+ overTime: releaseTimeRange[1],
+ ...this.query,
+ };
+ values.releaseTimeRange = null;
+ } else {
+ values = {
+ ...params,
+ ...this.query,
+ };
+ }
+
+ console.log(values);
getdata1(
page.currentPage,
page.pageSize,
- Object.assign(params, this.query)
+ // Object.assign(params, this.query)
+ values
).then((res) => {
// console.log(res);
const data = res.data.data;
--
Gitblit v1.9.3