点检、巡检、保养计划校验

src/views/device/deviceOrder/index.vue

@@ -948,12 +948,14 @@ export default {
       }
 
       this.$modal.confirm('是否确认删除计划工单编号为"' + orderCodes + '"的数据项？').then(function () {
-        return delDeviceOrder(orderIds);
+        delDeviceOrder(orderIds).then(response => {
-      }).then(() => {
+          if (response.code != 500) {
-        this.getList();
             this.$modal.msgSuccess("删除成功");
+            this.getList();
+          }
         }).catch(() => {
         });
+      })
     },
     /** 导出按钮操作 */
     handleExport() {

src/views/device/inspectionPlan/index.vue

@@ -377,18 +377,18 @@
           <!-- 巡检计划基本信息 -->
           <div class="my-step-body" v-if="inspectionPlanStep==0">
             <el-row>
-              <el-col :span="8" offset="2">
+              <el-col :span="8" :offset="2">
                 <el-form-item label="计划名称">
                   <el-input v-model="form.planName" placeholder="请输入计划名称"/>
                 </el-form-item>
               </el-col>
-              <el-col :span="6" :offset="2">
+              <el-col :span="8" :offset="1">
                 <el-form-item label="循环周期">
-                  <el-input v-model="form.planLoop" placeholder="请输入循环周期"/>
+                  <el-input-number v-model="form.planLoop" label=""></el-input-number>
                 </el-form-item>
               </el-col >
               <el-col :span="2">
-                <el-select v-model="form.planLoopType" placeholder="周期" clearable>
+                <el-select v-model="form.planLoopType" placeholder="周期">
                   <el-option
                     v-for="dict in dict.type.device_loop_type"
                     :key="dict.value"
@@ -399,9 +399,9 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="8" offset="2">
+              <el-col :span="8" :offset="2">
                 <el-form-item label="计划状态">
-                  <el-select v-model="form.planStatus" placeholder="计划状态" clearable>
+                  <el-select v-model="form.planStatus" placeholder="计划状态">
                     <el-option
                       v-for="dict in dict.type.sys_normal_disable"
                       :key="dict.value"
@@ -411,9 +411,9 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" offset="2">
+              <el-col :span="8" :offset="1">
                 <el-form-item label="车间">
-                  <el-select @change="changeCenter" v-model="form.planWorkshop" placeholder="请选择车间" clearable>
+                  <el-select @change="changeCenter" v-model="form.planWorkshop" placeholder="请选择车间">
                     <el-option
                       v-for="item in workCenterList"
                       :key="item.factoryCode"
@@ -1009,15 +1009,48 @@ export default {
     stepLast() {
       this.inspectionPlanStep--;
     },
-    // 步骤-下一步-检验工作中心
+    // 下一步
     stepNext() {
+      // 校验
+      if (this.inspectionPlanStep == 0) {
+        if (this.form.planName == null) {
+          this.$message({
+            message: "计划名称不能为空！",
+            type: "warning"
+          })
+          return
+        }
+        if (this.form.planLoop <= 0) {
+          this.$message({
+            message: "循环周期不可小于等于’0‘！",
+            type: "warning"
+          })
+          return
+        }
+        if (this.form.planTimeArray.length == 0) {
+          this.$message({
+            message: "循环时间范围不能为空！",
+            type: "warning"
+          })
+          return
+        }
         if (this.form.planWorkshop == null) {
           this.$message({
-          message: '请选择工作中心！',
+            message: "车间不能为空！",
-          type: 'warning'
+            type: "warning"
+          })
+          return
+        }
+      }
+      if (this.inspectionPlanStep == 1) {
+        if (this.form.equipmentItem.length == 0) {
+          this.$message({
+            message: "请选择设备！",
+            type: "warning"
           })
           return
         }
+      }
       this.inspectionPlanStep++;
     },
     /** 查询计划列表 */
@@ -1153,46 +1186,15 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      // 检验
+      this.$refs["form"].validate(valid => {
-      if (this.form.planName == null) {
+        if (valid) {
-        this.$message({
+          if (this.selectPersonList.length == 0) {
-          message: '计划名称不能为空！',
-          type: 'warning'
-        })
-        return
-      }
-      if (this.form.planLoop == null) {
-        this.$message({
-          message: '循环周期不能为空！',
-          type: 'warning'
-        })
-        return
-      }
-      if (this.form.planLoopType == null) {
-        this.$message({
-          message: '请选择循环周期类型！',
-          type: 'warning'
-        })
-        return
-      }
-      if (this.form.planStatus == null) {
-        this.$message({
-          message: '请选择计划状态！',
-          type: 'warning'
-        })
-        return
-      }
-      if (this.form.planTimeArray.length == 0) {
             this.$message({
-          message: '请选择计划执行时间！',
+              message: "请请选择人员！",
-          type: 'warning'
+              type: "warning"
             })
             return
           }
-
-
-      this.$refs["form"].validate(valid => {
-        if (valid) {
           this.planLoading = true;
           if (this.form.planId != null) {
             this.form.personList = this.selectPersonList;

src/views/device/spotCheckPlan/index.vue

@@ -394,17 +394,17 @@
           <div class="my-step-body" v-if="spotCheckStep==0">
             <el-row>
               <el-col :span="8" :offset="2">
-                <el-form-item label="计划名称">
+                <el-form-item label="计划名称" prop="planName">
                   <el-input v-model="form.planName" placeholder="请输入计划名称"/>
                 </el-form-item>
               </el-col>
-              <el-col :span="6" :offset="2">
+              <el-col :span="8" :offset="1">
-                <el-form-item label="循环周期">
+                <el-form-item label="循环周期" prop="planLoop">
-                  <el-input v-model="form.planLoop" placeholder="请输入循环周期"/>
+                  <el-input-number v-model="form.planLoop" label=""></el-input-number>
                 </el-form-item>
               </el-col>
               <el-col :span="2">
-                <el-select v-model="form.planLoopType" placeholder="周期" clearable>
+                <el-select v-model="form.planLoopType" placeholder="周期">
                   <el-option
                     v-for="dict in dict.type.device_loop_type"
                     :key="dict.value"
@@ -417,7 +417,7 @@
             <el-row>
               <el-col :span="8" :offset="2">
                 <el-form-item label="计划状态">
-                  <el-select v-model="form.planStatus" placeholder="计划状态" clearable>
+                  <el-select v-model="form.planStatus" placeholder="计划状态">
                     <el-option
                       v-for="dict in dict.type.sys_normal_disable"
                       :key="dict.value"
@@ -428,28 +428,19 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8" :offset="1">
-                <el-form-item label-width="100px" label="点检开始时间">
+                <el-form-item label-width="115px" label="点检开始时间" prop="planLoopStart">
                   <el-date-picker
                     v-model="form.planLoopStart"
                     type="date"
                     placeholder="开始时间">
                   </el-date-picker>
-                  <el-date-picker
-                    v-if="false"
-                    @change="changeArray"
-                    v-model="form.planTimeArray"
-                    type="datetimerange"
-                    range-separator="至"
-                    start-placeholder="开始时间"
-                    end-placeholder="结束时间">
-                  </el-date-picker>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="8" offset="2" >
-                <el-form-item label="车间">
+                <el-form-item label="车间" prop="planWorkshop">
-                  <el-select @change="changeCenter" v-model="form.planWorkshop" placeholder="请选择车间" clearable>
+                  <el-select @change="changeCenter" v-model="form.planWorkshop" placeholder="请选择车间">
                     <el-option
                       v-for="item in workCenterList"
                       :key="item.factoryCode"
@@ -675,6 +666,8 @@ export default {
 	dicts: ['device_loop_type', 'sys_normal_disable','device_yes_no'],
 	data() {
 		return {
+      // 表单校验
+      rules: {},
       // 日期范围选择快捷
       pickerOptions: {
         shortcuts: [{
@@ -806,8 +799,6 @@ export default {
         planType: "spotInspection",
         planLoopStart: null,
       },
-			// 表单校验
-			rules: {}
 		};
 	},
 	created() {
@@ -1056,13 +1047,46 @@ export default {
     },
     // 下一步
     stepNext() {
+      // 校验
+      if (this.spotCheckStep == 0) {
+        if (this.form.planName == null) {
+          this.$message({
+            message: "计划名称不能为空！",
+            type: "warning"
+          })
+          return
+        }
+        if (this.form.planLoop <= 0) {
+          this.$message({
+            message: "循环周期不可小于等于’0‘！",
+            type: "warning"
+          })
+          return
+        }
+        if (this.form.planLoopStart == null) {
+          this.$message({
+            message: "点检开始时间不能为空！",
+            type: "warning"
+          })
+          return
+        }
         if (this.form.planWorkshop == null) {
           this.$message({
-          message: '请选择车间！',
+            message: "车间不能为空！",
-          type: 'warning'
+            type: "warning"
           })
           return
         }
+      }
+      if (this.spotCheckStep == 1) {
+        if (this.form.equipmentItem.length == 0) {
+          this.$message({
+            message: "请选择设备！",
+            type: "warning"
+          })
+          return
+        }
+      }
       this.spotCheckStep++;
     },
     /** 查询点检计划列表 */
@@ -1189,6 +1213,13 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if (this.selectPersonList.length == 0) {
+            this.$message({
+              message: "请请选择人员！",
+              type: "warning"
+            })
+            return
+          }
           this.planLoading = true;
           if (this.form.planId != null) {
             this.form.personList = this.selectPersonList;
@@ -1237,7 +1268,8 @@ export default {
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {

src/views/device/spotInspectionOrder/index.vue

@@ -636,7 +636,7 @@
 
 <script>
 import { listSpotInspectionOrder, getSpotInspectionOrder, delSpotInspectionOrder, addSpotInspectionOrder, updateSpotInspectionOrder } from "@/api/device/spotInspectionOrder";
-import {getDeviceOrder, listDeviceOrder, updateDeviceOrder} from "@/api/device/deviceOrder";
+import {delDeviceOrder, getDeviceOrder, listDeviceOrder, updateDeviceOrder} from "@/api/device/deviceOrder";
 import {getWorkCenter} from "@/api/device/plan";
 import {getInspectionWork} from "@/api/device/inspectionWork";
 
@@ -950,11 +950,14 @@ export default {
       }
 
 			this.$modal.confirm('是否确认删除点检工单编号为"' + orderCodes + '"的数据项？').then(function () {
-				return delSpotInspectionOrder(orderIds);
+        delDeviceOrder(orderIds).then(response => {
-			}).then(() => {
+          if (response.code != 500) {
-				this.getList();
             this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
+            this.getList();
+          }
+        }).catch(() => {
+        });
+      })
 		},
 		/** 导出按钮操作 */
 		handleExport() {

src/views/device/upkeepOrder/index.vue

@@ -1184,7 +1184,7 @@ import {
 } from "@/api/device/upkeepOrder";
 import {formatEquItem, querySpareList} from "@/api/device/upkeepPlan";
 import {getEquList, getPersonList, getWorkCenter} from "@/api/device/plan";
-import {getDeviceOrder, listDeviceOrder, updateDeviceOrder} from "@/api/device/deviceOrder";
+import {delDeviceOrder, getDeviceOrder, listDeviceOrder, updateDeviceOrder} from "@/api/device/deviceOrder";
 import {getInspectionWork, updateInspectionWork} from "@/api/device/inspectionWork";
 
 export default {
@@ -1821,12 +1821,14 @@ export default {
       }
 
       this.$modal.confirm('是否确认删除保养工单编号为"' + orderCodes + '"的数据项？').then(function () {
-        return delUpkeepOrder(orderIds);
+        delDeviceOrder(orderIds).then(response => {
-      }).then(() => {
+          if (response.code != 500) {
-        this.getList();
             this.$modal.msgSuccess("删除成功");
+            this.getList();
+          }
         }).catch(() => {
         });
+      })
     },
     /** 导出按钮操作 */
     handleExport() {

src/views/device/upkeepPlan/index.vue

@@ -405,7 +405,7 @@
           <!-- 保养计划基本信息 -->
           <div class="my-step-body" v-if="this.upkeepSteps==0">
             <el-row>
-              <el-col :span="8">
+              <el-col :offset="2" :span="8">
                 <el-form-item label="保养名称:">
                   <el-input v-model="form.planName" placeholder="请输入保养名称"/>
                 </el-form-item>
@@ -424,7 +424,7 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="20">
+              <el-col :offset="2" :span="20">
                 <el-form-item label-width="110px" label="保养生成规则:">
                   <el-radio v-model="form.calculationRule" label="0">按固定周期</el-radio>
                   <el-radio v-model="form.calculationRule" label="1">按上次保养时间</el-radio>
@@ -434,9 +434,9 @@
             </el-row>
             <el-row>
               <div v-if="form.calculationRule != '2' ">
-                <el-col :span="6">
+                <el-col :offset="2" :span="8">
                   <el-form-item label="循环周期:">
-                    <el-input v-model="form.planLoop" placeholder="请输入循环周期"/>
+                    <el-input-number v-model="form.planLoop" label=""></el-input-number>
                   </el-form-item>
                 </el-col>
                 <el-col :span="2">
@@ -449,7 +449,7 @@
                     />
                   </el-select>
                 </el-col>
-                <el-col :span="15" :offset="1">
+                <el-col :offset="2" :span="22">
                   <el-form-item label-width="100px" label="保养时间范围">
                     <el-date-picker
                       @change="changeArray"
@@ -463,7 +463,7 @@
                 </el-col>
               </div>
               <div v-else>
-                <el-col :span="8">
+                <el-col :offset="2" :span="8">
                   <el-form-item label-width="100px" label="保养开始时间">
                     <el-date-picker
                       v-model="form.planLoopStart"
@@ -475,13 +475,13 @@
               </div>
             </el-row>
             <el-row>
-              <el-col :span="12">
+              <el-col :offset="2" :span="10">
                 <el-form-item label-width="110px" label="是否停机保养:">
                   <el-radio v-model="form.shutDown" label="1">停机保养</el-radio>
                   <el-radio v-model="form.shutDown" label="0">开机保养</el-radio>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="10">
                 <el-form-item label-width="110px" label="保养类型:">
                   <el-radio v-model="form.upkeep" label="0">内部</el-radio>
                   <el-radio v-model="form.upkeep" label="1">委外</el-radio>
@@ -1372,13 +1372,52 @@ export default {
     },
     // 下一步
     stepNext() {
+      if (this.upkeepSteps == 0) {
+        if (this.form.planName == null) {
+          this.$message({
+            message: "计划名称不能为空！",
+            type: "warning"
+          })
+          return
+        }
+        if (this.form.planLoop <= 0 && this.form.calculationRule !=2) {
+          this.$message({
+            message: "循环周期不可小于等于’0‘！",
+            type: "warning"
+          })
+          return
+        }
+        if (this.form.planTimeArray.length == 0 && this.form.calculationRule != "2") {
+          this.$message({
+            message: "循环时间范围不能为空！",
+            type: "warning"
+          })
+          return
+        }
+        if (this.form.planLoopStart == null && this.form.calculationRule == "2") {
+          this.$message({
+            message: "开始时间不可为空！",
+            type: "warning"
+          })
+          return
+        }
         if (this.form.planWorkshop == null) {
           this.$message({
-          message: '请选择车间！',
+            message: "车间不能为空！",
-          type: 'warning'
+            type: "warning"
+          })
+          return
+        }
+      }
+      if (this.upkeepSteps == 1) {
+        if (this.form.equipmentItem.length == 0) {
+          this.$message({
+            message: "请选择设备！",
+            type: "warning"
           })
           return
         }
+      }
       this.upkeepSteps++;
     },
     /** 查询保养计划列表 */
@@ -1523,6 +1562,13 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if (this.selectPersonList.length == 0) {
+            this.$message({
+              message: "请请选择人员！",
+              type: "warning"
+            })
+            return
+          }
           this.planLoading = true;
           if (this.form.planId != null) {
             this.form.personList = this.selectPersonList;