From 608b7a717d1ebb8392c3e6d8952d574daaf888e1 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 16 七月 2026 14:25:20 +0800
Subject: [PATCH] Merge branch 'dev_pro_河南鹤壁' of http://114.132.189.42:9002/r/product-inventory-management into dev_pro_河南鹤壁
---
src/views/salesManagement/deliveryLedger/index.vue | 12 +++++-------
src/views/salesManagement/salesLedger/index.vue | 5 +----
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index 9907cf6..573fcc9 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -22,7 +22,7 @@
@change="handleQuery"
/>
</el-form-item>
- <el-form-item label="蹇�掑崟鍙凤細" v-if="false">
+ <el-form-item label="蹇�掑崟鍙凤細" >
<el-input
v-model="searchForm.expressNumber"
placeholder="璇疯緭鍏�"
@@ -99,13 +99,11 @@
<el-table-column
label="蹇�掑叕鍙�"
prop="expressCompany"
- v-if="false"
show-overflow-tooltip
/>
<el-table-column
label="蹇�掑崟鍙�"
prop="expressNumber"
- v-if="false"
show-overflow-tooltip
/>
<el-table-column
@@ -183,7 +181,7 @@
@change="handleShippingTypeChange"
>
<el-option label="璐ц溅" value="璐ц溅" />
- <el-option label="蹇��" value="蹇��" v-if="false" />
+ <el-option label="蹇��" value="蹇��" />
</el-select>
</el-form-item>
</el-col>
@@ -223,7 +221,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="30" v-if="false">
+ <el-row :gutter="30" >
<el-col :span="24">
<el-form-item label="蹇�掑崟鍙凤細" prop="expressNumber">
<el-input
@@ -286,10 +284,10 @@
<el-descriptions-item label="鍙戣揣杞︾墝鍙�">{{
detailRow.shippingCarNumber || "--"
}}</el-descriptions-item>
- <el-descriptions-item label="蹇�掑叕鍙�" v-if="false">{{
+ <el-descriptions-item label="蹇�掑叕鍙�" >{{
detailRow.expressCompany || "--"
}}</el-descriptions-item>
- <el-descriptions-item label="蹇�掑崟鍙�" :span="2" v-if="false">{{
+ <el-descriptions-item label="蹇�掑崟鍙�" :span="2" >{{
detailRow.expressNumber || "--"
}}</el-descriptions-item>
<el-descriptions-item label="鍑哄簱鍗曞彿" :span="2">{{
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 60deda9..0ac74b0 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -123,11 +123,9 @@
</el-table-column>
<el-table-column label="蹇�掑叕鍙�"
prop="expressCompany"
- v-if="false"
show-overflow-tooltip />
<el-table-column label="蹇�掑崟鍙�"
prop="expressNumber"
- v-if="false"
show-overflow-tooltip />
<el-table-column label="鍙戣揣杞︾墝"
minWidth="100px"
@@ -940,7 +938,6 @@
<el-option label="璐ц溅"
value="璐ц溅" />
<el-option label="蹇��"
- v-if="false"
value="蹇��" />
</el-select>
</el-form-item>
@@ -973,7 +970,7 @@
</el-col>
</el-row>
<el-row :gutter="30"
- v-if="false">
+ >
<el-col :span="24">
<el-form-item label="蹇�掑崟鍙凤細"
prop="expressNumber">
--
Gitblit v1.9.3