代码更新

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java

@@ -336,6 +336,33 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
         WQLObject reDtlTab = WQLObject.getWQLObject("EM_BI_DeviceRepairDtl"); // 设备维修单明细表
         WQLObject fileTab = WQLObject.getWQLObject("EM_BI_EquipmentFile"); // 档案表
         WQLObject lifeTab = WQLObject.getWQLObject("EM_BI_DeviceLifeCycle"); // 设备生命周期表
+        WQLObject recordTab = WQLObject.getWQLObject("EM_BI_DeviceRepairRecord"); // 设备维修单情况记录表
+
+        // 校验设备维修情况不能为空
+        String fault_comment = whereJson.getString("fault_comment"); // 故障描述
+        String fault_cause = whereJson.getString("fault_cause"); // 故障原因
+        String fault_analysis = whereJson.getString("fault_analysis"); // 问题分析
+        String measure = whereJson.getString("measure"); // 处理措施
+        if (ObjectUtil.isEmpty(fault_comment)) throw new BadRequestException("故障描述不能为空");
+        if (ObjectUtil.isEmpty(fault_cause)) throw new BadRequestException("故障原因不能为空");
+        if (ObjectUtil.isEmpty(fault_analysis)) throw new BadRequestException("问题分析不能为空");
+        if (ObjectUtil.isEmpty(measure)) throw new BadRequestException("处理措施不能为空");
+
+        JSONObject jsonRord = recordTab.query("repair_id = '" + whereJson.getString("repair_id") + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(jsonRord)) {
+            recordTab.delete("repair_id = '"+whereJson.getString("repair_id")+"'");
+        }
+        // 重新插入表
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("repair_record_id", IdUtil.getSnowflake(1,1).nextId());
+        jsonObject.put("repair_id", whereJson.getString("repair_id"));
+        jsonObject.put("devicerecord_id", whereJson.getString("devicerecord_id"));
+        jsonObject.put("inputdate", DateUtil.today());
+        jsonObject.put("fault_comment", fault_comment);
+        jsonObject.put("fault_cause", fault_cause);
+        jsonObject.put("fault_analysis", fault_analysis);
+        jsonObject.put("measure", measure);
+        recordTab.insert(jsonObject);
 
         // 1.判断维修单明细中是否完成 都为是，不是则报错
         JSONArray reDtlArr = reDtlTab.query("repair_id = '" + whereJson.getString("repair_id") + "'").getResultJSONArray(0);
@@ -379,6 +406,7 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
 
         WQLObject reMstTab = WQLObject.getWQLObject("EM_BI_DeviceRepairMst"); // 设备维修单主表
         WQLObject reDtlTab = WQLObject.getWQLObject("EM_BI_DeviceRepairDtl"); // 设备维修单明细表
+        WQLObject recordTab = WQLObject.getWQLObject("EM_BI_DeviceRepairRecord"); // 设备维修单情况记录表
 
         // 1.更新维修主表
         JSONObject jsonReMst = reMstTab.query("repair_id = '" + whereJson.getString("repair_id") + "'").uniqueResult(0);
@@ -394,6 +422,23 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
             reDtlTab.update(jsonRedtl);
         }
 
+        // 3.插入设备维修单情况记录表
+        JSONObject jsonRd = recordTab.query("repair_id = '" + whereJson.getString("repair_id") + "'").uniqueResult(0);
+        if (ObjectUtil.isNotEmpty(jsonRd)) {
+            recordTab.delete("repair_id = '"+whereJson.getString("repair_id")+"'");
+        }
+
+        JSONObject json = new JSONObject();
+        json.put("repair_record_id", IdUtil.getSnowflake(1,1).nextId());
+        json.put("repair_id", whereJson.getString("repair_id"));
+        json.put("devicerecord_id", whereJson.getString("devicerecord_id"));
+        json.put("inputdate", DateUtil.today());
+        json.put("fault_comment", whereJson.getString("fault_comment"));
+        json.put("fault_cause", whereJson.getString("fault_cause"));
+        json.put("fault_analysis", whereJson.getString("fault_analysis"));
+        json.put("measure", whereJson.getString("measure"));
+        recordTab.insert(json);
+
     }
 
     @Override

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql

