From e75a2256ab52531600a97cef11f4af8c6091939e Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Thu, 8 Jan 2026 14:16:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E7=89=A9=E6=96=99=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=BC=B9=E7=AA=97=E5=93=81=E7=89=8C=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=EF=BC=8C=E5=88=86=E9=A1=B5=E6=95=B0=E9=87=8F=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=EF=BC=8C=E7=B2=BE=E7=AE=80=E5=BF=85=E8=A6=81=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/WmsProductSelect/index.vue | 20 ++++++++++++--------
 src/views/wms/inStockBill/index.vue       |  6 +++---
 src/views/wms/wmsBaseProduct/index.vue    |  3 +++
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/components/WmsProductSelect/index.vue b/src/components/WmsProductSelect/index.vue
index 40876bd..762709b 100644
--- a/src/components/WmsProductSelect/index.vue
+++ b/src/components/WmsProductSelect/index.vue
@@ -13,11 +13,14 @@
                   <el-form-item label="物料名称" prop="productName">
                     <el-input v-model="queryParams.productName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
                   </el-form-item>
-                  <el-form-item label="激活标识" prop="activeFlag">
+                  <el-form-item label="品牌" prop="externalBrand">
+                    <el-input v-model="queryParams.externalBrand" placeholder="请输入品牌" clearable @keyup.enter="handleQuery" />
+                  </el-form-item>
+                  <!--<el-form-item label="激活标识" prop="activeFlag">
                     <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>
                       <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value" />
                     </el-select>
-                  </el-form-item>
+                  </el-form-item>-->
                   <el-form-item>
                     <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
                     <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -50,15 +53,16 @@
               <vxe-column key="productCode" title="物料编码" align="center" field="productCode" />
               <vxe-column key="productName" title="物料名称" align="center" field="productName" />
               <vxe-column key="productSpe" title="物料描述" align="center" field="productSpe" />
+              <vxe-column key="productSpe" title="品牌" align="center" field="externalBrand" />
               <vxe-column key="unitName" title="单位" align="center" field="unitName" />
-              <vxe-column key="purchasePrice" title="参考成本" align="center" field="purchasePrice" />
-              <vxe-column key="foreignPrice" title="统一报价(参考)" align="center" field="foreignPrice" />
-              <vxe-column key="stockingPeriod" title="备货期(天)" align="center" field="stockingPeriod" />
-              <vxe-column key="activeFlag" title="激活标识" align="center">
+              <!--<vxe-column key="purchasePrice" title="参考成本" align="center" field="purchasePrice" />-->
+              <!--<vxe-column key="foreignPrice" title="统一报价(参考)" align="center" field="foreignPrice" />-->
+              <!--<vxe-column key="stockingPeriod" title="备货期(天)" align="center" field="stockingPeriod" />-->
+              <!-- <vxe-column key="activeFlag" title="激活标识" align="center">
                 <template #default="scope">
                   <dict-tag :options="active_flag" :value="scope.row.activeFlag"></dict-tag>
                 </template>
-              </vxe-column>
+              </vxe-column>-->
             </vxe-table>
 
             <pagination
@@ -118,7 +122,7 @@ const productDialog = useDialog({
 
 const queryParams = ref<WmsBaseProductQuery>({
   pageNum: 1,
-  pageSize: 10,
+  pageSize: 50,
   productCode: undefined,
   productName: undefined,
   activeFlag: undefined,
diff --git a/src/views/wms/inStockBill/index.vue b/src/views/wms/inStockBill/index.vue
index ea40606..d729a6e 100644
--- a/src/views/wms/inStockBill/index.vue
+++ b/src/views/wms/inStockBill/index.vue
@@ -256,9 +256,9 @@
                     :step="1"
                     controls-position="right"
                     size="small"
-                    placeholder="请输入数量"/>
-                    <!--@change="calculateTotalPrice(scope.row)"-->
-
+                    placeholder="请输入数量"
+                  />
+                  <!--@change="calculateTotalPrice(scope.row)"-->
                 </template>
               </el-table-column>
               <el-table-column prop="unitName" label="单位" width="80" />
diff --git a/src/views/wms/wmsBaseProduct/index.vue b/src/views/wms/wmsBaseProduct/index.vue
index 72f5fb2..196ee49 100644
--- a/src/views/wms/wmsBaseProduct/index.vue
+++ b/src/views/wms/wmsBaseProduct/index.vue
@@ -10,6 +10,9 @@
             <el-form-item label="物料名称" prop="productName">
               <el-input v-model="queryParams.productName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
+            <el-form-item label="品牌" prop="externalBrand">
+              <el-input v-model="queryParams.externalBrand" placeholder="请输入品牌" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
 
             <el-form-item label="激活标识" prop="activeFlag">
               <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>