add 入库修改，子表折叠

src/views/wms/inStockBill/index.vue

@@ -68,6 +68,7 @@
 
       <!--主表-->
       <el-table
+        ref="tableRef"
         v-loading="loading"
         border
         :data="inStockBillList"
@@ -85,6 +86,7 @@
               <el-table-column prop="inStockAmount" align="center" label="入库数量" />
               <el-table-column prop="unitName" align="center" label="单位" />
               <el-table-column prop="totalPrice" align="center" label="总价" />
+              <el-table-column prop="warehouseName" align="center" label="仓库名称" />
             </el-table>
           </template>
         </el-table-column>
@@ -99,7 +101,7 @@
         </el-table-column>
         <el-table-column label="项目ID" align="center" prop="projectId" v-if="columns[4].visible" />
         <el-table-column label="关联单号" align="center" prop="inventoryAmount" v-if="columns[5].visible" />
-        <el-table-column label="供应商" align="center" prop="supplier" v-if="columns[6].visible" />
+        <el-table-column label="供应商" align="center" prop="supplierName" v-if="columns[6].visible" />
         <el-table-column label="联系人" align="center" prop="contactUser" v-if="columns[7].visible" />
         <el-table-column label="联系电话" align="center" prop="contactNumber" v-if="columns[8].visible" />
         <el-table-column label="入库说明" align="center" prop="directions" v-if="columns[9].visible" />
@@ -135,7 +137,7 @@
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加物料入库对话框 -->
-    <el-dialog title="添加物料入库" v-model="addDialog.visible" width="1250px" append-to-body>
+    <el-dialog :title="addDialog.title" v-model="addDialog.visible" width="auto" min-width="1500px" append-to-body>
       <el-form ref="addFormRef" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
@@ -220,10 +222,10 @@
                   />
                 </template>
               </el-table-column>
-              <el-table-column prop="quantity" label="入库数量" width="140">
+              <el-table-column prop="inStockAmount" label="入库数量" width="140">
                 <template #default="scope">
                   <el-input-number
-                    v-model="scope.row.quantity"
+                    v-model="scope.row.inStockAmount"
                     :min="1"
                     :precision="2"
                     :step="0.5"
@@ -234,12 +236,25 @@
                   />
                 </template>
               </el-table-column>
-              <el-table-column prop="unitName" label="单位" width="70" />
+              <el-table-column prop="unitName" label="单位" width="50" />
               <el-table-column prop="totalPrice" label="总价(元)" width="120">
                 <template #default="scope">
                   <span>{{ scope.row.totalPrice || 0 }}</span>
                 </template>
               </el-table-column>
+              <!--选择仓库-->
+              <el-table-column prop="warehouseId" label="选择仓库" width="150">
+                <template #default="scope">
+                  <el-select v-model="scope.row.warehouseId" placeholder="请选择仓库">
+                    <el-option
+                      v-for="dict in wms_warehouse"
+                      :key="dict.warehouseId"
+                      :label="dict.warehouseName"
+                      :value="dict.warehouseId"
+                    ></el-option>
+                  </el-select>
+                </template>
+              </el-table-column>
               <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="80">
                 <template #default="scope">
                   <el-button link type="danger" icon="Delete" @click="removeMaterial(scope.$index)"></el-button>
@@ -259,51 +274,6 @@
         </div>
       </template>
     </el-dialog>
