Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-front

src/views/device/inspectionWork/index.vue

@@ -231,7 +231,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="执行开始时间" prop="orderStart">
+      <el-form-item v-if="false" label-width="100px" label="执行开始时间" prop="orderStart">
         <el-date-picker
           v-model="queryParams.orderStartArray"
           type="daterange"
@@ -244,7 +244,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="执行结束时间" prop="orderEnd">
+      <el-form-item v-if="false" label-width="100px" label="执行结束时间" prop="orderEnd">
         <el-date-picker
           v-model="queryParams.orderEndArray"
           type="daterange"

src/views/device/outsourceWorkOrder/index.vue

@@ -175,13 +175,24 @@
         width="180"
       />
       <el-table-column
-        label="维修/保养单号"
+        label="维修/保养工单号"
         align="center"
         prop="repairCode"
         width="180"
       />
-      <el-table-column label="设备编码" align="center" prop="equipmentCode" />
+      <el-table-column label="委外类型" align="center" prop="workType">
-      <el-table-column label="设备名称" align="center" prop="equipmentName" />
+        <template slot-scope="scope">
+          {{ scope.row.workType == 1 ? "保养委外" : "维修委外" }}
+        </template>
+      </el-table-column>
+      <el-table-column label="委外状态" align="center" prop="workStatus" width="100">
+        <template slot-scope="scope">
+          <el-tag type="success" v-if="scope.row.workStatus == 1">完成</el-tag>
+          <el-tag type="danger" v-else-if="scope.row.workStatus == 0">未完成</el-tag>
+        </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"
@@ -211,11 +222,6 @@
         prop="workReason"
         width="150"
       />
-      <el-table-column label="委外类型" align="center" prop="workType">
-        <template slot-scope="scope">
-          {{ scope.row.workType == 1 ? "保养委外" : "维修委外" }}
-        </template>
-      </el-table-column>
       <el-table-column label="委外费用" align="center" prop="workCost" />
       <el-table-column label="委外用时" align="center" prop="workCostTime" />
       <el-table-column

src/views/device/spotInspectionWork/index.vue

@@ -226,7 +226,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="执行开始时间" prop="orderStart">
+      <el-form-item v-if="false" label-width="100px" label="执行开始时间" prop="orderStart">
         <el-date-picker
           v-model="queryParams.orderStartArray"
           type="daterange"
@@ -239,7 +239,7 @@
           :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label-width="100px" label="执行结束时间" prop="orderEnd">
+      <el-form-item v-if="false" label-width="100px" label="执行结束时间" prop="orderEnd">
         <el-date-picker
           v-model="queryParams.orderEndArray"
           type="daterange"