@@ -266,13 +266,18 @@
             	file.device_name,
             	file.extend_code,
                 d1.name AS dept_name,
-                d2.name AS use_name
+                d2.name AS use_name,
+                r.fault_comment,
+                r.fault_cause,
+                r.fault_analysis,
+                r.measure
             FROM
             	EM_BI_DeviceRepairMst mst
             	LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
             	LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
                 LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
                 LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
+                LEFT JOIN EM_BI_DeviceRepairRecord r ON r.repair_id = mst.repair_id
             WHERE
                 mst.is_delete = '0'
                 AND file.is_delete = '0'

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICEFAULTCAE01.wql

@@ -54,7 +54,9 @@
                 MAX(class.class_name) AS class_name,
                 MAX(file.device_code) AS device_code,
                 MAX(file.device_model) AS device_model,
-                re.devicerecord_id
+                re.devicerecord_id,
+                file.device_name,
+                file.extend_code
             FROM
             	EM_BI_DeviceRepairRequest re
             	LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = re.devicerecord_id
@@ -106,7 +108,6 @@
                 pari.outsourceaskfor_optid,
                 pari.confirm_time,
                 pari.audit_time,
-                pari.product_person_name,
                 pari.update_optname
             FROM
             	EM_BI_DeviceRepairRequest re

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/rest/DevicemaintenanceplanmstController.java

@@ -47,6 +47,13 @@ public class DevicemaintenanceplanmstController {
         return new ResponseEntity<>(devicemaintenanceplanmstService.queryDevice(whereJson, page), HttpStatus.OK);
     }
 
+    @GetMapping("/queryDevice2")
+    @Log("查询设备档案2")
+    @ApiOperation("查询设备档案2")
+    public ResponseEntity<Object> queryDevice2(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(devicemaintenanceplanmstService.queryDevice2(whereJson, page), HttpStatus.OK);
+    }
+
     @PostMapping
     @Log("新增设备保养计划维护")
     @ApiOperation("新增设备保养计划维护")

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/DevicemaintenanceplanmstService.java

