From f59e6248efa1569f53573708fd211a8f28ca271f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 10 七月 2025 10:18:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/inventoryManagement/dispatchLog/index.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index c83b0b0..e523430 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -38,14 +38,14 @@
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column
label="鍑哄簱鏃ユ湡"
- prop="inboundTime"
- width="100"
+ prop="createTime"
+ min-width="250"
show-overflow-tooltip
/>
<el-table-column
label="渚涘簲鍟嗗悕绉�"
prop="supplierName"
- width="160"
+ width="250"
show-overflow-tooltip
/>
<el-table-column
@@ -68,37 +68,37 @@
/>
<el-table-column
label="鍑哄簱鏁伴噺"
- prop="inboundQuantity"
+ prop="inboundNum"
width="100"
show-overflow-tooltip
/>
<el-table-column
label="鍚◣鍗曚环(鍏�)"
- prop="entryDate"
+ prop="taxInclusiveUnitPrice"
width="100"
show-overflow-tooltip
/>
<el-table-column
label="鍚◣鎬讳环(鍏�)"
- prop="executionDate"
+ prop="taxInclusiveTotalPrice"
width="100"
show-overflow-tooltip
/>
<el-table-column
label="绋庣巼(%)"
- prop="executionDate"
+ prop="taxRate"
width="100"
show-overflow-tooltip
/>
<el-table-column
label="涓嶅惈绋庢�讳环(鍏�)"
- prop="executionDate"
+ prop="taxExclusiveTotalPrice"
width="180"
show-overflow-tooltip
/>
<el-table-column
label="鍑哄簱浜�"
- prop="nickname"
+ prop="createBy"
width="80"
show-overflow-tooltip
/>
@@ -231,7 +231,7 @@
// 瀵煎嚭
const handleOut = () => {
- ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+ ElMessageBox.confirm("鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
confirmButtonText: "纭",
cancelButtonText: "鍙栨秷",
type: "warning",
@@ -259,7 +259,7 @@
type: "warning",
})
.then(() => {
- delStockOut(ids).then((res) => {
+ delStockOut({ids:ids}).then((res) => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
getList();
});
--
Gitblit v1.9.3