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/LswMateriaView.vue |   44 +++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/views/lsw/LswMateriaView.vue b/src/views/lsw/LswMateriaView.vue
index 0b726ef..fdb4d69 100644
--- a/src/views/lsw/LswMateriaView.vue
+++ b/src/views/lsw/LswMateriaView.vue
@@ -3,7 +3,39 @@
     :bordered="false"
     title="绾胯竟搴撶墿鏂欎俊鎭�"
   >
-    <a-button @click="handleAdd" type="primary" icon="plus">鏂板鐗╂枡淇℃伅-娴嬭瘯</a-button>
+    <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.materialModel"></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 placeholder="璇疯緭鍏ョ墿鏂欑被鍨�"  dictCode="material_category" v-model="queryParam.materialCategory"></j-dict-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>
+<!--    <a-button @click="handleAdd" type="primary" icon="plus">鏂板鐗╂枡淇℃伅-娴嬭瘯</a-button>-->
     <a-spin :spinning="confirmLoading">
       <div>
         <!-- 涓昏〃鍗曞尯鍩� -->
@@ -26,7 +58,6 @@
       <a-tabs v-model="activeKey" @change="handleChangeTabs">
         <a-tab-pane tab="鐗╂枡搴撳瓨淇℃伅" :key="refKeys[0]" :forceRender="true">
           <div style="display: flex; align-items: center; margin-bottom: 10px;">
-            <span style="margin-right: 10px;">鐗╂枡搴撳瓨淇℃伅</span>
             <a-tag color="green" style="font-weight: bold;">
               搴撳瓨鎬婚噺锛歿{ totalInventoryQuantity }}
             </a-tag>
@@ -154,8 +185,8 @@
             defaultValue: ''
           },
           {
-            title: '搴撳瓨鍦癐D',
-            key: 'warehouseId',
+            title: '搴撳瓨鍦�',
+            key: 'warehouseName',
             type: JVXETypes.input,
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
@@ -172,6 +203,7 @@
         ]
       },
       url: {
+        //searchlikeQuery
         list: '/lswmaterial/lswMaterial/list',
         queryById: '/lswmaterial/lswMaterial/queryById',
         lswMaterialInventory: {
@@ -212,15 +244,17 @@
       console.log('test---->', this.selectedRowKeys[0])
     },
     async onSelectChange(selectedRowKeys) {
+      this.lswMaterialInventoryTable.loading = true
       // 鍗曢�夋ā寮忎笅锛宻electedRowKeys 鏄暟缁勶紝浣嗛暱搴︽渶澶氫负1
       console.log('鐐瑰嚮浜�---->')
       this.selectedRowKeys = selectedRowKeys
-
+      this.lswMaterialInventoryTable.dataSource=[]
       // 鑾峰彇閫変腑琛岀殑瀹屾暣鏁版嵁
       if (selectedRowKeys.length > 0) {
         const selectedId = selectedRowKeys[0] // 閫変腑琛岀殑id
         const lswMaterialInventoryResult = await getAction(this.url.lswMaterialInventory.list, { 'id': selectedId })
         this.lswMaterialInventoryTable.dataSource = lswMaterialInventoryResult.result
+        this.lswMaterialInventoryTable.loading = false
       }
     }
 

--
Gitblit v1.9.3