@@ -82,6 +82,15 @@ public interface DevicemaintenanceplanmstService {
      */
     Map<String, Object> queryDevice(Map whereJson, Pageable page);
 
+    /**
+     * 查询数据分页
+     *
+     * @param whereJson 条件
+     * @param page      分页参数
+     * @return Map<String, Object>
+     */
+    Map<String, Object> queryDevice2(Map whereJson, Pageable page);
+
     /**
      * 获取明细
      *

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java

@@ -45,6 +45,7 @@ import cn.hutool.core.util.ObjectUtil;
 @Slf4j
 public class DevicemaintenanceplanmstServiceImpl implements DevicemaintenanceplanmstService {
     private final ClassstandardService classstandardService;
+    private final DeptService deptService;
 
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
@@ -244,6 +245,38 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla
         return json;
     }
 
+    @Override
+    public Map<String, Object> queryDevice2(Map whereJson, Pageable page) {
+        DeptService deptService = SpringContextHolder.getBean(DeptService.class);
+        String device_code = MapUtil.getStr(whereJson, "device_code");
+        // 查询设备档案
+        HashMap<String, String> map = new HashMap<>();
+        map.put("flag", "4");
+        if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code", "%"+device_code+"%");
+
+        String dept_id = MapUtil.getStr(whereJson, "dept_id");
+        if (!StrUtil.isEmpty(dept_id)) {
+            String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id));
+            map.put("deptIds", deptIds);
+        }
+
+        String use_id = MapUtil.getStr(whereJson, "use_id");
+        if (!StrUtil.isEmpty(use_id)) {
+            String useIds = deptService.getChildIdStr(Long.parseLong(use_id));
+            map.put("useIds", useIds);
+        }
+
+        // 获取当前登陆用户
+        Long currentUserId = SecurityUtils.getCurrentUserId();
+        String dept_str = deptService.getChildIdStr(currentUserId);
+        if (ObjectUtil.isNotEmpty(dept_str)) {
+            map.put("dept_str",dept_str);
+        }
+
+        JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCEPLAN001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "file.update_time DESC");
+        return json;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public JSONArray getDtl(JSONObject whereJson) {

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql

@@ -15,6 +15,7 @@
 	#################################################
 	输入.flag					        TYPEAS s_string
 	输入.classIds					    TYPEAS f_string
+	输入.dept_str					    TYPEAS f_string
 	输入.deptIds					        TYPEAS f_string
 	输入.useIds					        TYPEAS f_string
 	输入.device_code					    TYPEAS s_string
@@ -154,5 +155,41 @@
 		ENDQUERY
 	ENDIF
 
+	IF 输入.flag = "4"
+		PAGEQUERY
+			SELECT
+            	file.*,
+            	class.class_name,
+            	work.workprocedure_name,
+                d1.name AS dept_name,
+                d2.name AS use_name
+            FROM
+            	EM_BI_EquipmentFile file
+            	LEFT JOIN md_pb_classstandard class ON file.material_type_id = class.class_id
+            	LEFT JOIN pdm_bi_workprocedure work ON file.workprocedure_id = work.workprocedure_id
+                LEFT JOIN sys_dept d1 ON file.belong_deptid = d1.dept_id
+                LEFT JOIN sys_dept d2 ON file.use_groupid = d2.dept_id
+            WHERE
+                file.is_delete = '0'
+                AND file.status not in (90,91)
+                AND d2.dept_id in 输入.dept_str
+
+                OPTION 输入.device_code <> ""
+                    (file.device_code like 输入.device_code or
+                    file.device_name like 输入.device_code)
+                ENDOPTION
+
+               OPTION 输入.deptIds <> ""
+                    d1.dept_id in 输入.deptIds
+               ENDOPTION
+
+               OPTION 输入.useIds <> ""
+                    d2.dept_id in 输入.useIds
+               ENDOPTION
+
+			ENDSELECT
+		ENDPAGEQUERY
+	ENDIF
+
 
 

mes/qd/src/views/wms/sb/repair/devicerepairpa/ExecuteDialog.vue

@@ -14,7 +14,7 @@
       </el-col>
       <el-col :span="6">
         <span>
-          <el-button icon="el-icon-check" size="mini" type="primary" @click="endRepair">结束维修</el-button>
+          <el-button icon="el-icon-check" size="mini" type="primary" @click="endRepair">保存并结束</el-button>
           <el-button icon="el-icon-check" size="mini" type="primary" @click="submitMain">保存</el-button>
           <el-button icon="el-icon-close" size="mini" type="info" @click="close">关闭</el-button>
         </span>
@@ -81,6 +81,38 @@
       </el-row>
     </el-form>
 
+    <div class="crud-opts2">
+      <span class="role-span">结果录入</span>
+    </div>
+
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="120px" label-suffix=":">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="故障描述" prop="fault_comment">
+            <el-input v-model="form.fault_comment" style="width: 580px;" rows="2" type="textarea" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="故障原因" prop="fault_cause">
+            <el-input v-model="form.fault_cause" style="width: 580px;" rows="2" type="textarea" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="问题分析" prop="fault_analysis">
+            <el-input v-model="form.fault_analysis" style="width: 580px;" rows="2" type="textarea" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="处理措施" prop="measure">
+            <el-input v-model="form.measure" style="width: 580px;" rows="2" type="textarea" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
     <div class="crud-opts2">
       <span class="role-span">项目明细</span>
     </div>

mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue

@@ -133,7 +133,7 @@
         >
           班组验收
         </el-button>
-        <el-button
+<!--        <el-button
           slot="right"
           class="filter-item"
           type="success"
@@ -143,7 +143,7 @@
           @click="resuftRepair"
         >
           结果录入
-        </el-button>
+        </el-button>-->
       </crudOperation>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="mySelectionChange">

mes/qd/src/views/wms/sb/repair/devicevprs/DeviceDialog.vue

@@ -0,0 +1,221 @@
+<template>
+  <el-dialog
+    title="设备选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+  >
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-width="80px"
+      label-suffix=":"
+    >
+      <el-form-item label="设备">
+        <el-input
+          v-model="query.device_code"
+          clearable
+          size="mini"
+          placeholder="编码、名称"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属部门">
+        <treeselect
+          v-model="query.dept_id"
+          :load-options="loadDepts"
+          :options="depts"
+          style="width: 200px;"
+          placeholder="请选择"
+        />
+      </el-form-item>
+      <el-form-item label="使用班组">
+        <treeselect
+          v-model="query.use_id"
+          :load-options="loadDepts"
+          :options="depts"
+          style="width: 200px;"
+          placeholder="请选择"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      size="mini"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @select="handleSelectionChange"
+      @select-all="onSelectAll"
+      @current-change="clickChange"
+    >
+      <el-table-column v-if="!isSingle" type="selection" width="55" />
+      <el-table-column v-if="isSingle" label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="device_code" label="设备编码" min-width="130" show-overflow-tooltip />
+      <el-table-column prop="device_name" label="设备名称" min-width="130" show-overflow-tooltip />
+      <el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
+      <el-table-column prop="class_name" label="设备类型" show-overflow-tooltip />
+      <el-table-column prop="dept_name" label="归属部门" show-overflow-tooltip />
+      <el-table-column prop="use_name" label="使用班组" show-overflow-tooltip />
+      <el-table-column prop="device_spec" label="规格" min-width="130" show-overflow-tooltip />
+      <el-table-column prop="device_model" label="型号" show-overflow-tooltip />
+      <el-table-column prop="supplier_name" label="供应商" show-overflow-tooltip />
+      <el-table-column prop="device_type" label="设备属性" :formatter="formatTypeName"/>
+      <el-table-column prop="workprocedure_name" label="工序" />
+      <el-table-column prop="is_produceuse" label="生产用途" show-overflow-tooltip />
+      <el-table-column prop="remark" label="备注" show-overflow-tooltip />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import crudDevicemaintenanceplanmst from '@/api/wms/sb/devicemaintenanceplanmst'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { getDepts } from '@/api/system/dept'
+
+export default {
+  name: 'Device',
+  components: { rrOperation, pagination, Treeselect },
+  cruds() {
+    return CRUD({
+      title: '设备',
+      url: 'api/devicemaintenanceplanmst/queryDevice2',
+      crudMethod: { ...crudDevicemaintenanceplanmst }, optShow: {}})
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    isSingle: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      tableRadio: null,
+      checkrow: null,
+      class_idStr: null,
+      depts: [],
+      rows: [],
+      XLList: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  created() {
+    this.getDepts()
+  },
+  methods: {
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    formatTypeName(row, cloum) {
+      if (row.device_type === '01') {
+        return '资产'
+      } else if (row.device_type === '02') {
+        return '普通设备'
+      } else if (row.device_type === '03') {
+        return '其他'
+      }
+    },
+    handleSelectionChange(val, row) {
+      if (this.isSingle) {
+        if (val.length > 1) {
+          this.$refs.table.clearSelection()
+          this.$refs.table.toggleRowSelection(val.pop())
+        } else {
+          this.checkrow = row
+        }
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      // 处理单选
+      if (this.isSingle && this.tableRadio) {
+        this.$emit('update:dialogShow', false)
+        this.$emit('tableChanged2', this.tableRadio)
+        return
+      }
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选设备')
+        return
+      }
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged2', this.rows)
+    },
+    // 获取弹窗内部门数据
+    loadDepts({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        getDepts({ enabled: true, pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 200)
+        })
+      }
+    },
+    getDepts() {
+      getDepts({ enabled: true }).then(res => {
+        this.depts = res.content.map(function(obj) {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+

mes/qd/src/views/wms/sb/repair/devicevprs/index.vue

@@ -96,19 +96,6 @@
                 </el-input>
               </el-form-item>
             </el-col>
-            <el-col span="12">
-              <el-form-item label="故障描述:" prop="solutions">
-                <el-input v-model="form.fault_desc" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col span="12">
-              <el-form-item label="班组配合人:" prop="product_person_name">
-                <el-input v-model="form.product_person_name" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
             <el-col span="12">
               <el-form-item label="故障等级:" prop="fault_level">
                 <el-select
@@ -129,6 +116,22 @@
             </el-col>
           </el-row>
 
+          <el-row>
+            <el-col span="12">
+              <el-form-item label="班组配合人:" prop="product_person_name">
+                <el-input v-model="form.product_person_name" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col span="24">
+              <el-form-item label="故障描述:" prop="solutions">
+                <el-input v-model="form.fault_desc" style="width: 650px;" rows="2" type="textarea" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
           <el-row>
             <el-col span="24">
               <el-form-item label="备注:" prop="remark">
@@ -202,7 +205,7 @@ import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
 import PicDialog from '@/views/wms/sb/repair/devicerepairrequest/PicDialog'
-import DeviceDialog from '@/views/wms/sb/upkeep/devicemaintenanceplan/DeviceDialog'
+import DeviceDialog from '@/views/wms/sb/repair/devicevprs/DeviceDialog'
 import FaultDialog from '@/views/wms/sb/repair/devicevprs/FaultDialog'
 import { getDepts } from '@/api/system/dept'
 
@@ -309,13 +312,7 @@ export default {
       })
     },
     formaLevelName(row, cloum) {
-      if (row.fault_level === '01') {
-        return '一级'
-      } else if (row.fault_level === '02') {
-        return '二级'
-      } else if (row.fault_level === '03') {
-        return '三级'
-      }
+      return this.dict.label.EM_FAULT_LEVEL[row.fault_level]
     },
     formatStatusName(row, cloum) {
       if (row.status === '01') {

mes/qd/src/views/wms/sb/stat/devicefaultcae/index.vue

@@ -69,11 +69,13 @@
         <el-table-column type="selection" width="55" />
         <el-table-column prop="dept_name" label="使用部门" />
         <el-table-column prop="class_name" label="设备类型" />
+        <el-table-column prop="device_name" label="设备名称" />
         <el-table-column prop="device_code" label="设备编码">
           <template slot-scope="scope">
             <el-link type="warning" @click="openDtl(scope.row)">{{ scope.row.device_code }}</el-link>
           </template>
         </el-table-column>
+        <el-table-column prop="extend_code" label="自编码" />
         <el-table-column prop="device_model" label="型号规格" />
         <el-table-column prop="nunm" label="故障次数" />
         <el-table-column prop="avgVal_time" label="平均故障间隔时间(小时)" :formatter="crud.formatNum2" />

mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue

@@ -111,6 +111,7 @@
         <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
         <el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip />
         <el-table-column prop="maintenancecycle" label="保养周期" :formatter="formatMainName"/>
+        <el-table-column prop="detail_count" label="明细数" />
         <el-table-column prop="plan_start_date" label="计划开始日期" width="150px" />
         <el-table-column prop="real_start_date" label="实际开始日期" width="150px" />
         <el-table-column prop="real_end_date" label="实际结束日期" width="150px" />