From 58a9afa5926f4006f4dab157b642b985670f2766 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Wed, 13 Dec 2023 09:06:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/item/index.vue        | 16 ++++++++--------
 src/views/device/upkeepOrder/index.vue | 10 ++++++----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/views/device/item/index.vue b/src/views/device/item/index.vue
index 2c4b78b..990f93b 100644
--- a/src/views/device/item/index.vue
+++ b/src/views/device/item/index.vue
@@ -310,14 +310,14 @@
                 </el-form-item>
               </el-col>
               <el-col :span="2">
-                <el-select v-model="form.itemLoopType" placeholder="周期">
-                  <el-option
-                    v-for="dict in dict.type.device_loop_type"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  />
-                </el-select>
+                  <el-select v-model="form.itemLoopType" placeholder="周期">
+                    <el-option
+                      v-for="dict in dict.type.device_loop_type"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
               </el-col>
             </el-row>
             <!-- 动态表单 -->
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index 615f92f..c254d5e 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -43,7 +43,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单状态" prop="orderStatus">
+      <el-form-item label="工单状态" prop="planStatus">
         <el-select v-model="queryParams.planStatus" placeholder="请选择工单状态" clearable>
           <el-option
             v-for="dict in dict.type.device_order_status"
@@ -53,7 +53,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="循环周期" prop="planLoop">
+      <el-form-item label="循环周期" prop="planLoopType">
         <el-select v-model="queryParams.planLoopType" placeholder="请选择循环周期" clearable>
           <el-option
             v-for="dict in dict.type.device_loop_type"
@@ -111,7 +111,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="设备名称" prop="equipmentCode">
+      <el-form-item v-if="false" label="设备名称" prop="equipmentName">
         <el-input
           v-model="queryParams.equipmentName"
           placeholder="请输入设备名称"
@@ -127,7 +127,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="点检人" prop="planPerson">
+      <el-form-item label="保养人" prop="planPerson">
         <el-input
           v-model="queryParams.planPerson"
           placeholder="请输入点检人"
@@ -1320,6 +1320,7 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
+        orderInspect:null,
         pageNum: 1,
         pageSize: 10,
         planId: null,
@@ -1778,6 +1779,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        queryParams:null,
         orderId: null,
         planId: null,
         planCode: null,