添加复运时间验证

ygtx-ui/src/views/gxt/gxtOrder/index.vue

@@ -134,7 +134,7 @@
             plain
             icon="Plus"
             @click="handleBackFilling"
-            v-hasPermi="['gxt:maintenance:order:add']"
+            v-hasPermi="['gxt:maintenance:order:backfill']"
         >补录工单</el-button>
       </el-col>
 <!--      <el-col :span="1.5">-->
@@ -188,11 +188,11 @@
           <dict-tag :options="gxt_work_order_status" :value="scope.row.workOrderStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="录入类别" align="center" prop="workOrderStatus" min-width="100">
-        <template #default="scope">
-          {{ scope.row.orderEntryType == '1' ? '新建工单' : '补录工单' }}
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="录入类别" align="center" prop="workOrderStatus" min-width="100">-->
+<!--        <template #default="scope">-->
+<!--          {{ scope.row.orderEntryType == '1' ? '新建工单' : '补录工单' }}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="结单方式" align="center" prop="finalizeMethod" min-width="100">
         <template #default="scope">
           <dict-tag v-if="scope.row.finalizeMethod"  :options="gxt_finalize_method" :value="scope.row.finalizeMethod"/>
@@ -900,16 +900,19 @@
 <!--              <el-form-item label="机型">-->
 <!--                <el-input v-model="restartForm.model" disabled />-->
 <!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="12">-->
+<!--              <el-form-item label="开始时间"><el-input v-model="restartForm.realStartTime" disabled /> </el-form-item>-->
 <!--            </el-col>-->
             <el-col :span="12">
-              <el-form-item label="开始时间"><el-input v-model="restartForm.realStartTime" disabled /> </el-form-item>
+              <el-form-item label="停机时间"><el-input v-model="restartForm.pauseTime" disabled /> </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="restartForm.infoEntry == '1'">
+            <el-col :span="12" v-if="restartForm.misNo">
               <el-form-item label="MIS工单编码">
                 <el-input v-model="restartForm.misNo" disabled />
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="restartForm.infoEntry == '2'">
+            <el-col :span="12" v-if="restartForm.workPermitNum">
               <el-form-item label="工作票编号">
                 <el-input v-model="restartForm.workPermitNum" disabled />
               </el-form-item>
