- 机泵过滤器清理回装确认表导出

- 机泵检修完成确认清单导出
- 机泵润滑油加注确认清单导出

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpCleaningController.java

@@ -1,25 +1,35 @@
 package com.ruoyi.project.pssr.controller;
 
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrPumpCleaning;
-import com.ruoyi.project.pssr.domain.TPssrPumpFill;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.service.*;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.*;
 
 /**
@@ -50,6 +60,9 @@ public class TPssrPumpCleaningController extends BaseController {
     @Autowired
     private HistoryService historyService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
     /**
      * 查询机泵过滤器清理工作清单列表
      */
@@ -72,8 +85,69 @@ public class TPssrPumpCleaningController extends BaseController {
     @GetMapping("/export")
     public AjaxResult export(TPssrPumpCleaning tPssrPumpCleaning) {
         List<TPssrPumpCleaning> list = tPssrPumpCleaningService.selectTPssrPumpCleaningList(tPssrPumpCleaning);
-        ExcelUtil<TPssrPumpCleaning> util = new ExcelUtil<TPssrPumpCleaning>(TPssrPumpCleaning.class);
-        return util.exportExcel(list, "pumpCleaning");
+        return AjaxResult.success(exportTmpl(list));
+    }
+
+    public String exportTmpl(List<TPssrPumpCleaning> list) {
+        OutputStream out = null;
+        String filename = null;
+        try {
+            String tempUrl = "static/word/pssr/jbql.xlsx"; // 模板文件
+            InputStream is = null;
+            is = Thread.currentThread().getContextClassLoader().getResourceAsStream(tempUrl);
+            XSSFWorkbook wb = null;
+            wb = new XSSFWorkbook(is);
+            XSSFSheet sheet = wb.getSheetAt(0);
+
+            //填充数据
+            int rowIndex = 3;
+            int num = 1;
+
+            Row originalRow = sheet.getRow(3);
+            Cell originalcell = originalRow.getCell(0);
+            // 获取单元格样式
+            CellStyle originalStyle = originalcell.getCellStyle();
+
+            for (TPssrPumpCleaning t : list) {
+                Row row = sheet.createRow(rowIndex);
+                row.setHeight((short) 800);
+                row.createCell(0).setCellValue(num);
+                row.createCell(1).setCellValue(t.getUnit());
+                row.createCell(2).setCellValue(t.getPosition());
+                row.createCell(3).setCellValue(t.getFilterNumber());
+                row.createCell(4).setCellValue(t.getCleaning());
+                row.createCell(5).setCellValue(t.getBackLoading());
+                row.createCell(6);
+                row.createCell(7);
+                try {
+                    SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer1()));
+                    SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer2()));
+                    String confirm1 =  sysUser1.getSignUrl();
+                    String confirm2 =  sysUser2.getSignUrl();
+                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 7, 1, 1);
+                } catch (NumberFormatException e) {
+                    throw new RuntimeException(e);
+                }
+                row.createCell(8).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
+                row.createCell(9).setCellValue(t.getRemarks());
+
+                //渲染样式
+                for (int i = 0; i < 10; i++) {
+                    row.getCell(i).setCellStyle(originalStyle);
+                }
+                num++;
+                rowIndex++;
+            }
+            filename = ExcelUtil.encodingFilename("PumpCleaning");
+            out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
+            wb.write(out);
+            wb.close();
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return filename;
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpFillController.java

@@ -1,6 +1,8 @@
 package com.ruoyi.project.pssr.controller;
 
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -9,19 +11,31 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrPumpFill;
+import com.ruoyi.project.pssr.domain.TPssrPumpFill;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
 import com.ruoyi.project.pssr.service.ITPssrFileService;
 import com.ruoyi.project.pssr.service.ITPssrPumpFillService;
 import com.ruoyi.project.pssr.service.ITPssrSubcontentService;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.*;
 
 /**
@@ -50,6 +64,9 @@ public class TPssrPumpFillController extends BaseController {
     @Autowired
     private HistoryService historyService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
     /**
      * 查询机泵润滑油加注确认清单列表
      */
