diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue index cb9b7c2..f64a319 100644 --- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue +++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue @@ -127,11 +127,11 @@ - - - @@ -385,7 +385,7 @@ saveData: { deep: true, handler: function (newV, oldV) { - this.saveData.workTime = Math.ceil(Math.floor(this.dayjs(this.saveData.endDate).diff(this.saveData.startDate, 'seconds') / 30) / 2) + this.saveData.workTime = Math.ceil(Math.floor(this.dayjs(this.saveData.endDate2).diff(this.saveData.startDate2, 'seconds') / 30) / 2) } }, searchData: { @@ -642,8 +642,8 @@ buNo: '', orderNo: '', planOperatorName: '', - startDate: '', - endDate: '', + startDate2: '', + endDate2: '', workTime: '', remark: '', mesUser: '', @@ -1276,8 +1276,8 @@ checkResult: '', functionType: 'A', propertiesCode: row.propertiesCode, - startDate: new Date(), - endDate: '' + startDate2: this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'), + endDate2: '' } this.getInspectionFormData() this.queryHistoryRecord() @@ -1290,11 +1290,11 @@ this.$message.warning('请选择点检结论!') return } - if (this.saveData.startDate === ''|| this.saveData.startDate == null) { + if (this.saveData.startDate2 === ''|| this.saveData.startDate2 == null) { this.$message.warning('请输入开始时间!') return } - if (this.saveData.endDate === ''|| this.saveData.endDate == null) { + if (this.saveData.endDate2 === ''|| this.saveData.endDate2 == null) { this.$message.warning('请输入结束时间!') return }