From 4129099cc52eb307f76cda9dfc24c0c634f6cfc7 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 04 9月 2024 13:38:55 +0800
Subject: [PATCH] 111
---
yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 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 5c2cda5..b837b91 100644
--- a/yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue
+++ b/yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue
@@ -29,6 +29,16 @@
</a-form-item>
</a-col>
<a-col :md="colMd" :sm="colSm">
+ <a-form-item label="鏉ユ簮" v-if="queryParam.selectModel == 2">
+ <a-input v-model="queryParam.createUserName" allow-clear placeholder="璇疯緭鍏ユ潵婧�" />
+ </a-form-item>
+ </a-col>
+ <a-col :md="colMd" :sm="colSm">
+ <a-form-item label="淇敼鏉ユ簮" v-if="queryParam.selectModel == 2">
+ <a-input v-model="queryParam.updatedUserName" allow-clear placeholder="璇疯緭鍏ヤ慨鏀规潵婧�" />
+ </a-form-item>
+ </a-col>
+ <a-col :md="colMd" :sm="colSm">
<a-form-item label="宸ュ簭">
<a-select
allow-clear
@@ -62,7 +72,6 @@
</a-select>
</a-form-item>
</a-col>
-
<a-col :md="colMd" :sm="colSm">
<a-form-item label="璐ㄩ噺鐘舵��">
<a-select
@@ -196,7 +205,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 +234,12 @@
align: 'center',
sorter: true,
dataIndex: 'qualityStateName'
+ },
+ {
+ title: '涓嶅悎鏍煎師鍥�',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'qualityNoOkReason'
},
{
title: '鎴愬搧鐮�',
@@ -310,10 +325,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: [],
--
Gitblit v1.9.3