From 7e7ab77f166549c8f54bfdc583b89079bdb65953 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 09 三月 2026 10:43:34 +0800
Subject: [PATCH] 优化新增采购退货页面

---
 src/views/procurementManagement/purchaseReturnOrder/New.vue         |    2 
 src/views/procurementManagement/purchaseReturnOrder/ProductList.vue |  141 +++++++++++++++++++++++-----------------------
 2 files changed, 71 insertions(+), 72 deletions(-)

diff --git a/src/views/procurementManagement/purchaseReturnOrder/New.vue b/src/views/procurementManagement/purchaseReturnOrder/New.vue
index ef71275..1fccb11 100644
--- a/src/views/procurementManagement/purchaseReturnOrder/New.vue
+++ b/src/views/procurementManagement/purchaseReturnOrder/New.vue
@@ -233,7 +233,7 @@
         </el-form-item>
       </el-form>
 
-      <el-button type="primary" size="small" @click="isShowProductsModal = true" :disabled="!formState.purchaseLedgerId">娣诲姞浜у搧</el-button>
+      <el-button type="primary" size="small" style="margin-bottom: 10px;" @click="isShowProductsModal = true" :disabled="!formState.purchaseLedgerId">娣诲姞浜у搧</el-button>
       <el-table :data="products" border>
         <el-table-column align="center"
                          type="selection"
diff --git a/src/views/procurementManagement/purchaseReturnOrder/ProductList.vue b/src/views/procurementManagement/purchaseReturnOrder/ProductList.vue
index 9b4f802b..3eeb167 100644
--- a/src/views/procurementManagement/purchaseReturnOrder/ProductList.vue
+++ b/src/views/procurementManagement/purchaseReturnOrder/ProductList.vue
@@ -1,79 +1,77 @@
 <template>
-  <template>
-    <div>
-      <el-dialog
-          v-model="isShow"
-          title="鏂板浜у搧"
-          width="1200"
-          @close="closeModal"
-      >
-        <div class="table_list">
-          <el-table :data="tableData"
-                    border
-                    @selection-change="handleChangeSelection">
-            <el-table-column align="center"
-                             type="selection"
-                             width="55" />
-            <el-table-column align="center"
-                             label="搴忓彿"
-                             type="index"
-                             width="60" />
-            <el-table-column label="浜у搧澶х被"
-                             prop="productCategory" />
-            <el-table-column label="瑙勬牸鍨嬪彿"
-                             prop="specificationModel" />
-            <el-table-column label="鍗曚綅"
-                             prop="unit"
-                             width="70" />
-            <el-table-column label="鏁伴噺"
-                             prop="quantity"
-                             width="70" />
-            <el-table-column label="搴撳瓨棰勮鏁伴噺"
-                             prop="warnNum"
-                             width="120"
-                             show-overflow-tooltip />
-            <el-table-column label="绋庣巼(%)"
-                             prop="taxRate"
-                             width="80" />
-            <el-table-column label="鍚◣鍗曚环(鍏�)"
-                             prop="taxInclusiveUnitPrice"
-                             :formatter="formattedNumber"
-                             width="150" />
-            <el-table-column label="鍚◣鎬讳环(鍏�)"
-                             prop="taxInclusiveTotalPrice"
-                             :formatter="formattedNumber"
-                             width="150" />
-            <el-table-column label="涓嶅惈绋庢�讳环(鍏�)"
-                             prop="taxExclusiveTotalPrice"
-                             :formatter="formattedNumber"
-                             width="150" />
-            <el-table-column label="鏄惁璐ㄦ"
-                             prop="isChecked"
-                             width="150">
-              <template #default="scope">
-                <el-tag :type="scope.row.isChecked ? 'success' : 'info'">
-                  {{ scope.row.isChecked ? '鏄�' : '鍚�' }}
-                </el-tag>
-              </template>
-            </el-table-column>
-          </el-table>
-          <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
-                      :page="page.current" :limit="page.size" @pagination="paginationChange" />
-        </div>
+  <div>
+    <el-dialog
+        v-model="isShow"
+        title="鏂板浜у搧"
+        width="1200"
+        @close="closeModal"
+    >
+      <div class="table_list">
+        <el-table :data="tableData"
+                  border
+                  @selection-change="handleChangeSelection">
+          <el-table-column align="center"
+                           type="selection"
+                           width="55" />
+          <el-table-column align="center"
+                           label="搴忓彿"
+                           type="index"
+                           width="60" />
+          <el-table-column label="浜у搧澶х被"
+                           prop="productCategory" />
+          <el-table-column label="瑙勬牸鍨嬪彿"
+                           prop="specificationModel" />
+          <el-table-column label="鍗曚綅"
+                           prop="unit"
+                           width="70" />
+          <el-table-column label="鏁伴噺"
+                           prop="quantity"
+                           width="70" />
+          <el-table-column label="搴撳瓨棰勮鏁伴噺"
+                           prop="warnNum"
+                           width="120"
+                           show-overflow-tooltip />
+          <el-table-column label="绋庣巼(%)"
+                           prop="taxRate"
+                           width="80" />
+          <el-table-column label="鍚◣鍗曚环(鍏�)"
+                           prop="taxInclusiveUnitPrice"
+                           :formatter="formattedNumber"
+                           width="150" />
+          <el-table-column label="鍚◣鎬讳环(鍏�)"
+                           prop="taxInclusiveTotalPrice"
+                           :formatter="formattedNumber"
+                           width="150" />
+          <el-table-column label="涓嶅惈绋庢�讳环(鍏�)"
+                           prop="taxExclusiveTotalPrice"
+                           :formatter="formattedNumber"
+                           width="150" />
+          <el-table-column label="鏄惁璐ㄦ"
+                           prop="isChecked"
+                           width="150">
+            <template #default="scope">
+              <el-tag :type="scope.row.isChecked ? 'success' : 'info'">
+                {{ scope.row.isChecked ? '鏄�' : '鍚�' }}
+              </el-tag>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
+                    :page="page.current" :limit="page.size" @pagination="paginationChange" />
+      </div>
 
-        <template #footer>
-          <div class="dialog-footer">
-            <el-button type="primary" :disabled="selectedRows.length === 0" @click="handleSubmit">纭</el-button>
-            <el-button @click="closeModal">鍙栨秷</el-button>
-          </div>
-        </template>
-      </el-dialog>
-    </div>
-  </template>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" :disabled="selectedRows.length === 0" @click="handleSubmit">纭</el-button>
+          <el-button @click="closeModal">鍙栨秷</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup>
-import {computed, reactive, ref} from "vue";
+import {computed, reactive, ref, onMounted} from "vue";
 import {productList} from "@/api/procurementManagement/procurementLedger.js";
 import {ElMessage} from "element-plus";
 
@@ -138,6 +136,7 @@
   }
 
   emit('completed', selectedRows.value);
+  closeModal()
 }
 
 const closeModal = () => {

--
Gitblit v1.9.3