Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

Administrator

2021-08-11 f5d88e4f31bec1d77721c0795afde3f3a571e9aa

 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