From 9c1e0958af114e4ae2bfaaade28d49753268e9f1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 06 七月 2026 13:54:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_大罗素马铃薯new' into dev_新疆_大罗素马铃薯new
---
src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
index 9689be8..d71941a 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
@@ -60,7 +60,7 @@
<div v-if="detailData.shippingInfo" class="shipment-detail">
<el-divider content-position="left">鍙戣揣璇︽儏</el-divider>
<el-descriptions :column="2" border>
- <el-descriptions-item label="閿�鍞鍗�">{{
+ <el-descriptions-item label="璁㈠崟鍙�">{{
detailData.shippingInfo.salesContractNo || "--"
}}</el-descriptions-item>
<el-descriptions-item label="鍑哄簱鎵瑰彿">{{
@@ -142,7 +142,7 @@
<el-descriptions-item label="椤圭洰鍚嶇О">{{
detailData.projectName || "--"
}}</el-descriptions-item>
- <el-descriptions-item label="閿�鍞悎鍚屽彿">{{
+ <el-descriptions-item label="璁㈠崟鍙�">{{
detailData.salesContractNo || "--"
}}</el-descriptions-item>
<el-descriptions-item label="绛捐鏃ユ湡">{{
@@ -167,6 +167,7 @@
<el-table-column prop="specificationModel" label="瑙勬牸鍨嬪彿" />
<el-table-column prop="unit" label="鍗曚綅" />
<el-table-column prop="quantity" label="鏁伴噺" />
+ <el-table-column prop="storageLocation" label="搴撲綅" />
<el-table-column prop="taxInclusiveUnitPrice" label="鍚◣鍗曚环">
<template #default="scope"
>楼{{
--
Gitblit v1.9.3