@@ -72,8 +89,70 @@ public class TPssrPumpFillController extends BaseController {
     @GetMapping("/export")
     public AjaxResult export(TPssrPumpFill tPssrPumpFill) {
         List<TPssrPumpFill> list = tPssrPumpFillService.selectTPssrPumpFillList(tPssrPumpFill);
-        ExcelUtil<TPssrPumpFill> util = new ExcelUtil<TPssrPumpFill>(TPssrPumpFill.class);
-        return util.exportExcel(list, "pumpFill");
+        return AjaxResult.success(exportTmpl(list));
+    }
+
+    public String exportTmpl(List<TPssrPumpFill> list) {
+        OutputStream out = null;
+        String filename = null;
+        try {
+            String tempUrl = "static/word/pssr/jbrhy.xlsx"; // 模板文件
+            InputStream is = null;
+            is = Thread.currentThread().getContextClassLoader().getResourceAsStream(tempUrl);
+            XSSFWorkbook wb = null;
+            wb = new XSSFWorkbook(is);
+            XSSFSheet sheet = wb.getSheetAt(0);
+
+            //填充数据
+            int rowIndex = 3;
+            int num = 1;
+
+            Row originalRow = sheet.getRow(3);
+            Cell originalcell = originalRow.getCell(0);
+            // 获取单元格样式
+            CellStyle originalStyle = originalcell.getCellStyle();
+
+            for (TPssrPumpFill t : list) {
+                Row row = sheet.createRow(rowIndex);
+                row.setHeight((short) 800);
+                row.createCell(0).setCellValue(num);
+                row.createCell(1).setCellValue(t.getUnit());
+                row.createCell(2).setCellValue(t.getDevNo());
+                row.createCell(3).setCellValue(t.getLubricatingPart());
+                row.createCell(4).setCellValue(t.getFillingComplete());
+                row.createCell(5).setCellValue(t.getLubricatingLeak());
+                row.createCell(6).setCellValue(t.getLiquidNormal());
+                row.createCell(7);
+                row.createCell(8);
+                try {
+                    SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer1()));
+                    SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer2()));
+                    String confirm1 =  sysUser1.getSignUrl();
+                    String confirm2 =  sysUser2.getSignUrl();
+                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 7, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 8, 1, 1);
+                } catch (NumberFormatException e) {
+                    throw new RuntimeException(e);
+                }
+                row.createCell(9).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
+                row.createCell(10).setCellValue(t.getRemarks());
+
+                //渲染样式
+                for (int i = 0; i < 11; i++) {
+                    row.getCell(i).setCellStyle(originalStyle);
+                }
+                num++;
+                rowIndex++;
+            }
+            filename = ExcelUtil.encodingFilename("PumpFill");
+            out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
+            wb.write(out);
+            wb.close();
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return filename;
     }
 
     /**

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpOverhaulController.java

@@ -1,25 +1,35 @@
 package com.ruoyi.project.pssr.controller;
 
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrPumpFill;
-import com.ruoyi.project.pssr.domain.TPssrPumpOverhaul;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.service.*;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.impl.identity.Authentication;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.*;
 
 /**
@@ -51,6 +61,9 @@ public class TPssrPumpOverhaulController extends BaseController {
     @Autowired
     private HistoryService historyService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
     /**
      * 查询机泵检修完成确认清单列表
      */
