From f5d88e4f31bec1d77721c0795afde3f3a571e9aa Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 11 Aug 2021 15:55:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/dispatch/dispatchChildoperableSee.vue | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/views/dispatch/dispatchChildoperableSee.vue b/src/views/dispatch/dispatchChildoperableSee.vue
index 77bb38a..d7ff409 100644
--- a/src/views/dispatch/dispatchChildoperableSee.vue
+++ b/src/views/dispatch/dispatchChildoperableSee.vue
@@ -743,21 +743,22 @@
// console.log(page);
console.log(this.userInfo, "userInfo");
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,
- };
- }
+ // const { releaseTimeRange } = this.query1;
+ // if (releaseTimeRange) {
+ values = {
+ ...params,
+ // beginTime: releaseTimeRange[0],
+ // overTime: releaseTimeRange[1],
+ userIds: this.userInfo.user_id,
+ ...this.query,
+ };
+ // values.releaseTimeRange = null;
+ // } else {
+ // values = {
+ // ...params,
+ // ...this.query,
+ // };
+ // }
// values
--
Gitblit v1.9.3