add:维修列表展示优化

src/views/inspection/patrol/patrolLocation/index.vue

@@ -39,7 +39,6 @@
       :data="placeList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="地点名称" align="center" prop="placeName" />
       <el-table-column label="地点位置" align="center" prop="location" />
       <el-table-column label="信息" align="center" prop="information" />

src/views/inspection/patrol/patrolLocationLog/index.vue

@@ -28,7 +28,6 @@
     </el-row>
 
     <el-table v-loading="loading" :data="inspectionList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" width="55" align="center" prop="id" />
       <el-table-column label="巡检日期" align="center" prop="pollingData" width="180">
         <template slot-scope="scope">

src/views/inspection/patrol/patrolLog/index.vue

@@ -21,7 +21,6 @@
     </el-row>
 
     <el-table v-loading="loading" :data="inspectionList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="报修单编号" align="center" prop="repairsId" />
       <el-table-column label="巡检日期" align="center" prop="pollingData" width="180">
         <template slot-scope="scope">
@@ -31,6 +30,11 @@
       <el-table-column label="巡检人" align="center" prop="inspectionUserName" />
       <el-table-column label="设备名称" align="center" prop="deviceName" />
       <el-table-column label="设备状态" align="center" prop="deviceState">
+
+
+
+
+        
         <template slot-scope="scope">
           <el-tag v-if="scope.row.deviceState == 1" type="success">正常</el-tag>
           <el-tag v-else type="danger">异常</el-tag>

src/views/inspection/patrol/patrolProject/index.vue

@@ -31,7 +31,7 @@
 
     <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="报修单编号" align="center" prop="id" />
       <el-table-column label="巡检日期" align="center" prop="pollingData" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.pollingData, '{y}-{m}-{d}') }}</span>

src/views/inspection/repair/repairProject/index.vue

@@ -21,12 +21,14 @@
     </el-row>
 
     <el-table v-loading="loading" :data="workOrderList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="维修单编号" align="center" prop="id" />
       <el-table-column label="设备名称" align="center" prop="deviceName" />
       <el-table-column label="设备编码" align="center" prop="deviceNo" />
-      <el-table-column label="巡检人" align="center" prop="inspectionUserName" />
-      <el-table-column label="维修人" align="center" prop="maintainUserName" />
+      <el-table-column label="巡检人" align="center" prop="inspectionUserName">
+        <template slot-scope="scope">
+          <span>{{ scope.row.inspectionUserName || '-' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="设备故障描述" align="center" prop="deviceErrorDetail" />
       <el-table-column label="故障日期" align="center" prop="erroDate" width="180">
         <template slot-scope="scope">
@@ -38,7 +40,21 @@
           <span>{{ selectDictLabels(orderStatesList, scope.row.orderStates) }}</span>
         </template>
       </el-table-column>
-
+      <el-table-column label="维修人" align="center" prop="maintainUserName">
+        <template slot-scope="scope">
+          <span>{{ scope.row.maintainUserName || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="维修情况描述" align="center" prop="maintainDetail">
+        <template slot-scope="scope">
+          <span>{{ scope.row.maintainDetail || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="维修日期" align="center" prop="maintainDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ scope.row.maintainDate ? parseTime(scope.row.maintainDate, '{y}-{m}-{d}') : '-' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['workOrder:workOrder:edit']" v-if="scope.row.orderStates == 0"
@@ -164,7 +180,7 @@ export default {
         deviceName: null,
         inspectionUserId: null,
         deviceErrorDetail: null,
-        deviceErroPhotos: null,
+        deviceErrorPhotos: null,
         erroDate: null,
         orderStates: null,
         maintainUserId: null,
@@ -191,7 +207,7 @@ export default {
       // 表单校验
       rules: {
         repairsId: [{ required: true, message: '维修单编号不能为空', trigger: 'blur' }],
-        deviceErroPhotos: [{ required: true, message: '设备故障图片不能为空', trigger: 'blur' }],
+        deviceErrorPhotos: [{ required: true, message: '设备故障图片不能为空', trigger: 'blur' }],
         deviceErrorDetail: [{ required: true, message: '设备故障描述不能为空', trigger: 'blur' }],
         erroDate: [{ required: true, message: '故障日期不能为空', trigger: 'blur' }],
         maintainEndDate: [{ required: true, message: '维修截止日期不能为空', trigger: 'blur' }],
@@ -246,7 +262,7 @@ export default {
         deviceName: null,
         inspectionUserId: null,
         deviceErrorDetail: null,
-        deviceErroPhotos: null,
+        deviceErrorPhotos: null,
         erroDate: null,
         orderStates: null,
         maintainUserId: null,
@@ -367,11 +383,11 @@ export default {
 
     // 文件上传回调
     fileSuccess(val) {
-      this.form.deviceErroPhotos = val
+      this.form.deviceErrorPhotos = val
     },
     // 文件删除
     handleRemove(url) {
-      this.form.deviceErroPhotos = url
+      this.form.deviceErrorPhotos = url
     },
   },
 }