From 048754581793509a57481dfcb7c51f838cb7f576 Mon Sep 17 00:00:00 2001
From: houshuai <17802598606@163.com>
Date: 星期一, 07 七月 2025 20:49:33 +0800
Subject: [PATCH] 生产管控模块 基本搭建2
---
src/views/mes/MesWorkReportingList.vue | 74 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 17 deletions(-)
diff --git a/src/views/mes/MesWorkReportingList.vue b/src/views/mes/MesWorkReportingList.vue
index 142f6f5..7c50ded 100644
--- a/src/views/mes/MesWorkReportingList.vue
+++ b/src/views/mes/MesWorkReportingList.vue
@@ -4,6 +4,58 @@
<div class="table-page-search-wrapper">
<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.orderId"
+ dict="mes_production_order,order_code,id"
+ ></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.workOrderId"
+ dict="mes_production_work_order,work_order_code,id"
+ ></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"
+ />
+ </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>
+ <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>
+ </span>
+ </a-col>
</a-row>
</a-form>
</div>
@@ -11,13 +63,6 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('宸ュ崟鎶ュ伐')">瀵煎嚭</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
- <a-button type="primary" icon="import">瀵煎叆</a-button>
- </a-upload>
- <!-- 楂樼骇鏌ヨ鍖哄煙 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
@@ -123,24 +168,19 @@
}
},
{
- title:'鍒犻櫎鏍囪',
- align:"center",
- dataIndex: 'delFlag'
- },
- {
title:'璁㈠崟ID',
align:"center",
- dataIndex: 'orderId'
+ dataIndex: 'orderId_dictText'
},
{
title:'宸ュ崟ID',
align:"center",
- dataIndex: 'workOrderId'
+ dataIndex: 'workOrderId_dictText'
},
{
title:'浜х嚎ID',
align:"center",
- dataIndex: 'factoryId'
+ dataIndex: 'factoryId_dictText'
},
{
title:'鎵规鍙�',
@@ -170,7 +210,7 @@
{
title:'绾胯竟浠揑D',
align:"center",
- dataIndex: 'warehouseId'
+ dataIndex: 'warehouseId_dictText'
},
{
title:'鎴愬搧涓嬬嚎鎵撳嵃鐘舵��',
@@ -192,7 +232,7 @@
deleteBatch: "/mesworkreporting/mesWorkReporting/deleteBatch",
exportXlsUrl: "/mesworkreporting/mesWorkReporting/exportXls",
importExcelUrl: "mesworkreporting/mesWorkReporting/importExcel",
-
+
},
dictOptions:{},
superFieldList:[],
--
Gitblit v1.9.3