From 4fbc2ce08b6bbf43073a6195db6720907301f3f2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 23 五月 2026 13:50:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/views/procurementManagement/purchaseReturnOrder/New.vue | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/views/procurementManagement/purchaseReturnOrder/New.vue b/src/views/procurementManagement/purchaseReturnOrder/New.vue
index 2c6801d..9474b11 100644
--- a/src/views/procurementManagement/purchaseReturnOrder/New.vue
+++ b/src/views/procurementManagement/purchaseReturnOrder/New.vue
@@ -3,8 +3,10 @@
<el-dialog
v-model="isShow"
title="鏂板閲囪喘閫�璐�"
- width="1600"
+ width="70%"
+ top="3vh"
@close="closeModal"
+ class="purchase-return-dialog"
>
<el-form label-width="140px" :model="formState" label-position="top" ref="formRef" :inline="true">
<div class="section-title">
@@ -221,19 +223,19 @@
<el-input style="width: 240px" v-model="formState.remark" :rows="1" type="textarea" placeholder="璇疯緭鍏ュ娉�"/>
</el-form-item>
- <div style="margin: 20px 0;">
+ <div style="margin:20px 0;min-width:0;">
<div class="section-title">
<span class="title-dot"></span>
<span class="title-text">浜у搧鍒楄〃</span>
</div>
- <el-button type="primary" size="small" style="margin-bottom: 20px" @click="isShowProductsModal = true" :disabled="!formState.purchaseLedgerId">娣诲姞浜у搧</el-button>
- <div class="product-table-scroll">
- <el-table class="product-table-inner"
+ <el-button type="primary" size="small" style="margin-bottom:20px" @click="isShowProductsModal = true" :disabled="!formState.purchaseLedgerId">娣诲姞浜у搧</el-button>
+ <el-table
:data="formState.purchaseReturnOrderProductsDtos"
border
max-height="400"
show-summary
- :summary-method="summarizeChildrenTable">
+ :summary-method="summarizeChildrenTable"
+ style="width:100%;min-width:0;">
<el-table-column align="center"
type="selection"
width="55" />
@@ -324,7 +326,6 @@
</template>
</el-table-column>
</el-table>
- </div>
</div>
<div class="section-title">
@@ -803,12 +804,5 @@
margin-right: 8px;
}
-.product-table-scroll {
- width: 100%;
- overflow-x: auto;
-}
-.product-table-inner {
- min-width: 1280px;
-}
</style>
\ No newline at end of file
--
Gitblit v1.9.3