Просмотр исходного кода

fix: 修复时间筛选条件,多查询一天的问题 add(1, 'day').format('YYYYMMDD000000') --> format('YYYYMMDD235959')

yunxing 4 лет назад
Родитель
Сommit
3826ae4863

+ 1 - 1
src/views/equipment/table/otherTable.vue

@@ -143,7 +143,7 @@ export default {
             if (this.handledate) {
                 getParams.data.handledateStartDate = this.handledate[0] + '000000'
                 // getParams.data.handledateEndDate = this.handledate[1] + '000000'
-                getParams.data.handledateEndDate = moment(this.handledate[1]).add(1, 'day').format('YYYYMMDD000000')
+                getParams.data.handledateEndDate = moment(this.handledate[1]).format('YYYYMMDD235959')
             }
             //下拉
             if (this.handleresults && this.handleresults != 1) {

+ 4 - 4
src/views/equipment/table/rcwbTable.vue

@@ -304,25 +304,25 @@ export default {
             if (this.ycgdtbsj) {
                 data.reportdateStartDate = this.ycgdtbsj[0] + '000000'
                 // data.reportdateEndDate = this.ycgdtbsj[1] + '000000'
-                data.reportdateEndDate = moment(this.ycgdtbsj[1]).add(1, 'day').format('YYYYMMDD000000')
+                data.reportdateEndDate = moment(this.ycgdtbsj[1]).format('YYYYMMDD235959')
             }
             //工单验收时间
             if (this.ycgdyssj) {
                 data.sjjssjStartDate = this.ycgdyssj[0] + '000000'
                 // data.sjjssjEndDate = this.ycgdyssj[1] + '000000'
-                data.sjjssjEndDate = moment(this.ycgdyssj[1]).add(1, 'day').format('YYYYMMDD000000')
+                data.sjjssjEndDate = moment(this.ycgdyssj[1]).format('YYYYMMDD235959')
             }
             //任务开始时间
             if (this.reportdate) {
                 data.sjkssjStartDate = this.reportdate[0] + '000000'
                 // data.sjkssjEndDate = this.reportdate[1] + '000000'
-                data.sjkssjEndDate = moment(this.reportdate[1]).add(1, 'day').format('YYYYMMDD000000')
+                data.sjkssjEndDate = moment(this.reportdate[1]).format('YYYYMMDD235959')
             }
             //任务完成时间
             if (this.complete) {
                 data.sjwcsjStartDate = this.complete[0] + '000000'
                 // data.sjwcsjEndDate = this.complete[1] + '000000'
-                data.sjwcsjEndDate = moment(this.complete[1]).add(1, 'day').format('YYYYMMDD000000')
+                data.sjwcsjEndDate = moment(this.complete[1]).format('YYYYMMDD235959')
             }
             //输入框
             data.keyword = ''

+ 2 - 2
src/views/equipment/table/rcwxTable.vue

@@ -292,13 +292,13 @@ export default {
       if (this.reportdate) {
         getParams.data.schedfinishStartDate = this.reportdate[0] + "000000";
         // getParams.data.schedfinishEndDate = this.reportdate[1] + "000000";
-        getParams.data.schedfinishEndDate = moment(this.reportdate[1]).add(1, 'day').format('YYYYMMDD000000')
+        getParams.data.schedfinishEndDate = moment(this.reportdate[1]).format('YYYYMMDD235959')
       }
       //   实际完工日期
       if (this.sjjssj) {
         getParams.data.wotjyssjStartDate = this.sjjssj[0] + "000000";
         // getParams.data.wotjyssjEndDate = this.sjjssj[1] + "000000";
-        getParams.data.wotjyssjEndDate = moment(this.sjjssj[1]).add(1, 'day').format('YYYYMMDD000000')
+        getParams.data.wotjyssjEndDate = moment(this.sjjssj[1]).format('YYYYMMDD235959')
       }
       if (this.source && this.source != "全部") {
         getParams.data.bxfwlymc = this.source;

+ 2 - 2
src/views/equipment/table/wbTable.vue

@@ -242,13 +242,13 @@ export default {
             if (this.sjjssj) {
                 getParams.data.sjjssjStartDate = this.sjjssj[0] + '000000'
                 // getParams.data.sjjssjEndDate = this.sjjssj[1] + '000000'
-                getParams.data.sjjssjEndDate = moment(this.sjjssj[1]).add(1, 'day').format('YYYYMMDD000000')
+                getParams.data.sjjssjEndDate = moment(this.sjjssj[1]).format('YYYYMMDD235959')
             }
             // 填报时间
             if (this.reportdate) {
                 getParams.data.reportdateStartDate = this.reportdate[0] + '000000'
                 // getParams.data.reportdateEndDate = this.reportdate[1] + '000000'
-                getParams.data.reportdateEndDate = moment(this.reportdate[1]).add(1, 'day').format('YYYYMMDD000000')
+                getParams.data.reportdateEndDate = moment(this.reportdate[1]).format('YYYYMMDD235959')
             }
             //输入框
             getParams.data.keyword = ''

+ 2 - 2
src/views/equipment/table/wxTable.vue

@@ -232,13 +232,13 @@ export default {
             if (this.sjjssj) {
                 getParams.data.sjjssjStartDate = this.sjjssj[0] + '000000'
                 // getParams.data.sjjssjEndDate = this.sjjssj[1] + '000000'
-                getParams.data.sjjssjEndDate = moment(this.sjjssj[1]).add(1, 'day').format('YYYYMMDD000000')
+                getParams.data.sjjssjEndDate = moment(this.sjjssj[1]).format('YYYYMMDD235959')
             }
             // 填报日期
             if (this.reportdate) {
                 getParams.data.reportdateStartDate = this.reportdate[0] + '000000'
                 // getParams.data.reportdateEndDate = this.reportdate[1] + '000000'
-                getParams.data.reportdateEndDate = moment(this.reportdate[1]).add(1, 'day').format('YYYYMMDD000000')
+                getParams.data.reportdateEndDate = moment(this.reportdate[1]).format('YYYYMMDD235959')
             }
             //输入框搜索
             getParams.data.keyword = ''

+ 2 - 2
src/views/equipment/table/zwTable.vue

@@ -293,13 +293,13 @@ export default {
             if (this.yssjwcsj) {
                 getParams.data.yssjwcsjStartDate = this.yssjwcsj[0] + '000000'
                 // getParams.data.yssjwcsjEndDate = this.yssjwcsj[1] + '000000'
-                getParams.data.yssjwcsjEndDate = moment(this.yssjwcsj[1]).add(1, 'day').format('YYYYMMDD000000')
+                getParams.data.yssjwcsjEndDate = moment(this.yssjwcsj[1]).format('YYYYMMDD235959')
             }
             // 立项日期
             if (this.lxsjwcsj) {
                 getParams.data.lxsjwcsjStartDate = this.lxsjwcsj[0] + '000000'
                 // getParams.data.lxsjwcsjEndDate = this.lxsjwcsj[1] + '000000'
-                getParams.data.lxsjwcsjEndDate = moment(this.lxsjwcsj[1]).add(1, 'day').format('YYYYMMDD000000')
+                getParams.data.lxsjwcsjEndDate = moment(this.lxsjwcsj[1]).format('YYYYMMDD235959')
             }
             if (this.status && this.status != 1) {
                 getParams.data.status = this.status

+ 1 - 1
src/views/other/gcfzDialog.vue

@@ -97,7 +97,7 @@ export default {
             if (this.dateVal.length > 0) {
                 getParams.recordtimeStartDate = this.dateVal[0] + '000000'
                 // getParams.recordtimeEndDate = this.dateVal[1] + '000000'
-                getParams.recordtimeStartDate = moment(this.dateVal[1]).add(1, 'day').format('YYYYMMDD000000')
+                getParams.recordtimeStartDate = moment(this.dateVal[1]).format('YYYYMMDD235959')
             }
             queryfzyfchange({ getParams }).then((res) => {
                 if (res.result == 'success') {

+ 1 - 1
src/views/other/zhsxOtherTable1.vue

@@ -209,7 +209,7 @@ export default {
             if (this.dateVal) {
                 getParams.createdateStartDate = this.dateVal[0] + '000000'
                 // getParams.createdateEndDate = this.dateVal[1] + '000000'
-                getParams.createdateEndDate = moment(this.dateVal[1]).add(1, 'day').format('YYYYMMDD000000')
+                getParams.createdateEndDate = moment(this.dateVal[1]).format('YYYYMMDD235959')
             }
             queryGlams({ getParams }).then((res) => {
                 if (res.result == 'success') {

+ 6 - 6
src/views/room/index.vue

@@ -827,12 +827,12 @@ export default {
       if (this.reportdate) {
         getParams.data.schedfinishStartDate = this.reportdate[0] + "000000";
         // getParams.data.schedfinishEndDate = this.reportdate[1] + "000000";
-        getParams.data.schedfinishEndDate = moment(this.reportdate[1]).add(1, 'day').format('YYYYMMDD000000')
+        getParams.data.schedfinishEndDate = moment(this.reportdate[1]).format('YYYYMMDD235959')
       }
       if (this.real) {
         getParams.data.wotjyssjStartDate = this.real[0] + "000000";
         // getParams.data.wotjyssjEndDate = this.real[1] + "000000";
-        getParams.data.wotjyssjEndDate = moment(this.real[1]).add(1, 'day').format('YYYYMMDD000000')
+        getParams.data.wotjyssjEndDate = moment(this.real[1]).format('YYYYMMDD235959')
       }
       if (this.source && this.source != "全部") {
         // getParams.data.bxfwlymc = this.source;
@@ -896,25 +896,25 @@ export default {
       if (this.rwksrq) {
         data.sjkssjStartDate = this.rwksrq[0] + "000000";
         // data.sjkssjEndDate = this.rwksrq[1] + "000000";
-        data.sjkssjEndDate = moment(this.rwksrq[1]).add(1, 'day').format('YYYYMMDD000000')
+        data.sjkssjEndDate = moment(this.rwksrq[1]).format('YYYYMMDD235959')
       }
       // 任务完成日期
       if (this.rwwcrq) {
         data.sjwcsjStartDate = this.rwwcrq[0] + "000000";
         // data.sjwcsjEndDate = this.rwwcrq[1] + "000000";
-        data.sjwcsjEndDate = moment(this.rwwcrq[1]).add(1, 'day').format('YYYYMMDD000000')
+        data.sjwcsjEndDate = moment(this.rwwcrq[1]).format('YYYYMMDD235959')
       }
       // 异常工单填报时间
       if (this.ycgdtbsj) {
         data.reportdateStartDate = this.ycgdtbsj[0] + "000000";
         // data.reportdateEndDate = this.ycgdtbsj[1] + "000000";
-        data.reportdateEndDate = moment(this.ycgdtbsj[1]).add(1, 'day').format('YYYYMMDD000000')
+        data.reportdateEndDate = moment(this.ycgdtbsj[1]).format('YYYYMMDD235959')
       }
       // 异常工单验收时间
       if (this.ycgdyssj) {
         data.sjjssjStartDate = this.ycgdyssj[0] + "000000";
         // data.sjjssjEndDate = this.ycgdyssj[1] + "000000";
-        data.sjjssjEndDate = moment(this.ycgdyssj[1]).add(1, 'day').format('YYYYMMDD000000')
+        data.sjjssjEndDate = moment(this.ycgdyssj[1]).format('YYYYMMDD235959')
       }
       //
       // 是否正常