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/lsw/LswMaterialInboundList.vue |   62 ++++++++++++++++++-------------
 1 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/views/lsw/LswMaterialInboundList.vue b/src/views/lsw/LswMaterialInboundList.vue
index 97c81f4..c5ca76e 100644
--- a/src/views/lsw/LswMaterialInboundList.vue
+++ b/src/views/lsw/LswMaterialInboundList.vue
@@ -1,9 +1,30 @@
 <template>
   <a-card :bordered="false">
     <!-- 鏌ヨ鍖哄煙 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
+    <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.materialNumber"></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.materialName"></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.batchNumber"></j-input>
+            </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>
@@ -12,12 +33,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>
@@ -122,19 +137,14 @@
             }
           },
           {
-            title:'鍒犻櫎鏍囪',
+            title:'浜х嚎',
             align:"center",
-            dataIndex: 'delFlag'
+            dataIndex: 'factoryId_dictText'
           },
           {
-            title:'浜х嚎ID',
+            title:'搴撳瓨鍦�',
             align:"center",
-            dataIndex: 'factoryId'
-          },
-          {
-            title:'搴撳瓨鍦癐D',
-            align:"center",
-            dataIndex: 'warehouseId'
+            dataIndex: 'warehouseId_dictText'
           },
           {
             title:'鐗╂枡缂栫爜',
@@ -166,14 +176,14 @@
             align:"center",
             dataIndex: 'receiveTime'
           },
-          {
-            title: '鎿嶄綔',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
+          // {
+          //   title: '鎿嶄綔',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
         ],
         url: {
           list: "/lswmaterialinbound/lswMaterialInbound/list",
@@ -181,7 +191,6 @@
           deleteBatch: "/lswmaterialinbound/lswMaterialInbound/deleteBatch",
           exportXlsUrl: "/lswmaterialinbound/lswMaterialInbound/exportXls",
           importExcelUrl: "lswmaterialinbound/lswMaterialInbound/importExcel",
-
         },
         dictOptions:{},
         superFieldList:[],
@@ -197,6 +206,7 @@
     },
     methods: {
       initDictConfig(){
+
       },
       getSuperFieldList(){
         let fieldList=[];

--
Gitblit v1.9.3