From 901cd45f087ffd434feda0070b174966cc37c8f3 Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期一, 07 七月 2025 13:59:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/product-inventory-management into dev

---
 src/views/inventoryManagement/dispatchLog/index.vue |   64 ++++++++++++++++++++-----------
 1 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index 8d4a600..81eff0b 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -4,7 +4,7 @@
       <div>
         <span class="search_title">渚涘簲鍟嗗悕绉帮細</span>
         <el-input
-          v-model="searchForm.customerName"
+          v-model="searchForm.supplierName"
           style="width: 240px"
           placeholder="璇疯緭鍏�"
           @change="handleQuery"
@@ -38,37 +38,37 @@
         <el-table-column align="center" label="搴忓彿" type="index" width="60" />
         <el-table-column
           label="鍑哄簱鏃ユ湡"
-          prop="salesContractNo"
+          prop="inboundTime"
           width="100"
           show-overflow-tooltip
         />
         <el-table-column
           label="渚涘簲鍟嗗悕绉�"
-          prop="customerName"
+          prop="supplierName"
           width="160"
           show-overflow-tooltip
         />
         <el-table-column
           label="浜у搧澶х被"
-          prop="salesman"
+          prop="productCategory"
           width="100"
           show-overflow-tooltip
         />
         <el-table-column
           label="瑙勬牸鍨嬪彿"
-          prop="projectName"
+          prop="specificationModel"
           width="100"
           show-overflow-tooltip
         />
         <el-table-column
           label="鍗曚綅"
-          prop="contractAmount"
+          prop="unit"
           width="80"
           show-overflow-tooltip
         />
         <el-table-column
           label="鍑哄簱鏁伴噺"
-          prop="entryPersonName"
+          prop="inboundQuantity"
           width="100"
           show-overflow-tooltip
         />
@@ -98,7 +98,7 @@
         />
         <el-table-column
           label="鍑哄簱浜�"
-          prop="executionDate"
+          prop="nickname"
           width="80"
           show-overflow-tooltip
         />
@@ -138,20 +138,17 @@
 import useUserStore from "@/store/modules/user";
 import { userListNoPage } from "@/api/system/user.js";
 import {
-  ledgerListPage,
-  customerList,
-  addOrUpdateSalesLedger,
-  getSalesLedgerWithProducts,
-  delLedger,
-} from "@/api/salesManagement/salesLedger.js";
+  getStockOutPage,
+  delStockOut,
+} from "@/api/inventoryManagement/stockOut.js";
+
 const userStore = useUserStore();
 const { proxy } = getCurrentInstance();
 const tableData = ref([]);
-const productData = ref([]);
 const selectedRows = ref([]);
 const userList = ref([]);
-const customerOption = ref([]);
 const tableLoading = ref(false);
+const productList = ref([])
 const page = reactive({
   current: 1,
   size: 100,
@@ -164,7 +161,26 @@
 const dialogFormVisible = ref(false);
 const data = reactive({
   searchForm: {
-    customerName: "",
+    supplierName: "",
+  },
+  form: {
+    supplierId: null,
+    supplierName: '',
+    productId: null,
+    productName: '',
+    userId: userStore.userId,
+    nickname: '',
+    model: '',
+    productModelId: null,
+    unit: '',
+    productrecordId: null,
+    taxInclusiveUnitPrice: '',
+    taxInclusiveTotalPrice: '',
+    taxRate: '',
+    taxExclusiveTotalPrice: '',
+    inboundTime: '',
+    inboundBatch: '',
+    inboundQuantity: ''
   },
 });
 const { searchForm } = toRefs(data);
@@ -182,10 +198,10 @@
 };
 const getList = () => {
   tableLoading.value = true;
-  ledgerListPage({ ...searchForm.value, ...page })
+  getStockOutPage({ ...searchForm.value, ...page })
     .then((res) => {
       tableLoading.value = false;
-      tableData.value = res.records;
+      tableData.value = res.data.records;
       tableData.value.map((item) => {
         item.children = [];
       });
@@ -195,10 +211,11 @@
       tableLoading.value = false;
     });
 };
+
 // 琛ㄦ牸閫夋嫨鏁版嵁
 const handleSelectionChange = (selection) => {
   // 杩囨护鎺夊瓙鏁版嵁
-  selectedRows.value = selection.filter((item) => item.children !== undefined);
+  selectedRows.value = selection.filter((item) => item.id);
   console.log("selection", selectedRows.value);
 };
 const expandedRowKeys = ref([]);
@@ -214,18 +231,19 @@
 
 // 瀵煎嚭
 const handleOut = () => {
-  ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+  ElMessageBox.confirm("鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
     confirmButtonText: "纭",
     cancelButtonText: "鍙栨秷",
     type: "warning",
   })
     .then(() => {
-      proxy.download("/sales/ledger/export", {}, "鍑哄簱鍙拌处.xlsx");
+      proxy.download("/stockmanagement/export", {}, "鍑哄簱鍙拌处.xlsx");
     })
     .catch(() => {
       proxy.$modal.msg("宸插彇娑�");
     });
 };
+
 // 鍒犻櫎
 const handleDelete = () => {
   let ids = [];
@@ -241,7 +259,7 @@
     type: "warning",
   })
     .then(() => {
-      delLedger(ids).then((res) => {
+      delStockOut(ids).then((res) => {
         proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
         getList();
       });

--
Gitblit v1.9.3