-    <!-- 修改物料入库对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="inStockBillFormRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="入库单号" prop="inStockCode">
-          <el-input v-model="form.inStockCode" placeholder="请输入入库单号" />
-        </el-form-item>
-        <el-form-item label="入库单类型" prop="inStockType">
-          <el-select v-model="form.inStockType" placeholder="请选择入库单类型">
-            <el-option v-for="dict in wms_in_stock_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="关联单号" prop="inventoryAmount">
-          <el-input v-model="form.inventoryAmount" placeholder="请输入关联单号" />
-        </el-form-item>
-        <el-form-item label="供应商" prop="supplier">
-          <el-input v-model="form.supplierName" placeholder="请输入供应商" />
-        </el-form-item>
-        <el-form-item label="联系人" prop="contactUser">
-          <el-input v-model="form.contactUser" placeholder="请输入联系人" />
-        </el-form-item>
-        <el-form-item label="联系电话" prop="contactNumber">
-          <el-input v-model="form.contactNumber" placeholder="请输入联系电话" />
-        </el-form-item>
-        <el-form-item label="入库说明" prop="directions">
-          <el-input v-model="form.directions" placeholder="请输入入库说明" />
-        </el-form-item>
-        <el-form-item label="入库单状态" prop="inStockBillStatus">
-          <el-select v-model="form.inStockBillStatus" placeholder="请选择入库单状态">
-            <el-option v-for="dict in wms_in_stock_bill_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="流程状态" prop="flowStatus">
-          <el-input v-model="form.flowStatus" placeholder="请输入流程状态" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
@@ -312,7 +282,8 @@ import { addInStockBill, delInStockBill, getInStockBill, listInStockBill, update
 import { InStockBillForm, InStockBillQuery, InStockBillVO } from '@/api/wms/inStockBill/types';
 import { ref } from 'vue'; // 存储选中的物料信息
 import { useRouter } from 'vue-router'; // 存储选中的物料信息
-import { getWmsInStockDetailsList } from '@/api/wms/inStockDetails'; // 添加展开行处理函数
+import { getWmsInStockDetailsList } from '@/api/wms/inStockDetails';
+import { getWmsWarehouseInfoList } from '@/api/wms/warehouseInfo'; // 添加展开行处理函数
 
 // 添加展开行处理函数
 const handleExpandChange = async (row, expandedRows) => {
@@ -342,7 +313,7 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const dateRangeCreateTime = ref<[DateModelType, DateModelType]>(['', '']);
-
+const wms_warehouse = ref([]);
 const queryFormRef = ref<ElFormInstance>();
 const inStockBillFormRef = ref<ElFormInstance>();
 
@@ -360,15 +331,15 @@ const handleMaterialConfirm = (materials) => {
 
     // 设置默认单价为采购单价
     material.unitPrice = material.purchasePrice || 0;
-    material.quantity = 1; // 默认数量为1
+    material.inStockAmount = 1; // 默认数量为1
-    material.totalPrice = (material.unitPrice * material.quantity).toFixed(2);
+    material.totalPrice = (material.unitPrice * material.inStockAmount).toFixed(2);
   });
 };
 
 // 计算总价
 const calculateTotalPrice = (material) => {
-  if (material.unitPrice && material.quantity) {
+  if (material.unitPrice && material.inStockAmount) {
-    material.totalPrice = (material.unitPrice * material.quantity).toFixed(2);
+    material.totalPrice = (material.unitPrice * material.inStockAmount).toFixed(2);
   } else {
     material.totalPrice = 0;
   }
@@ -390,7 +361,8 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 const addDialog = reactive<DialogOption>({
-  visible: false
+  visible: false,
+  title: ''
 });
 
 // 列显隐信息
@@ -477,10 +449,12 @@ const reset = () => {
   form.value = { ...initFormData };
   inStockBillFormRef.value?.resetFields();
 };
-
+// 添加表格ref
+const tableRef = ref();
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
+  closeChildTable();
   getList();
 };
 
@@ -488,8 +462,18 @@ const handleQuery = () => {
 const resetQuery = () => {
   dateRangeCreateTime.value = ['', ''];
   queryFormRef.value?.resetFields();
+  closeChildTable();
+
   handleQuery();
 };
+// 关闭所有展开的子表
+const closeChildTable = () => {
+  if (tableRef.value) {
+    tableRef.value.store.states.expandRows.value.forEach((row) => {
+      tableRef.value.toggleRowExpansion(row, false);
+    });
+  }
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: InStockBillVO[]) => {
@@ -499,11 +483,19 @@ const handleSelectionChange = (selection: InStockBillVO[]) => {
 };
 
 const router = useRouter();
+
+const getWarehouseList = async () => {
+  const res = await getWmsWarehouseInfoList();
+  wms_warehouse.value = res.data;
+};
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
   addFormRef.value?.resetFields();
+  selectedMaterials.value = [];
+  addDialog.title = '添加物料入库';
   addDialog.visible = true;
+  // getWarehouseList();
   // dialog.title = '添加物料入库';
   // materialSelectRef.value.open();
   // router.push('/wms/inStockBill/add');
@@ -521,7 +513,7 @@ const handleAddSubmit = () => {
 
       // 验证物料信息的完整性
       const invalidMaterials = selectedMaterials.value.filter((material) => {
-        return !material.unitPrice || material.unitPrice <= 0 || !material.quantity || material.quantity <= 0;
+        return !material.unitPrice || material.unitPrice <= 0 || !material.inStockAmount || material.inStockAmount <= 0;
       });
 
       if (invalidMaterials.length > 0) {
@@ -536,28 +528,53 @@ const handleAddSubmit = () => {
           ...form.value,
           // 添加物料明细信息
           inStockDetailsList: selectedMaterials.value.map((material) => ({
+            inStockDetailsId: material.inStockDetailsId, // 物料ID
             materialId: material.materialId, // 物料ID
             batchNumber: material.batchNumber, // 批次号
             unitPrice: material.unitPrice, // 单价
-            inStockAmount: material.quantity, // 数量
+            inStockAmount: material.inStockAmount, // 数量
             unitName: material.unitName, // 单位
-            totalPrice: material.totalPrice // 总价
+            totalPrice: material.totalPrice, // 总价
+            warehouseId: material.warehouseId // 仓库ID
           }))
         };
 
+        // 根据是否有inStockBillId判断是新增还是修改
+        if (form.value.inStockBillId) {
+          // 修改操作
+          await updateInStockBill(submitData);
+          closeChildTable();
+          proxy?.$modal.msgSuccess('修改成功');
+        } else {
+          // 新增操作
           await addInStockBill(submitData);
           proxy?.$modal.msgSuccess('添加成功');
+        }
+
         addDialog.visible = false;
 
         // 清空已选择的物料
         selectedMaterials.value = [];
         await getList();
       } catch (error) {
-        console.error('添加入库单失败:', error);
+        console.error('操作失败:', error);
-        proxy?.$modal.msgError('添加失败，请重试');
+        proxy?.$modal.msgError(form.value.inStockBillId ? '修改失败，请重试' : '添加失败，请重试');
       } finally {
         buttonLoading.value = false;
       }
+      //   await addInStockBill(submitData);
+      //   proxy?.$modal.msgSuccess('添加成功');
+      //   addDialog.visible = false;
+      //
+      //   // 清空已选择的物料
+      //   selectedMaterials.value = [];
+      //   await getList();
+      // } catch (error) {
+      //   console.error('添加入库单失败:', error);
+      //   proxy?.$modal.msgError('添加失败，请重试');
+      // } finally {
+      //   buttonLoading.value = false;
+      // }
     }
   });
 };
@@ -574,8 +591,12 @@ const handleUpdate = async (row?: InStockBillVO) => {
   const _inStockBillId = row?.inStockBillId || ids.value[0];
   const res = await getInStockBill(_inStockBillId);
   Object.assign(form.value, res.data);
-  dialog.visible = true;
+
-  dialog.title = '修改物料入库';
+  const childList = await getWmsInStockDetailsList({ inStockBillId: row.inStockBillId });
+  selectedMaterials.value = childList.data;
+
+  addDialog.title = '修改物料入库';
+  addDialog.visible = true;
 };
 
 /** 提交按钮 */
@@ -617,5 +638,6 @@ const handleExport = () => {
 
 onMounted(() => {
   getList();
+  getWarehouseList();
 });
 </script>