@@ -73,8 +86,68 @@ public class TPssrPumpOverhaulController extends BaseController {
     @GetMapping("/export")
     public AjaxResult export(TPssrPumpOverhaul tPssrPumpOverhaul) {
         List<TPssrPumpOverhaul> list = tPssrPumpOverhaulService.selectTPssrPumpOverhaulList(tPssrPumpOverhaul);
-        ExcelUtil<TPssrPumpOverhaul> util = new ExcelUtil<TPssrPumpOverhaul>(TPssrPumpOverhaul.class);
-        return util.exportExcel(list, "pumpOverhaul");
+        return AjaxResult.success(exportTmpl(list));
+    }
+
+    public String exportTmpl(List<TPssrPumpOverhaul> list) {
+        OutputStream out = null;
+        String filename = null;
+        try {
+            String tempUrl = "static/word/pssr/jbjx.xlsx"; // 模板文件
+            InputStream is = null;
+            is = Thread.currentThread().getContextClassLoader().getResourceAsStream(tempUrl);
+            XSSFWorkbook wb = null;
+            wb = new XSSFWorkbook(is);
+            XSSFSheet sheet = wb.getSheetAt(0);
+
+            //填充数据
+            int rowIndex = 3;
+            int num = 1;
+
+            Row originalRow = sheet.getRow(3);
+            Cell originalcell = originalRow.getCell(0);
+            // 获取单元格样式
+            CellStyle originalStyle = originalcell.getCellStyle();
+
+            for (TPssrPumpOverhaul t : list) {
+                Row row = sheet.createRow(rowIndex);
+                row.setHeight((short) 800);
+                row.createCell(0).setCellValue(num);
+                row.createCell(1).setCellValue(t.getUnit());
+                row.createCell(2).setCellValue(t.getDevNo());
+                row.createCell(3).setCellValue(t.getBackLoading());
+                row.createCell(4).setCellValue(t.getOverhaulDone());
+                row.createCell(5);
+                row.createCell(6);
+                try {
+                    SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer1()));
+                    SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer2()));
+                    String confirm1 =  sysUser1.getSignUrl();
+                    String confirm2 =  sysUser2.getSignUrl();
+                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 5, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 6, 1, 1);
+                } catch (NumberFormatException e) {
+                    throw new RuntimeException(e);
+                }
+                row.createCell(7).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
+                row.createCell(8).setCellValue(t.getRemarks());
+
+                //渲染样式
+                for (int i = 0; i < 9; i++) {
+                    row.getCell(i).setCellStyle(originalStyle);
+                }
+                num++;
+                rowIndex++;
+            }
+            filename = ExcelUtil.encodingFilename("PumpOverhaul");
+            out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
+            wb.write(out);
+            wb.close();
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return filename;
     }
 
     /**

ui/src/views/pssr/pumpCleaning/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="单元" prop="unit">
+      <el-form-item label="单元号" prop="unit">
         <el-input
           v-model="queryParams.unit"
-          placeholder="请输入单元"
+          placeholder="请输入单元号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -135,7 +135,7 @@
           <el-tag v-if="scope.row.approveStatus==2" type="success">已确认2</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="单元" align="center" prop="unit" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="过滤网位置" align="center" prop="position" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="数量" align="center" prop="filterNumber" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="检查内容" align="center">
@@ -144,9 +144,17 @@
         <el-table-column label="正确回装(是/否)" align="center" prop="backLoading" :show-overflow-tooltip="true"
                          width="180"/>
       </el-table-column>
-      <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="完成日期" align="center" prop="confirmationDate" width="150">
+      <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="180">
+        <template slot-scope="scope">
+          <span>{{ userFormat(scope.row.confirmer1) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true" width="180">
+        <template slot-scope="scope">
+          <span>{{ userFormat(scope.row.confirmer2) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认时间" align="center" prop="confirmationDate" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -194,8 +202,8 @@
     <!-- 添加或修改机泵过滤器清理工作清单对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="单元" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单元"/>
+        <el-form-item label="单元号" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单元号"/>
         </el-form-item>
         <el-form-item label="过滤网位置" prop="position">
           <el-input v-model="form.position" placeholder="请输入过滤网位置"/>

ui/src/views/pssr/pumpFill/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="单元" prop="unit">
+      <el-form-item label="单元号" prop="unit">
         <el-input
           v-model="queryParams.unit"
-          placeholder="请输入单元"
+          placeholder="请输入单元号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -136,7 +136,7 @@
           <el-tag v-if="scope.row.approveStatus==2" type="success">已确认2</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="单元" align="center" prop="unit" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="设备位号" align="center" prop="devNo" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="润滑部位" align="center" prop="lubricatingPart" :show-overflow-tooltip="true"
                        width="180"/>
@@ -148,9 +148,17 @@
       <el-table-column label="油杯液位正常(是/否)" align="center" prop="liquidNormal" :show-overflow-tooltip="true"
                        width="180"/>
       </el-table-column>
-      <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="完成日期" align="center" prop="confirmationDate" width="150">
+      <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="180">
+        <template slot-scope="scope">
+          <span>{{ userFormat(scope.row.confirmer1) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true" width="180">
+        <template slot-scope="scope">
+          <span>{{ userFormat(scope.row.confirmer2) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认时间" align="center" prop="confirmationDate" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -198,8 +206,8 @@
     <!-- 添加或修改机泵润滑油加注确认清单对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="单元" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单元"/>
+        <el-form-item label="单元号" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单元号"/>
         </el-form-item>
         <el-form-item label="设备位号" prop="devNo">
           <el-input v-model="form.devNo" placeholder="请输入设备位号"/>

ui/src/views/pssr/pumpOverhaul/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="单元" prop="unit">
+      <el-form-item label="单元号" prop="unit">
         <el-input
           v-model="queryParams.unit"
-          placeholder="请输入单元"
+          placeholder="请输入单元号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -136,7 +136,7 @@
           <el-tag v-if="scope.row.approveStatus==2" type="success">已确认2</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="单元" align="center" prop="unit" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="设备位号" align="center" prop="devNo" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="检查内容" align="center">
         <el-table-column label="正确回装(是/否)" align="center" prop="backLoading" :show-overflow-tooltip="true"
@@ -144,9 +144,17 @@
         <el-table-column label="设备检修完成(是/否)" align="center" prop="overhaulDone" :show-overflow-tooltip="true"
                          width="180"/>
       </el-table-column>
-      <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="完成日期" align="center" prop="confirmationDate" width="150">
+      <el-table-column label="确认人1" align="center" prop="confirmer1" :show-overflow-tooltip="true" width="180">
+        <template slot-scope="scope">
+          <span>{{ userFormat(scope.row.confirmer1) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认人2" align="center" prop="confirmer2" :show-overflow-tooltip="true" width="180">
+        <template slot-scope="scope">
+          <span>{{ userFormat(scope.row.confirmer2) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认时间" align="center" prop="confirmationDate" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -194,8 +202,8 @@
     <!-- 添加或修改机泵检修完成确认清单对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="单元" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单元"/>
+        <el-form-item label="单元号" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单元号"/>
         </el-form-item>
         <el-form-item label="设备位号" prop="devNo">
           <el-input v-model="form.devNo" placeholder="请输入设备位号"/>