2024-02-04

正式提交2

src/views/modules/reportWorkOrder/reportCheckOrder.vue

@@ -127,11 +127,11 @@
           <el-input v-model="saveData.planOperatorName" disabled style="width: 221px"></el-input>
         </el-form-item>
         <el-form-item :label="'执行日期：'">
-          <el-date-picker style="width: 160px" v-model="saveData.startDate" type="datetime" :editable="false" @focus='elDatePickerOnFocus'
+          <el-date-picker style="width: 160px" v-model="saveData.startDate2" type="datetime" :editable="false" @focus='elDatePickerOnFocus'
                           value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="开始时间">
           </el-date-picker>
           -
-          <el-date-picker style="width: 160px" v-model="saveData.endDate" type="datetime" :editable="false" @focus='elDatePickerOnFocus'
+          <el-date-picker style="width: 160px" v-model="saveData.endDate2" type="datetime" :editable="false" @focus='elDatePickerOnFocus'
                           value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="结束时间">
           </el-date-picker>
         </el-form-item>
@@ -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: '',
@@ -1268,8 +1268,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()
@@ -1282,11 +1282,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
         }