From 41d4bedd762c6f8a8358baf33a065b052baab9cc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 13 五月 2026 09:54:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/views/salesManagement/deliveryLedger/index.vue | 16 +++++++++++++++-
src/views/inventoryManagement/stockReport/index.vue | 14 +++++++-------
src/views/inventoryManagement/receiptManagement/Record.vue | 11 ++++++-----
3 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 78ba5bb..9485188 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -124,7 +124,8 @@
batchApproveStockInRecords,
} from "@/api/inventoryManagement/stockInRecord.js";
import {
- findAllQualifiedStockInRecordTypeOptions, findAllUnQualifiedStockInRecordTypeOptions,
+ findAllQualifiedStockInRecordTypeOptions,
+ // findAllUnQualifiedStockInRecordTypeOptions,
} from "@/api/basicData/enum.js";
const {proxy} = getCurrentInstance();
@@ -236,10 +237,10 @@
})
return
}
- findAllUnQualifiedStockInRecordTypeOptions()
- .then(res => {
- stockRecordTypeOptions.value = res.data;
- })
+ // findAllUnQualifiedStockInRecordTypeOptions()
+ // .then(res => {
+ // stockRecordTypeOptions.value = res.data;
+ // })
}
// 琛ㄦ牸閫夋嫨鏁版嵁
diff --git a/src/views/inventoryManagement/stockReport/index.vue b/src/views/inventoryManagement/stockReport/index.vue
index 8139508..26bc8a0 100644
--- a/src/views/inventoryManagement/stockReport/index.vue
+++ b/src/views/inventoryManagement/stockReport/index.vue
@@ -223,7 +223,7 @@
} from "@/api/inventoryManagement/stockInventory.js";
import {
findAllQualifiedStockInRecordTypeOptions,
- findAllUnQualifiedStockInRecordTypeOptions,
+ // findAllUnQualifiedStockInRecordTypeOptions,
} from "@/api/basicData/enum.js";
const { proxy } = getCurrentInstance();
@@ -265,12 +265,12 @@
const fetchStockRecordTypeOptions = () => {
findAllQualifiedStockInRecordTypeOptions().then(res => {
stockRecordTypeOptions.value = res.data;
- findAllUnQualifiedStockInRecordTypeOptions().then(res => {
- stockRecordTypeOptions.value = [
- ...stockRecordTypeOptions.value,
- ...res.data,
- ];
- });
+ // findAllUnQualifiedStockInRecordTypeOptions().then(res => {
+ // stockRecordTypeOptions.value = [
+ // ...stockRecordTypeOptions.value,
+ // ...res.data,
+ // ];
+ // });
});
};
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index d65727d..c8890cc 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -87,6 +87,11 @@
show-overflow-tooltip
/>
<el-table-column
+ label="鍙戣揣鏁伴噺"
+ prop="totalQuantity"
+ show-overflow-tooltip
+ />
+ <el-table-column
label="鍙戣揣杞︾墝鍙�"
prop="shippingCarNumber"
show-overflow-tooltip
@@ -105,7 +110,7 @@
label="瀹℃牳鐘舵��"
prop="status"
align="center"
- width="120"
+ width="100"
>
<template #default="scope">
<el-tag :type="getApprovalStatusType(scope.row.status)">
@@ -113,6 +118,12 @@
</el-tag>
</template>
</el-table-column>
+ <el-table-column
+ label="鍑哄簱鍗曞彿"
+ prop="outboundBatches"
+ show-overflow-tooltip
+ width="130"
+ />
<el-table-column fixed="right" label="鎿嶄綔" width="220" align="center">
<template #default="scope">
<!-- <el-button-->
@@ -279,6 +290,9 @@
<el-descriptions-item label="蹇�掑崟鍙�" :span="2">{{
detailRow.expressNumber || "--"
}}</el-descriptions-item>
+ <el-descriptions-item label="鍑哄簱鍗曞彿" :span="2">{{
+ detailRow.outboundBatches || "--"
+ }}</el-descriptions-item>
</el-descriptions>
<el-table
:data="getDeliveryProductInfoList()"
--
Gitblit v1.9.3