From 7ac480c448742b7635d5f87363207b69ae737317 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 11 Oct 2022 15:40:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SafeaccountServiceImpl.java  |  2 +-
 .../impl/SpecialaccountServiceImpl.java       |  2 +-
 .../wms/basedata/em/equipmentfile/index.vue   | 28 +++++++++----------
 .../src/views/wms/sb/re/safeaccount/index.vue | 16 +++++------
 .../views/wms/sb/re/specialaccount/index.vue  | 22 +++++++--------
 5 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/re/service/impl/SafeaccountServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/re/service/impl/SafeaccountServiceImpl.java
index a1c3fecb..b516cc9e 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/re/service/impl/SafeaccountServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/re/service/impl/SafeaccountServiceImpl.java
@@ -45,7 +45,7 @@ public class SafeaccountServiceImpl implements SafeaccountService {
         map.put("flag", "1");
         if (!ObjectUtil.isEmpty(device_code)) map.put("device_code", "%" + device_code + "%");
         map.put("docimasy_date", docimasy_date);
-        JSONObject json = WQL.getWO("QEM_BI_SAFEACCOUNT001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "");
+        JSONObject json = WQL.getWO("QEM_BI_SAFEACCOUNT001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "s.update_time DESC");
 
         JSONArray content = json.getJSONArray("content");
         for (int i = 0; i < content.size(); i++) {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/re/service/impl/SpecialaccountServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/re/service/impl/SpecialaccountServiceImpl.java
index c7cea716..1d49f85f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/re/service/impl/SpecialaccountServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/re/service/impl/SpecialaccountServiceImpl.java
@@ -44,7 +44,7 @@ public class SpecialaccountServiceImpl implements SpecialaccountService {
         map.put("flag", "1");
         if (!ObjectUtil.isEmpty(device_code)) map.put("device_code", "%" + device_code + "%");
         map.put("valid_term", valid_term);
-        JSONObject json = WQL.getWO("QEM_BI_SPECIALACCOUNT001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "");
+        JSONObject json = WQL.getWO("QEM_BI_SPECIALACCOUNT001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "s.update_time DESC");
 
         JSONArray content = json.getJSONArray("content");
         for (int i = 0; i < content.size(); i++) {
diff --git a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue
index 456d9936..0180a69a 100644
--- a/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue
+++ b/mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue
@@ -214,7 +214,7 @@
           </template>
         </el-table-column>
         <el-table-column :selectable="checkboxT" type="selection" width="55" />
-        <el-table-column prop="设备代码" width="100" label="设备代码">
+        <el-table-column prop="设备代码" width="100" label="设备代码" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.device_code }}</el-link>
           </template>
@@ -229,20 +229,20 @@
         <el-table-column prop="beginuse_date" min-width="90" label="启用日期"/>
         <el-table-column prop="use_deptname" min-width="130" label="使用部门"/>
         <el-table-column prop="use_groupname" min-width="130" label="使用班组"/>
-        <el-table-column prop="supplier_name" min-width="180" label="供应商"/>
-        <el-table-column prop="manufacturer" min-width="180" label="制造商"/>
+        <el-table-column prop="supplier_name" min-width="180" label="供应商" show-overflow-tooltip/>
+        <el-table-column prop="manufacturer" min-width="180" label="制造商" show-overflow-tooltip/>
         <el-table-column prop="country_manufactur" min-width="90" label="制造国别"/>
-        <el-table-column prop="leavefactory_date" min-width="80" label="出厂日期"/>
-        <el-table-column prop="leavefactory_number" min-width="130" label="出厂编号"/>
-        <el-table-column prop="drawing_number" min-width="130" label="图号"/>
-        <el-table-column prop="device_type" min-width="70" label="设备属性" :formatter="device_typeFormat"/>
-        <el-table-column prop="workprocedure_id" min-width="70" label="工序" :formatter="seriesFormat2" />
-        <el-table-column prop="assets_code" min-width="100" label="资产编码"/>
-        <el-table-column prop="assets_name" min-width="150" label="资产名称"/>
-        <el-table-column prop="create_name" min-width="90" label="生成人"/>
-        <el-table-column prop="create_time" min-width="140" label="生成时间"/>
-        <el-table-column prop="update_optname" min-width="90" label="修改人"/>
-        <el-table-column prop="update_time" min-width="140" label="修改时间"/>
+        <el-table-column prop="leavefactory_date" min-width="80" label="出厂日期" show-overflow-tooltip/>
+        <el-table-column prop="leavefactory_number" min-width="130" label="出厂编号" show-overflow-tooltip/>
+        <el-table-column prop="drawing_number" min-width="130" label="图号" show-overflow-tooltip/>
+        <el-table-column prop="device_type" min-width="70" label="设备属性" :formatter="device_typeFormat" show-overflow-tooltip/>
+        <el-table-column prop="workprocedure_id" min-width="70" label="工序" :formatter="seriesFormat2" show-overflow-tooltip/>
+        <el-table-column prop="assets_code" min-width="100" label="资产编码" show-overflow-tooltip/>
+        <el-table-column prop="assets_name" min-width="150" label="资产名称" show-overflow-tooltip/>
+        <el-table-column prop="create_name" min-width="90" label="生成人" show-overflow-tooltip/>
+        <el-table-column prop="create_time" min-width="140" label="生成时间" show-overflow-tooltip/>
+        <el-table-column prop="update_optname" min-width="90" label="修改人" show-overflow-tooltip/>
+        <el-table-column prop="update_time" min-width="140" label="修改时间" show-overflow-tooltip/>
       </el-table>
       <!--分页组件-->
       <pagination />
diff --git a/mes/qd/src/views/wms/sb/re/safeaccount/index.vue b/mes/qd/src/views/wms/sb/re/safeaccount/index.vue
index bef65db9..f7817b38 100644
--- a/mes/qd/src/views/wms/sb/re/safeaccount/index.vue
+++ b/mes/qd/src/views/wms/sb/re/safeaccount/index.vue
@@ -120,21 +120,21 @@
       <el-table ref="table" v-loading="crud.loading" :row-style="tableRowClassName" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="devicebill_id" label="设备标识" />
-        <el-table-column show-overflow-tooltip prop="device_code" label="设备代码" width="130px">
+        <el-table-column show-overflow-tooltip prop="device_code" label="设备代码" width="180px">
           <template slot-scope="scope">
             <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.device_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column prop="device_name" label="设备名称" width="120px" />
-        <el-table-column prop="device_model" label="规格型号" width="120px" />
+        <el-table-column prop="device_name" label="设备名称" width="120px" show-overflow-tooltip />
+        <el-table-column prop="device_model" label="规格型号" width="120px" show-overflow-tooltip />
         <el-table-column prop="use_group" label="使用班组" />
-        <el-table-column prop="use_device" label="使用设备" width="120px" />
+        <el-table-column prop="use_device" label="使用设备" width="120px" show-overflow-tooltip />
         <el-table-column prop="qty" label="数量" />
-        <el-table-column prop="docimasy_date" label="检定日期" width="120px" />
-        <el-table-column prop="next_docimasy_date" label="下次检定日期" width="120px" />
-        <el-table-column prop="code" label="编号" width="120px" />
+        <el-table-column prop="docimasy_date" label="检定日期" width="120px" show-overflow-tooltip />
+        <el-table-column prop="next_docimasy_date" label="下次检定日期" width="120px" show-overflow-tooltip />
+        <el-table-column prop="code" label="编号" width="120px" show-overflow-tooltip />
         <el-table-column prop="use_person" label="设备责任人" />
-        <el-table-column prop="certificate_code" label="证书编号" width="120px" />
+        <el-table-column prop="certificate_code" label="证书编号" width="120px" show-overflow-tooltip />
         <el-table-column prop="remark" label="备注" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
diff --git a/mes/qd/src/views/wms/sb/re/specialaccount/index.vue b/mes/qd/src/views/wms/sb/re/specialaccount/index.vue
index 1e9185de..b54dacad 100644
--- a/mes/qd/src/views/wms/sb/re/specialaccount/index.vue
+++ b/mes/qd/src/views/wms/sb/re/specialaccount/index.vue
@@ -125,22 +125,22 @@
       <el-table ref="table" v-loading="crud.loading" :row-style="tableRowClassName" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="devicebill_id" label="设备标识" />
-        <el-table-column show-overflow-tooltip prop="device_code" label="设备代码" width="130px">
+        <el-table-column show-overflow-tooltip prop="device_code" label="设备代码" width="180px">
           <template slot-scope="scope">
             <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.device_code }}</el-link>
           </template>
         </el-table-column>
         <el-table-column prop="device_name" label="设备名称" />
-        <el-table-column prop="register_code" label="设备注册代码" width="120px" />
-        <el-table-column prop="certificate_code" label="使用证书编号" width="120px" />
-        <el-table-column prop="product_date" label="制造日期" width="110px" />
-        <el-table-column prop="use_date" label="投用日期" width="110px" />
-        <el-table-column prop="curr_address" label="设备所在位置" width="120px" />
-        <el-table-column prop="use_status" label="使用状况" />
-        <el-table-column prop="use_person" label="设备责任人" />
-        <el-table-column prop="valid_term" label="检验有效期" width="110px" />
-        <el-table-column prop="use_years" label="设计使用年限" width="110px" />
-        <el-table-column prop="report_code" label="报告编号" />
+        <el-table-column prop="register_code" label="设备注册代码" width="120px" show-overflow-tooltip />
+        <el-table-column prop="certificate_code" label="使用证书编号" width="120px" show-overflow-tooltip />
+        <el-table-column prop="product_date" label="制造日期" width="110px" show-overflow-tooltip />
+        <el-table-column prop="use_date" label="投用日期" width="110px" show-overflow-tooltip />
+        <el-table-column prop="curr_address" label="设备所在位置" width="120px" show-overflow-tooltip />
+        <el-table-column prop="use_status" label="使用状况" show-overflow-tooltip />
+        <el-table-column prop="use_person" label="设备责任人" show-overflow-tooltip />
+        <el-table-column prop="valid_term" label="检验有效期" width="110px" show-overflow-tooltip />
+        <el-table-column prop="use_years" label="设计使用年限" width="110px" show-overflow-tooltip />
+        <el-table-column prop="report_code" label="报告编号" show-overflow-tooltip />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation