From 58169855015154679c5b3acefdba5055bf08f8e5 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 13 Dec 2023 17:02:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/equipment/index.vue | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index d99e332a..866024f0 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -60,7 +60,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="设备类别" prop="equipmentStatus">
+      <el-form-item label="设备类别" prop="equipmentCategory">
         <el-select
           v-model="queryParams.equipmentCategory"
           placeholder="设备类别(组线/设备)"
@@ -698,11 +698,20 @@
         <el-button v-if="this.repairRecordSteps > 0" @click="stepLast"
           >上一步</el-button
         >
-        <el-button v-if="this.repairRecordSteps < 4" @click="stepNext"
+        <el-button v-if="this.repairRecordSteps < 4 && this.form.equipmentCategory == '1' " @click="stepNext"
           >下一步</el-button
         >
+        <el-button v-if="this.repairRecordSteps < 3 && this.form.equipmentCategory == '0' " @click="stepNext"
+          >下一步</el-button
+        >
+        <el-button
+          v-if=" this.repairRecordSteps == 4 && this.form.equipmentCategory == '1' "
+          type="primary"
+          @click="submitForm"
+          >提 交</el-button
+        >
         <el-button
-          v-if="this.repairRecordSteps == 4"
+          v-if=" this.repairRecordSteps == 3 && this.form.equipmentCategory == '0' "
           type="primary"
           @click="submitForm"
           >提 交</el-button
@@ -1097,6 +1106,7 @@ export default {
         workshopSection: null,
         equipmentLocation: null,
         hourlyUnitPrice: null,
+        equipmentCategory : null,
       },
       queryEquipmentHeadParams: {
         pageNum: 1,
@@ -1158,6 +1168,9 @@ export default {
         status: [
           { required: true, message: "设备状态不能为空", trigger: "blur" },
         ],
+        equipmentCategory: [
+          { required: true, message: "设备类别不能为空", trigger: "blur" },
+        ],
       },
     };
   },
@@ -1282,6 +1295,7 @@ export default {
         equipmentLocation: null,
         hourlyUnitPrice: null,
         equipmentHead: null,
+        equipmentCategory : null,
       };
       this.resetForm("form");
     },
@@ -1478,6 +1492,10 @@ export default {
               this.$message.error(
                 "【设备基础信息】设备类型为空，请选择设备类型！"
               );
+            } else if (this.form.equipmentCategory == null) {
+              this.$message.error(
+                "【设备基础信息】设备类别为空，请选择设备类别！"
+              );
             } else {
               this.form.auxiliaryEquipmentRightData =
                 this.auxiliaryEquipmentRightList;