@@ -1954,11 +1957,12 @@ const data = reactive({
       { required: true, message: "请选择恢复运行时间", trigger: "change" },
       {
         validator: (rule, value, callback) => {
-          debugger
-          if (value && new Date(value) > new Date()) {
+          if(restartForm.value.pauseTime == '' || restartForm.value.pauseTime == null) {
+            callback(new Error('请先进行停机操作'));
+          } else if (value && new Date(value) > new Date()) {
             callback(new Error('恢复运行时间不能大于当前时间'));
-          // } else if(value && new Date(value) < new Date(restartForm.value.realEndTime)) {
-          //   callback(new Error('恢复运行时间不能小于结束时间'));
+          } else if(value && new Date(value) < new Date(restartForm.value.pauseTime)) {
+            callback(new Error('恢复运行时间不能小于停机时间'));
           } else {
             callback();
           }
@@ -2511,6 +2515,16 @@ function handleRestart(row) {
   getGxtOrder(row.id).then(response => {
     restartForm.value = response.data
     restartForm.value.orderId = row.id
+    if (!restartForm.value.pauseTime || restartForm.value.pauseTime == null) {
+      ElMessageBox.confirm('请先进行停机操作', '提示', {
+        confirmButtonText: '确定',
+        showCancelButton: '取消',
+        type: 'warning'
+      }).then(function() {
+        restartDialogVisible.value = false
+      }).then(() => {
+      }).catch(() => {})
+    }
     restartDialogVisible.value = true
     // 打开对话框后重置表单验证错误
     proxy.resetForm("restartRef")

ygtx-ui/src/views/gxt/orderMyTodo/index.vue

@@ -948,9 +948,14 @@
           <el-col :span="12">
             <el-form-item label="发生时间"><el-input v-model="restartRepairForm.occurTime" disabled /> </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-if="restartRepairForm.misOrderNo">
             <el-form-item label="MIS工单编码"><el-input v-model="restartRepairForm.misOrderNo" disabled /> </el-form-item>
           </el-col>
+          <el-col :span="12" v-if="restartRepairForm.workPermitNum">
+            <el-form-item label="工作票编号">
+              <el-input v-model="restartRepairForm.workPermitNum" disabled />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="恢复运行时间" prop="restartTime">
               <el-date-picker
@@ -1010,11 +1015,27 @@
           <el-col :span="12">
             <el-form-item label="品牌"><el-input v-model="restartWorkForm.brand" disabled /> </el-form-item>
           </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="机型"><el-input v-model="restartWorkForm.model" disabled /> </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="MIS工单编码"><el-input v-model="restartWorkForm.misNo" disabled /></el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="开始时间"><el-input v-model="restartWorkForm.realStartTime" disabled /> </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="12">
-            <el-form-item label="机型"><el-input v-model="restartWorkForm.model" disabled /> </el-form-item>
+            <el-form-item label="停机时间"><el-input v-model="restartWorkForm.pauseTime" disabled /> </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="MIS工单编码"><el-input v-model="restartWorkForm.misNo" disabled /></el-form-item>
+          <el-col :span="12" v-if="restartWorkForm.misNo">
+            <el-form-item label="MIS工单编码">
+              <el-input v-model="restartWorkForm.misNo" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="restartWorkForm.workPermitNum">
+            <el-form-item label="工作票编号">
+              <el-input v-model="restartWorkForm.workPermitNum" disabled />
+            </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="恢复运行时间" prop="restartTime">
@@ -1735,8 +1756,8 @@ const restartRepairRules = ref({
       validator: (rule, value, callback) => {
         if (value && new Date(value) > new Date()) {
           callback(new Error('恢复运行时间不能大于当前时间'));
-        // } else if(value && new Date(value) < new Date(restartRepairForm.value.realEndTime)) {
-        //   callback(new Error('恢复运行时间不能小于结束时间'));
+        } else if(value && new Date(value) < new Date(restartRepairForm.value.occurTime)) {
+          callback(new Error('恢复运行时间不能小于发生时间'));
         } else {
           callback();
         }
@@ -1754,10 +1775,12 @@ const restartWorkRules = ref({
     { required: true, message: "请选择恢复运行时间", trigger: "change" },
     {
       validator: (rule, value, callback) => {
-        if (value && new Date(value) > new Date()) {
+        if(restartWorkForm.value.pauseTime == '' || restartWorkForm.value.pauseTime == null) {
+          callback(new Error('请先进行停机操作'));
+        } else if (value && new Date(value) > new Date()) {
           callback(new Error('恢复运行时间不能大于当前时间'));
-        // } else if(value && new Date(value) < new Date(restartWorkForm.value.realEndTime)) {
-        //   callback(new Error('恢复运行时间不能小于结束时间'));
+        } else if(value && new Date(value) < new Date(restartWorkForm.value.pauseTime)) {
+          callback(new Error('恢复运行时间不能小于停机时间'));
         } else {
           callback();
         }
@@ -2488,10 +2511,23 @@ function handleRestart(row) {
       // 维修工单
       restartRepairForm.value = response.data;
       restartRepairDialogVisible.value = true;
+      proxy.resetForm("restartRepairFormRef")
     } else {
       // 维保工单
       restartWorkForm.value = response.data;
+      if (!restartWorkForm.value.pauseTime || restartWorkForm.value.pauseTime == null) {
+        ElMessageBox.confirm('请先进行停机操作', '提示', {
+          confirmButtonText: '确定',
+          showCancelButton: '取消',
+          type: 'warning'
+        }).then(function() {
+          restartWorkDialogVisible.value = false
+        }).then(() => {
+        }).catch(() => {})
+      }
       restartWorkDialogVisible.value = true;
+      // 打开对话框后重置表单验证错误
+      proxy.resetForm("restartWorkFormRef")
     }
   });
 }

ygtx-ui/src/views/gxt/repairOrder/index.vue

@@ -1095,10 +1095,10 @@
           <el-col :span="12">
             <el-form-item label="发生时间"><el-input v-model="restartForm.occurTime" disabled /> </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="restartForm.infoEntry == '1'">
+          <el-col :span="12" v-if="restartForm.misOrderNo">
             <el-form-item label="MIS工单编码"><el-input v-model="restartForm.misOrderNo" disabled /> </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="restartForm.infoEntry == '2'">
+          <el-col :span="12" v-if="restartForm.workPermitNum">
             <el-form-item label="工作票编号">
               <el-input v-model="restartForm.workPermitNum" disabled />
             </el-form-item>
@@ -2327,8 +2327,8 @@ const restartRules = ref({
         debugger
         if (value && new Date(value) > new Date()) {
           callback(new Error('恢复运行时间不能大于当前时间'));
-        // } else if(value && new Date(value) < new Date(restartForm.value.realEndTime)) {
-        //   callback(new Error('恢复运行时间不能小于结束时间'));
+        } else if(value && new Date(value) < new Date(restartForm.value.occurTime)) {
+          callback(new Error('恢复运行时间不能小于发生时间'));
         } else {
           callback();
         }
@@ -3694,6 +3694,8 @@ function handleRestart(row) {
   getRepairOrder(row.id).then(response => {
     restartForm.value = response.data
     restartDialogVisible.value = true
+    // 打开对话框后重置表单验证错误
+    proxy.resetForm("restartRef")
   })
 }