From 54711af2bf3b5746f11497e5435a2950305bbde8 Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Mon, 12 Jan 2026 13:32:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E8=87=AA=E5=BB=BA=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=98=BE=E7=A4=BA=E6=89=80=E5=B1=9E=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/inStockBill/index.vue    |  8 +++++---
 src/views/wms/wmsBaseProduct/index.vue | 25 ++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/inStockBill/index.vue b/src/views/wms/inStockBill/index.vue
index 152bbee..74db667 100644
--- a/src/views/wms/inStockBill/index.vue
+++ b/src/views/wms/inStockBill/index.vue
@@ -219,7 +219,7 @@
             <div>添加入库物料</div>
           </template>
 
-          <el-button type="primary" @click="openProductSelect">选择物料</el-button>
+          <el-button type="primary" @click="openProductSelect" :loading="productSelectLoading">选择物料</el-button>
 
           <div v-if="selectedProducts.length > 0" style="margin-top: 20px">
             <h4>已选择的物料：</h4>
@@ -353,11 +353,14 @@ const getProjectName = (projectId) => {
   const project = projectInfoList.value.find((item) => item.projectId === projectId);
   return project ? project.projectCode : projectId;
 };
+// 添加物料选择loading状态
+const productSelectLoading = ref(false);
 // 处理物料选择回调
 const handleProductSelect = async (products) => {
   // 重置所有的物料
   // selectedProducts.value = products;
   // 为每个物料添加批次号
+  productSelectLoading.value = true;
   const timestamp = parseTime(new Date(), '{y}{m}{d}');
   for (const material of products) {
     // 生成批次号：供应商代码 + 时间戳
@@ -372,6 +375,7 @@ const handleProductSelect = async (products) => {
     const res = await getWmsInventoryDetailbyProductId(material.productId);
     material.inventoryAmount = res.data?.inventoryAmount || 0;
   }
+  productSelectLoading.value = false;
   selectedProducts.value.push(...products);
 };
 
@@ -396,8 +400,6 @@ const inStockBillFormRef = ref<ElFormInstance>();
 
 const addFormRef = ref<ElFormInstance>();
 
-
-
 // 计算总价
 const calculateTotalPrice = (material) => {
   if (material.unitPrice && material.inStockAmount) {
diff --git a/src/views/wms/wmsBaseProduct/index.vue b/src/views/wms/wmsBaseProduct/index.vue
index 196ee49..1726f3b 100644
--- a/src/views/wms/wmsBaseProduct/index.vue
+++ b/src/views/wms/wmsBaseProduct/index.vue
@@ -68,7 +68,7 @@
             <dict-tag :options="active_flag" :value="scope.row.activeFlag" />
           </template>
         </el-table-column>
-        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[10].visible" />
+        <el-table-column label="所属部门" align="center" prop="deptName" v-if="columns[10].visible" />
         <el-table-column label="创建人" align="center" prop="createByName" v-if="columns[11].visible" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[12].visible">
           <template #default="scope">
@@ -98,9 +98,16 @@
     <!-- 添加或修改海威物料信息对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="wmsBaseProductFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="所属部门" prop="createDept">
+          <!--<el-input v-model="form.createDept" placeholder="请输入所属部门" />-->
+          <el-select v-model="form.createDept" placeholder="请选择部门">
+            <el-option v-for="item in deptInfoList" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="物料编码" prop="productCode">
           <el-input v-model="form.productCode" placeholder="请输入物料编码" />
         </el-form-item>
+
         <el-form-item label="物料名称" prop="productName">
           <el-input v-model="form.productName" placeholder="请输入物料名称" />
         </el-form-item>
@@ -108,8 +115,8 @@
           <el-input v-model="form.productSpe" type="textarea" placeholder="请输入内容" />
         </el-form-item>
 
-        <el-form-item label="外部品牌规格" prop="externalBrand">
-          <el-input v-model="form.externalBrand" placeholder="请输入外部品牌规格" />
+        <el-form-item label="品牌" prop="externalBrand">
+          <el-input v-model="form.externalBrand" placeholder="请输入品牌" />
         </el-form-item>
         <el-form-item label="单位" prop="unitId">
           <el-select v-model="form.unitId" placeholder="请选择单位">
@@ -145,6 +152,7 @@
 import { addWmsBaseProduct, delWmsBaseProduct, getWmsBaseProduct, listWmsBaseProduct, updateWmsBaseProduct } from '@/api/wms/wmsBaseProduct';
 import { WmsBaseProductForm, WmsBaseProductQuery, WmsBaseProductVO } from '@/api/wms/wmsBaseProduct/types';
 import { getBaseUnitInfoList } from '@/api/oa/base/unitInfo';
+import { allListDept } from '@/api/system/dept';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
@@ -178,7 +186,7 @@ const columns = ref<FieldOption[]>([
   { key: 7, label: `统一报价(参考)`, visible: false },
   { key: 8, label: `备货期`, visible: true },
   { key: 9, label: `激活标识`, visible: true },
-  { key: 10, label: `创建部门`, visible: false },
+  { key: 10, label: `创建部门`, visible: true },
   { key: 11, label: `创建人`, visible: true },
   { key: 12, label: `创建时间`, visible: true },
   { key: 13, label: `更新人`, visible: true },
@@ -228,7 +236,13 @@ const getList = async () => {
   total.value = res.total;
   loading.value = false;
 };
-
+/** 查询部门信息下拉框结构 */
+const deptInfoList = ref([]);
+const getDeptInfoListSelect = async () => {
+  const params = { deptCategory: '03' } as any;
+  const res = await allListDept(params);
+  deptInfoList.value = res.data;
+};
 /** 取消按钮 */
 const cancel = () => {
   reset();
@@ -317,5 +331,6 @@ const handleExport = () => {
 onMounted(() => {
   getList();
   getUnitInfoListSelect();
+  getDeptInfoListSelect();
 });
 </script>