From 76b8686172874bb595cd12cd221de27685ad2829 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Mon, 29 Apr 2024 14:07:04 +0800
Subject: [PATCH] =?UTF-8?q?2024-4-29=20=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E7=82=B9=E6=A3=80=E6=8A=A5=E8=A1=A8-=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/spotInspectionWork/index.vue | 46 +++++++++++--------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue
index 7d59fbf..a49d059 100644
--- a/src/views/device/spotInspectionWork/index.vue
+++ b/src/views/device/spotInspectionWork/index.vue
@@ -9,6 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="点检工单号" prop="orderCode">
+        <el-input
+          v-model="queryParams.orderCode"
+          placeholder="请输入点检工单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="计划编码" prop="planCode">
         <el-input
           v-model="queryParams.planCode"
@@ -17,10 +25,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单号" prop="orderCode">
+      <el-form-item label="计划名称" prop="planName">
         <el-input
-          v-model="queryParams.orderCode"
-          placeholder="请输入工单号"
+          v-model="queryParams.planName"
+          placeholder="请输入计划名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -43,16 +51,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="循环周期" prop="planLoop">
-        <el-select v-model="queryParams.planLoopType" placeholder="请选择循环周期" clearable>
-          <el-option
-            v-for="dict in dict.type.device_loop_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+
       <el-form-item v-if="false" label="循环周期" prop="planLoop">
         <el-input
           v-model="queryParams.planLoop"
@@ -101,7 +100,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="设备名称" prop="equipmentCode">
+      <el-form-item label="设备名称" prop="equipmentName">
         <el-input
           v-model="queryParams.equipmentName"
           placeholder="请输入设备名称"
@@ -220,6 +219,16 @@
                         value-format="yyyy-MM-dd"
                         placeholder="请选择更新时间">
         </el-date-picker>
+      </el-form-item>
+            <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"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="循环开始时间" prop="planLoopStart">
         <el-date-picker
@@ -318,7 +327,7 @@
       <el-table-column v-if="false" label="主键" align="center" prop="orderId" />
       <el-table-column v-if="false" label="计划id" align="center" prop="planId" />
       <el-table-column width="150" label="计划编码" align="center" prop="planCode" />
-      <el-table-column width="150" label="计划名称" align="center" prop="planName" />
+      <el-table-column width="200" label="计划名称" align="center" prop="planName" />
       <el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
       <el-table-column width="150" label="点检单号" align="center" prop="orderCode" fixed>
         <template slot-scope="scope">
@@ -331,7 +340,10 @@
       </el-table-column>
       <el-table-column label="车间编码" align="center" prop="planWorkshop" />
       <el-table-column width="150" label="车间" align="center" prop="workCenterName"/>
+      <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
+      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
       <el-table-column width="150" label="点检时间" align="center" prop="orderStart"/>
+      <el-table-column label="点检人" align="center" prop="planPerson" />
       <el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
       <el-table-column label="循环周期" align="center" prop="planLoop" />
       <el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType" >
@@ -359,15 +371,12 @@
           <span>{{ parseTime(scope.row.orderEnd, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="100" label="设备编码" align="center" prop="equipmentCode" />
-      <el-table-column width="200" label="设备名称" align="center" prop="equipmentName" />
       <el-table-column label="工单状态" align="center" prop="orderStatus" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
         </template>
       </el-table-column>
       <el-table-column v-if="false" label="工单费用" align="center" prop="orderCost" />
-      <el-table-column label="点检人" align="center" prop="planPerson" />
       <el-table-column v-if="false" label="工单用时" align="center" prop="orderCostTime" />
       <el-table-column v-if="false" label="签字" align="center" prop="orderSignPerson" />
       <el-table-column v-if="false" label="工厂" align="center" prop="factoryCode" />
@@ -624,6 +633,7 @@ export default {
         pageSize: 10,
         planId: null,
         planCode: null,
+        planName: null,
         planType: "spotInspection",
         orderCode: null,
         planWorkshop: null,