From f04d2a8fce3ffe25ea0b43ed16fd4f65a2574468 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 03 9月 2024 10:03:19 +0800
Subject: [PATCH] //修正：查询的工序是当前线程的工序，而不是当前数据的工序 【Editby shaocx,2024-09-03】
---
yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue b/yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue
index d81cc4a..57cafa8 100644
--- a/yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue
+++ b/yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue
@@ -196,7 +196,7 @@
total: 0,
showSizeChanger: true,
showTotal: (total, range) => `${range[0]}-${range[1]}鍏�${total}鏉,
- pageSizeOptions: ['10', '20', '30', '40'],
+ pageSizeOptions: ['10', '20', '30', '40','50','100','200','300','400','500'],
onChange: this.getData,
onShowSizeChange: this.pageSizeChange
},
@@ -225,6 +225,12 @@
align: 'center',
sorter: true,
dataIndex: 'qualityStateName'
+ },
+ {
+ title: '涓嶅悎鏍煎師鍥�',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'qualityNoOkReason'
},
{
title: '鎴愬搧鐮�',
@@ -310,10 +316,28 @@
dataIndex: 'timeSceonds'
},
{
- title: '鏁版嵁鏉ユ簮',
+ title: '鏉ユ簮',
align: 'center',
sorter: true,
dataIndex: 'createUserName'
+ },
+ {
+ title: '鏉ユ簮鎻忚堪',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'dataCapturePointCname'
+ },
+ {
+ title: '淇敼鏉ユ簮',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'updatedUserName'
+ },
+ {
+ title: '淇敼鏉ユ簮鎻忚堪',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'updateDataCapturePointCname'
}
],
data: [],
@@ -376,11 +400,13 @@
if (item.operationTypeHand == 'SPC') {
item.disabled =
item.workingProcedureCurrent == 'OP05' ||
- item.workingProcedureCurrent == 'OP70' ||
+ //鍘绘帀OP70鐨勪笉鏄剧ず璐ㄩ噺鏁版嵁 銆怑ditby shaocx,2024-08-18銆�
+ //item.workingProcedureCurrent == 'OP70' ||
item.workingProcedureCurrent == 'OP80'
} else {
item.disabled = item.workingProcedureCurrent == 'OP05' || item.workingProcedureCurrent == 'OP50'
- || item.workingProcedureCurrent == 'OP70'
+ //鍘绘帀OP70鐨勪笉鏄剧ず璐ㄩ噺鏁版嵁 銆怑ditby shaocx,2024-08-18銆�
+ //|| item.workingProcedureCurrent == 'OP70'
}
})
},
--
Gitblit v1.9.3