diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
index 3158c35f..4b35dfa6 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
@@ -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,
diff --git a/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue b/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue
index 3eac81e1..291ec39a 100644
--- a/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue
+++ b/mes/qd/src/views/wms/sb/stat/task/bigScreen.vue
@@ -9,14 +9,14 @@
-
-
+
+
-
-
-
+
+
+
@@ -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;
}