From 8e451b57702434dcf0ec9deb2e7398d235970260 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 26 八月 2025 16:50:31 +0800
Subject: [PATCH] 报工查询页面、产线选择下拉框调整
---
src/views/mes/MesWorkReportingList.vue | 118 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 60 insertions(+), 58 deletions(-)
diff --git a/src/views/mes/MesWorkReportingList.vue b/src/views/mes/MesWorkReportingList.vue
index d9a2d33..68ffbb0 100644
--- a/src/views/mes/MesWorkReportingList.vue
+++ b/src/views/mes/MesWorkReportingList.vue
@@ -5,6 +5,13 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="浜х嚎">
+ <j-search-select-tag placeholder="璇烽�夋嫨" v-model="queryParam.factoryId"
+ dict="base_factory,factory_name,id,del_flag=0 and factory_category = '3'"
+ ></j-search-select-tag>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="璁㈠崟鍙�">
<j-search-select-tag placeholder="璇疯緭鍏ヨ鍗曞彿" v-model="queryParam.orderId"
dict="mes_production_order,order_code,id"
@@ -14,46 +21,41 @@
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="宸ュ崟鍙�">
<j-search-select-tag placeholder="璇疯緭鍏ュ伐鍗曞彿" v-model="queryParam.workOrderId"
- dict="mes_production_work_order,work_order_code,id"
+ dict="mes_production_work_order,work_order_code,id,del_flag=0 and work_order_status != 'NEW'"
></j-search-select-tag>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="浜х嚎鍚嶇О">
- <j-search-select-tag
- dict="base_factory,factory_name,id"
- placeholder="璇烽�夋嫨浜х嚎鍚嶇О"
- v-model="queryParam.factoryId"
- display="factoryName"
- codeField="id"
- />
+ <template v-if="toggleSearchStatus">
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鎵规鍙�">
+ <j-input placeholder="璇疯緭鍏ユ壒娆″彿" v-model="queryParam.batchNumber"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鎵樺彿">
+ <j-input placeholder="璇疯緭鍏ユ墭鍙�" v-model="queryParam.palletNumber"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鎶ュ伐浜�">
+ <j-select-user-by-dep placeholder="璇疯緭鍏ユ姤宸ヤ汉" v-model="queryParam.reporter"></j-select-user-by-dep>
+ </a-form-item>
+ </a-col><a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="绾胯竟浠�">
+ <j-search-select-tag placeholder="璇疯緭鍏ョ嚎杈逛粨鍚嶇О" v-model="queryParam.warehouseId"
+ dict="base_line_side_warehouse,warehouse_name,id,del_flag=0 and warehouse_status = '1'"
+ ></j-search-select-tag>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鎵规鍙�">
- <j-input placeholder="璇疯緭鍏ユ壒娆″彿" v-model="queryParam.batchNumber"></j-input>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鎵樺彿">
- <j-input placeholder="璇疯緭鍏ユ墭鍙�" v-model="queryParam.palletNumber"></j-input>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鎶ュ伐浜�">
- <j-select-user-by-dep placeholder="璇疯緭鍏ユ姤宸ヤ汉" v-model="queryParam.reporter"></j-select-user-by-dep>
- </a-form-item>
- </a-col><a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="绾胯竟浠�">
- <j-search-select-tag placeholder="璇疯緭鍏ョ嚎杈逛粨鍚嶇О" v-model="queryParam.warehouseId"
- dict="base_line_side_warehouse,warehouse_name,id"
- ></j-search-select-tag>
- </a-form-item>
- </a-col>
+ </template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a @click="handleToggleSearch" style="margin-left: 8px">
+ {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
+ <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+ </a>
</span>
</a-col>
</a-row>
@@ -73,10 +75,10 @@
<!-- table鍖哄煙-begin -->
<div>
- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
- <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
- <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
- </div>
+<!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!-- <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�-->
+<!-- <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>-->
+<!-- </div>-->
<a-table
ref="table"
@@ -88,7 +90,7 @@
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ :rowSelection="null"
class="j-table-force-nowrap"
@change="handleTableChange">
@@ -168,17 +170,17 @@
}
},
{
- title:'璁㈠崟ID',
+ title:'鐢熶骇璁㈠崟鍙�',
align:"center",
dataIndex: 'orderId_dictText'
},
{
- title:'宸ュ崟ID',
+ title:'鎺掍骇宸ュ崟鍙�',
align:"center",
dataIndex: 'workOrderId_dictText'
},
{
- title:'浜х嚎ID',
+ title:'浜х嚎',
align:"center",
dataIndex: 'factoryId_dictText'
},
@@ -198,6 +200,11 @@
dataIndex: 'quantity'
},
{
+ title:'绾胯竟浠�',
+ align:"center",
+ dataIndex: 'warehouseId_dictText'
+ },
+ {
title:'鎶ュ伐浜�',
align:"center",
dataIndex: 'reporter'
@@ -207,24 +214,19 @@
align:"center",
dataIndex: 'reportTime'
},
- {
- title:'绾胯竟浠揑D',
- align:"center",
- dataIndex: 'warehouseId_dictText'
- },
- {
- title:'鎴愬搧涓嬬嚎鎵撳嵃鐘舵��',
- align:"center",
- dataIndex: 'printStatus_dictText'
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align:"center",
- fixed:"right",
- width:147,
- scopedSlots: { customRender: 'action' }
- }
+ // {
+ // title:'鎴愬搧涓嬬嚎鎵撳嵃鐘舵��',
+ // align:"center",
+ // dataIndex: 'printStatus_dictText'
+ // },
+ // {
+ // title: '鎿嶄綔',
+ // dataIndex: 'action',
+ // align:"center",
+ // fixed:"right",
+ // width:147,
+ // scopedSlots: { customRender: 'action' }
+ // }
],
url: {
list: "/mes/mesWorkReporting/list",
--
Gitblit v1.9.3