From 4ca2aeafbb3c753d98ba849fa5ebf817049b5803 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 02 九月 2025 11:49:13 +0800
Subject: [PATCH] 合并冲突
---
src/views/inventoryManagement/dispatchLog/index.vue | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index 27d8f33..177868d 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -19,7 +19,6 @@
<!-- <el-button type="primary" @click="openForm('add')">鏂板</el-button> -->
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
- <el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button>
</div>
</div>
<div class="table_list">
@@ -40,7 +39,7 @@
<el-table-column
label="鍑哄簱鏃ユ湡"
prop="createTime"
- min-width="250"
+ min-width="130"
show-overflow-tooltip
/>
<el-table-column
@@ -76,13 +75,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