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-09-21 19:08:17 +08:00
parent a222eb695d
commit fc0228a748
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
View File

@@ -276,12 +276,12 @@
mst.invstatus
WHEN '01' THEN '生成'
WHEN '02' THEN '提交'
WHEN '03' THEN '开始'
WHEN '03' THEN '维修开始'
WHEN '04' THEN '委外维修'
WHEN '05' THEN '委外验收'
WHEN '06' THEN '结束'
WHEN '07' THEN '确认'
WHEN '99' THEN '审核'
WHEN '06' THEN '维修结束'
WHEN '07' THEN '班组确认'
WHEN '99' THEN '审核完毕'
END
) AS invstatus,
mst.real_start_date,
@@ -332,12 +332,12 @@
CASE mst.invstatus
WHEN '01' THEN '生成'
WHEN '02' THEN '提交'
WHEN '03' THEN '开始'
WHEN '03' THEN '维修开始'
WHEN '04' THEN '委外维修'
WHEN '05' THEN '委外验收'
WHEN '06' THEN '结束'
WHEN '07' THEN '确认'
WHEN '99' THEN '审核'
WHEN '06' THEN '维修结束'
WHEN '07' THEN '班组确认'
WHEN '99' THEN '审核完毕'
END
)
END
@@ -368,6 +368,7 @@
st.is_delete = '0'
AND (st.status <> '99')
AND mst.source_bill_type = 'BXD'
AND st.is_passed = '1'
UNION
@@ -388,10 +389,10 @@
mst.invstatus
WHEN '01' THEN '生成'
WHEN '02' THEN '提交'
WHEN '03' THEN '开始'
WHEN '04' THEN '结束'
WHEN '05' THEN '确认'
WHEN '99' THEN '审核'
WHEN '03' THEN '保养开始'
WHEN '04' THEN '保养结束'
WHEN '05' THEN '班组确认'
WHEN '99' THEN '审核完毕'
END
) AS invstatus,
mst.real_start_date,

12
mes/qd/src/views/wms/sb/stat/task/bigScreen.vue
View File

@@ -9,14 +9,14 @@
<el-table-column prop="maintenancecycle" label="任务类型" />
<el-table-column prop="fault_level" label="故障等级" />
<!-- <el-table-column prop="" label="部门" />-->
<el-table-column prop="fault_desc" label="故障描述" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
<el-table-column prop="fault_desc" width="170px" label="故障描述" />
<el-table-column prop="device_name" width="150px" label="设备名称" />
<el-table-column prop="extend_code" label="自编号" show-overflow-tooltip />
<el-table-column prop="dept_name" label="使用部门" show-overflow-tooltip />
<el-table-column prop="invstatus" label="状态" />
<el-table-column prop="user_name" label="维修/保养人" show-overflow-tooltip />
<el-table-column prop="real_start_date" label="开始时间" show-overflow-tooltip />
<el-table-column prop="real_end_date" label="结束时间" show-overflow-tooltip />
<el-table-column prop="user_name" width="170px" label="维修/保养人" />
<el-table-column prop="real_start_date" width="150px" label="开始时间" show-overflow-tooltip />
<el-table-column prop="real_end_date" width="150px" label="结束时间" show-overflow-tooltip />
</el-table>
</div>
</div>
@@ -148,7 +148,7 @@ export default {
}
.t_btn2 >>> .el-table--enable-row-transition .el-table__body td,
.el-table .cell {
padding: 0;
padding: 5px 0px;
background-color: transparent;
}