From db92fd0c41b4d004ab6eb24c8d06ebd6d8c4611f Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 14 Aug 2024 17:46:22 +0800
Subject: [PATCH] =?UTF-8?q?2024-08-14=20=E8=AE=BE=E5=A4=87=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96+=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/outsourceWorkOrder/index.vue |  5 ++--
 src/views/device/repairOrder/index.vue        |  4 +--
 src/views/device/upkeepOrder/index.vue        | 29 +++++++++++++------
 src/views/device/upkeepPlan/index.vue         | 20 ++++++-------
 4 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/views/device/outsourceWorkOrder/index.vue b/src/views/device/outsourceWorkOrder/index.vue
index 83c90e1c..2962c927 100644
--- a/src/views/device/outsourceWorkOrder/index.vue
+++ b/src/views/device/outsourceWorkOrder/index.vue
@@ -191,12 +191,13 @@
           {{ scope.row.workType == 1 ? "保养委外" : "维修委外" }}
         </template>
       </el-table-column>
-      <el-table-column label="设备编码" align="center" prop="equipmentCode" width="100"/>
-      <el-table-column label="设备名称" align="center" prop="equipmentName" width="100"/>
+      <el-table-column label="设备编码" align="center" prop="equipmentCode" width="150"/>
+      <el-table-column label="设备名称" align="center" prop="equipmentName" width="150"/>
       <el-table-column
         label="设备类型"
         align="center"
         prop="equipmentTypeName"
+        width="150"
       />
       <el-table-column
         label="委外维修人员"
diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index 11db790e..50a3835b 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -245,7 +245,7 @@
           icon="el-icon-edit"
           size="mini"
           @click="clickInspect"
-          v-hasPermi="['device:repairOrder:inspect']"
+          v-hasPermi="['device:repairOrder:check']"
           >维修结果审核
         </el-button>
       </el-col>
@@ -324,7 +324,7 @@
         label="报修单号"
         align="center"
         prop="orderCode"
-        width="200"
+        width="230"
       />
       <el-table-column
         label="设备名称"
diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue
index 02eced74..d26c313f 100644
--- a/src/views/device/upkeepOrder/index.vue
+++ b/src/views/device/upkeepOrder/index.vue
@@ -394,10 +394,21 @@
           icon="el-icon-edit"
           size="mini"
           @click="clickInspect"
-          v-hasPermi="['device:upkeepOrder:edit']"
+          v-hasPermi="['device:upkeepOrder:check']"
           >结果检验
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          @click="handleUpdate"
+          v-hasPermi="['device:upkeepOrder:edit']"
+          >填写记录
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -453,6 +464,14 @@
           }}</el-button>
         </template>
       </el-table-column>
+      <el-table-column width="80" label="保养类型" align="center" prop="upkeep">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.device_upkeep_type"
+            :value="scope.row.upkeep"
+          />
+        </template>
+      </el-table-column>
       <el-table-column label="工单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
           <dict-tag
@@ -581,14 +600,6 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column width="80" label="保养类型" align="center" prop="upkeep">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.device_upkeep_type"
-            :value="scope.row.upkeep"
-          />
-        </template>
-      </el-table-column>
       <el-table-column label="工单费用" align="center" prop="orderCost" />
       <el-table-column label="保养人工号" align="center" prop="planPerson" width="100"/>
       <el-table-column label="保养人姓名" align="center" prop="planPersonName" width="100"/>
diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue
index dc9b40fb..1f13e433 100644
--- a/src/views/device/upkeepPlan/index.vue
+++ b/src/views/device/upkeepPlan/index.vue
@@ -305,7 +305,12 @@
       <el-table-column width="60" align="center" label="序号" type="index" fixed></el-table-column>
       <el-table-column v-if="false" label="主键" align="center" prop="planId"/>
       <el-table-column width="150" label="计划编码" align="center" prop="planCode" fixed/>
-      <el-table-column width="150" label="计划名称" align="center" prop="planName"/>
+      <el-table-column width="150" label="计划名称" align="center" prop="planName" />
+      <el-table-column label="保养类型" align="center" prop="upkeep">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.device_upkeep_type" :value="scope.row.upkeep"/>
+        </template>
+      </el-table-column>
       <el-table-column width="150" label="生成规则" align="center" prop="calculationRule">
       <template slot-scope="scope">
           {{ scope.row.calculationRule == "0" ? "按照固定周期" : scope.row.one == "1" ? "按照上次保养时间" : "单次" }}
@@ -340,15 +345,10 @@
       </el-table-column>
       <el-table-column v-if="false" label="是否可生产-限制" align="center" prop="planRestrict"/>
       <el-table-column v-if="false" label="维护类型" align="center" prop="planType"/>
-      <el-table-column label="保养类型" align="center" prop="upkeep">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.device_upkeep_type" :value="scope.row.upkeep"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="委外人员" align="center" prop="workPerson"/>
-      <el-table-column label="委外单位" align="center" prop="workOutsourcingUnit"/>
-      <el-table-column label="联系方式" align="center" prop="workConnection"/>
-      <el-table-column label="原因" align="center" prop="workReason"/>
+      <el-table-column label="委外人员" align="center" prop="workPerson" width="100"/>
+      <el-table-column label="委外单位" align="center" prop="workOutsourcingUnit" width="150"/>
+      <el-table-column label="联系方式" align="center" prop="workConnection" width="150"/>
+      <el-table-column label="原因" align="center" prop="workReason" width="150"/>
       <el-table-column v-if="false" label="委外工单编码" align="center" prop="workCode"/>
       <el-table-column v-if="false" label="工厂" align="center" prop="factoryCode"/>
       <el-table-column v-if="false" label="备用字段1" align="center" prop="attr1"/>