From 16edbbe772e24eb71f6519558576d513e3cf2746 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 9月 2025 15:31:07 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/DF22001YiQi
---
yiqi_iwara-scada-web/src/views/main/WorkPieceProcess/index.vue | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 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..22bb665 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,20 @@
</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.IsHaveOP80Code"
+ placeholder="璇烽�夋嫨鏄惁鏈夋垚鍝佺爜"
+ >
+ <a-select-option v-for="(item, index) in IsHaveOP80Code" :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
@@ -196,7 +219,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 +248,12 @@
align: 'center',
sorter: true,
dataIndex: 'qualityStateName'
+ },
+ {
+ title: '涓嶅悎鏍煎師鍥�',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'qualityNoOkReason'
},
{
title: '鎴愬搧鐮�',
@@ -310,10 +339,34 @@
dataIndex: 'timeSceonds'
},
{
- title: '鏁版嵁鏉ユ簮',
+ title: '澶瑰叿宸ヤ綅',
+ align: 'center',
+ sorter: true,
+ dataIndex: 'jiaJuGongWei'
+ },
+ {
+ 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: [],
@@ -351,6 +404,7 @@
created() {
this.getEquipmentName()
this.ProcessSelectData = this.$options.filters['dictData']('process_type')
+ this.IsHaveOP80Code = this.$options.filters['dictData']('yes_or_no')
this.WorkPieceSelectData = this.$options.filters['dictData']('workpiece_state')
this.modelEnums = [
--
Gitblit v1.9.3