root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2022-10-11 15:40:10 +08:00
parent d3c9cb96fe
commit 7ac480c448
5 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/re/service/impl/SafeaccountServiceImpl.java
View File

@@ -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++) {

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/re/service/impl/SpecialaccountServiceImpl.java
View File

@@ -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++) {

28
mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue
View File

@@ -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 />

16
mes/qd/src/views/wms/sb/re/safeaccount/index.vue
View File

@@ -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">

22
mes/qd/src/views/wms/sb/re/specialaccount/index.vue
View File

@@ -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