2024-08-14 设备模块-前端优化+权限问题

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="equipmentCode" width="150"/>
-      <el-table-column label="设备名称" align="center" prop="equipmentName" width="100"/>
+      <el-table-column label="设备名称" align="center" prop="equipmentName" width="150"/>
       <el-table-column
         label="设备类型"
         align="center"
         prop="equipmentTypeName"
+        width="150"
       />
       <el-table-column
         label="委外维修人员"

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="设备名称"

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"/>

src/views/device/upkeepPlan/index.vue

@@ -306,6 +306,11 @@
       <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 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">
+      <el-table-column label="委外人员" align="center" prop="workPerson" width="100"/>
-        <template slot-scope="scope">
+      <el-table-column label="委外单位" align="center" prop="workOutsourcingUnit" width="150"/>
-          <dict-tag :options="dict.type.device_upkeep_type" :value="scope.row.upkeep"/>
+      <el-table-column label="联系方式" align="center" prop="workConnection" width="150"/>
-        </template>
+      <el-table-column label="原因" align="center" prop="workReason" width="150"/>
-      </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 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"/>