From 6e15ba36ab0a264b7c3a038edaf01abbdc71e54b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 02 九月 2025 11:29:23 +0800
Subject: [PATCH] 合并冲突掉的代码
---
src/views/inventoryManagement/dispatchLog/index.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index 27d8f33..2f12a60 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -38,9 +38,15 @@
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column
+ label="鍑哄簱缂栧彿"
+ prop="code"
+ min-width="250"
+ show-overflow-tooltip
+ />
+ <el-table-column
label="鍑哄簱鏃ユ湡"
prop="createTime"
- min-width="250"
+ min-width="130"
show-overflow-tooltip
/>
<el-table-column
@@ -76,13 +82,13 @@
<el-table-column
label="鍚◣鍗曚环(鍏�)"
prop="taxInclusiveUnitPrice"
- width="100"
+ width="200"
show-overflow-tooltip
/>
<el-table-column
label="鍚◣鎬讳环(鍏�)"
prop="taxInclusiveTotalPrice"
- width="100"
+ width="200"
show-overflow-tooltip
/>
<el-table-column
--
Gitblit v1.9.3