From 5573ddf8f8b977d25561529b1ee912aca9b93801 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 13 9月 2024 09:49:45 +0800
Subject: [PATCH] 1
---
yiqi_iwara-scada-web/src/views/main/WorkPieceLogYield/index.vue | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 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 b6c0f05..a90f528 100644
--- a/yiqi_iwara-scada-web/src/views/main/WorkPieceLogYield/index.vue
+++ b/yiqi_iwara-scada-web/src/views/main/WorkPieceLogYield/index.vue
@@ -27,10 +27,20 @@
</a-form-item>
</a-col>
<a-col :md="colMd" :sm="colSm">
- <a-form-item label="鍒涘缓浜�">
- <a-input v-model="queryParam.createdUserName" allow-clear placeholder="璇疯緭鍏ュ垱寤轰汉" />
+ <a-form-item label="鏉ユ簮">
+ <a-input v-model="queryParam.dataCapturePointCname" allow-clear placeholder="璇疯緭鍏ユ潵婧�" />
</a-form-item>
</a-col>
+ <a-col :md="colMd" :sm="colSm">
+ <a-form-item label="鏉ユ簮浠ｇ爜">
+ <a-input v-model="queryParam.createdUserName" allow-clear placeholder="璇疯緭鍏ユ潵婧愪唬鐮�" />
+ </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
@@ -40,6 +50,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>
@@ -137,12 +161,6 @@
align: 'center',
customRender: (text, record, index) => `${index + 1}`
},
- // {
- // title: '褰撳墠璁惧',
- // align: 'center',
- // sorter: true,
- // dataIndex: 'equipmentName'
- // },
{
title: '褰撳墠宸ュ簭',
align: 'center',
@@ -155,14 +173,26 @@
sorter: true,
dataIndex: 'workPieceID'
},
+ // {
+ // title: '澶囨敞',
+ // align: 'center',
+ // sorter: true,
+ // dataIndex: 'remarks'
+ // },
{
- title: '澶囨敞',
+ title: '鏃ュ織绫诲瀷',
align: 'center',
sorter: true,
- dataIndex: 'remarks'
+ dataIndex: 'pieceLogTypeName'
},
{
- title: '鍒涘缓浜�',
+ title: '鏉ユ簮',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'dataCapturePointCname'
+ },
+ {
+ title: '鏉ユ簮浠ｇ爜',
align: 'center',
sorter: true,
dataIndex: 'createdUserName'
@@ -181,6 +211,7 @@
equitypeData: [],
// 宸ュ簭涓嬫媺妗嗘暟鎹�
WorkPieceSelectData: [],
+ PieceLogType:[],
// 璐ㄩ噺鐘舵�佷笅鎷夋鏁版嵁
QualityStateSelectData: [],
pages: {
@@ -189,7 +220,7 @@
total: 0,
showTotal: (total, range) => `${range[0]}-${range[1]}鍏�${total}鏉,
showSizeChanger: true,
- pageSizeOptions: ['10', '20', '30', '40'],
+ pageSizeOptions: ['10', '20', '30', '40','50','100','200','300','400','500','1000'],
onChange: this.getData,
onShowSizeChange: this.showSizeChange
}
@@ -200,6 +231,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: {
--
Gitblit v1.9.3