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/MesProductionWorkOrderList.vue |   56 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/views/mes/MesProductionWorkOrderList.vue b/src/views/mes/MesProductionWorkOrderList.vue
index 46029a3..d81fb4d 100644
--- a/src/views/mes/MesProductionWorkOrderList.vue
+++ b/src/views/mes/MesProductionWorkOrderList.vue
@@ -4,20 +4,37 @@
     <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-input placeholder="璇疯緭鍏ュ伐鍗曞彿(浠诲姟鍙�)" v-model="queryParam.workOrderCode"></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.materialNumber"></j-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="宸ュ崟鐘舵��">
+              <j-dict-select-tag dictCode="work_order_status" placeholder="璇疯緭鍏ュ伐鍗曠姸鎬�" v-model="queryParam.workOrderStatus"></j-dict-select-tag>
+            </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.republisher"></j-select-user-by-dep>
+            </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>
-    <!-- 鏌ヨ鍖哄煙-END -->
 
-    <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
     <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>
@@ -25,8 +42,6 @@
         <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
       </a-dropdown>
     </div>
-
-    <!-- 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>椤�
@@ -123,11 +138,6 @@
             }
           },
           {
-            title:'鍒犻櫎鏍囪',
-            align:"center",
-            dataIndex: 'delFlag'
-          },
-          {
             title:'宸ュ崟鍙�(浠诲姟鍙�)',
             align:"center",
             dataIndex: 'workOrderCode'
@@ -148,19 +158,19 @@
             dataIndex: 'planQuantity'
           },
           {
-            title:'浜х嚎ID(鍐椾綑)',
+            title:'浜х嚎(鍐椾綑)',
             align:"center",
-            dataIndex: 'factoryId'
+            dataIndex: 'factoryId_dictText'
           },
           {
-            title:'鐝粍ID',
+            title:'鐝粍',
             align:"center",
-            dataIndex: 'groupId'
+            dataIndex: 'groupId_dictText'
           },
           {
-            title:'鐝ID(鍐椾綑)',
+            title:'鐝(鍐椾綑)',
             align:"center",
-            dataIndex: 'shiftId'
+            dataIndex: 'shiftId_dictText'
           },
           {
             title:'鎺掍骇鏃ユ湡',
@@ -212,7 +222,7 @@
           deleteBatch: "/mesproductionworkorder/mesProductionWorkOrder/deleteBatch",
           exportXlsUrl: "/mesproductionworkorder/mesProductionWorkOrder/exportXls",
           importExcelUrl: "mesproductionworkorder/mesProductionWorkOrder/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

--
Gitblit v1.9.3