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/WorkPieceLogYield/index.vue | 29 ++++++++++++++
yiqi_iwara-scada-web/src/views/main/WorkPieceOutbound/index.vue | 53 ++++++++++++++------------
2 files changed, 57 insertions(+), 25 deletions(-)
diff --git a/yiqi_iwara-scada-web/src/views/main/WorkPieceLogYield/index.vue b/yiqi_iwara-scada-web/src/views/main/WorkPieceLogYield/index.vue
index ca06fbc..1bc4401 100644
--- a/yiqi_iwara-scada-web/src/views/main/WorkPieceLogYield/index.vue
+++ b/yiqi_iwara-scada-web/src/views/main/WorkPieceLogYield/index.vue
@@ -32,6 +32,11 @@
</a-form-item>
</a-col>
<a-col :md="colMd" :sm="colSm">
+ <a-form-item label="澶囨敞">
+ <a-input v-model="queryParam.remarks" allow-clear placeholder="璇疯緭鍏ュ娉�" />
+ </a-form-item>
+ </a-col>
+ <a-col :md="colMd" :sm="colSm">
<a-form-item label="宸ュ簭">
<a-select
allow-clear
@@ -40,6 +45,20 @@
placeholder="璇烽�夋嫨宸ュ簭"
>
<a-select-option v-for="(item, index) in ProcessSelectData" :key="index" :value="item.code">
+ {{ item.name }}
+ </a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ <a-col :md="colMd" :sm="colSm">
+ <a-form-item label="鏃ュ織绫诲瀷">
+ <a-select
+ allow-clear
+ style="width: 100%"
+ v-model="queryParam.pieceLogType"
+ placeholder="璇烽�夋嫨鏃ュ織绫诲瀷"
+ >
+ <a-select-option v-for="(item, index) in PieceLogType" :key="index" :value="item.code">
{{ item.name }}
</a-select-option>
</a-select>
@@ -162,6 +181,12 @@
dataIndex: 'remarks'
},
{
+ title: '鏃ュ織绫诲瀷',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'pieceLogTypeName'
+ },
+ {
title: '鍒涘缓浜�',
align: 'center',
sorter: true,
@@ -181,6 +206,7 @@
equitypeData: [],
// 宸ュ簭涓嬫媺妗嗘暟鎹�
WorkPieceSelectData: [],
+ PieceLogType:[],
// 璐ㄩ噺鐘舵�佷笅鎷夋鏁版嵁
QualityStateSelectData: [],
pages: {
@@ -189,7 +215,7 @@
total: 0,
showTotal: (total, range) => `${range[0]}-${range[1]}鍏�${total}鏉,
showSizeChanger: true,
- pageSizeOptions: ['10', '20', '30', '40','50','100','200','300','400','500'],
+ pageSizeOptions: ['10', '20', '30', '40','50','100','200','300','400','500','1000'],
onChange: this.getData,
onShowSizeChange: this.showSizeChange
}
@@ -200,6 +226,7 @@
this.initData();
this.getData()
this.ProcessSelectData = this.$options.filters['dictData']('process_type')
+ this.PieceLogType = this.$options.filters['dictData']('PieceLogType')
this.QualityStateSelectData = this.$options.filters['dictData']('quality_state')
},
methods: {
diff --git a/yiqi_iwara-scada-web/src/views/main/WorkPieceOutbound/index.vue b/yiqi_iwara-scada-web/src/views/main/WorkPieceOutbound/index.vue
index 2ef6304..90ad060 100644
--- a/yiqi_iwara-scada-web/src/views/main/WorkPieceOutbound/index.vue
+++ b/yiqi_iwara-scada-web/src/views/main/WorkPieceOutbound/index.vue
@@ -15,6 +15,11 @@
</a-form-item>
</a-col>
<a-col :md="colMd" :sm="colSm">
+ <a-form-item label="鍑哄簱浜�">
+ <a-input v-model="queryParam.workPieceOutboundUserName" allow-clear placeholder="璇疯緭鍏ュ嚭搴撲汉" />
+ </a-form-item>
+ </a-col>
+ <a-col :md="colMd" :sm="colSm">
<a-form-item label="鍑哄簱鏃堕棿">
<a-range-picker style="width:100%" :show-time="{format:'HH:mm'}" v-model="queryParam.dates" format="YYYY-MM-DD HH:mm" />
</a-form-item>
@@ -108,36 +113,36 @@
sorter: true,
dataIndex: 'oP80NewCode'
},
- {
- title: '闃舵',
- align: 'center',
- sorter: true,
- dataIndex: 'unLineStageName'
- },
- {
- title: '灏忚溅鐮�',
- align: 'center',
- sorter: true,
- dataIndex: 'carNo'
- },
+ // {
+ // title: '闃舵',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'unLineStageName'
+ // },
+ // {
+ // title: '灏忚溅鐮�',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'carNo'
+ // },
{
title: '宸ヤ欢鍙�',
align: 'center',
sorter: true,
dataIndex: 'workPieceID'
},
- {
- title: '涓嬬嚎鏃堕棿',
- align: 'center',
- sorter: true,
- dataIndex: 'workPieceUnLineTime'
- },
- {
- title: '涓嬬嚎浜�',
- align: 'center',
- sorter: true,
- dataIndex: 'workPieceUnLineUserName'
- },
+ // {
+ // title: '涓嬬嚎鏃堕棿',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'workPieceUnLineTime'
+ // },
+ // {
+ // title: '涓嬬嚎浜�',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'workPieceUnLineUserName'
+ // },
{
title: '鍑哄簱鏃堕棿',
align: 'center',
--
Gitblit v1.9.3