From 15662d05c2e2a8620cdabf9038c94f7b64a106d2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 9月 2024 09:33:16 +0800
Subject: [PATCH] 修复
---
yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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..efb3565 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: '鎴愬搧鐮�',
@@ -376,11 +382,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