From 6966d2341eaccf59ed2874d406bb701b06d5d448 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 1 Nov 2024 09:38:54 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/operation/merchandisereturn/merchandisereturnAdd.vue | 3 ++-
 .../operation/merchandisereturn/merchandisereturnInfo.vue      | 1 +
 .../workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue    | 1 +
 .../workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue      | 3 ++-
 .../workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue     | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
index f1b1294f21..962006e8cd 100644
--- a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
+++ b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
@@ -106,7 +106,7 @@
             <el-table :key="sitemKey" :data="formobj.sitemVos" :index="index" border style="width: 100%">
               <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
               <el-table-column fixed label="操作" align="center" width="100">
-                <template>
+                <template slot-scope="scope">
                   <el-button type="primary" size="small" @click="sitemReturn(scope.row, scope.$index)">退</el-button>
                 </template>
               </el-table-column>
@@ -149,6 +149,7 @@
             </el-table>
           </div>
           <div class="title">退货信息</div>
+          <el-divider style="color: #FFFFFF"></el-divider>
           <div v-show="formobj.returnSitemVos.length > 0">
             <div class="title">维修项目</div>
             <el-table :key="sitemReturnKey" :data="formobj.returnSitemVos" :index="index" border style="width: 100%">
diff --git a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
index 8dd93cf06a..2b8bb3e3b7 100644
--- a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
+++ b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
@@ -99,6 +99,7 @@
             </el-col>
           </el-row>
           <div class="title">退货信息</div>
+          <el-divider style="color: #FFFFFF"></el-divider>
           <div v-show="formobj.returnSitemVos.length > 0">
             <div class="title">维修项目</div>
             <el-table :key="sitemReturnKey" :data="formobj.returnSitemVos" :index="index" border style="width: 100%">
diff --git a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
index a73bb36725..645cb3e8e8 100644
--- a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
@@ -102,6 +102,7 @@
             </el-col>
           </el-row>
           <div class="title">退货信息</div>
+          <el-divider style="color: #FFFFFF"></el-divider>
           <div v-show="formobj.returnSitemVos.length > 0">
             <div class="title">维修项目</div>
             <el-table :key="sitemReturnKey" :data="formobj.returnSitemVos" :index="index" border style="width: 100%">
diff --git a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
index 27455aefab..0c857ae443 100644
--- a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
@@ -105,7 +105,7 @@
             <el-table :key="sitemKey" :data="formobj.sitemVos" :index="index" border style="width: 100%">
               <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
               <el-table-column fixed label="操作" align="center" width="100">
-                <template>
+                <template slot-scope="scope">
                   <el-button type="primary" size="small" @click="sitemReturn(scope.row, scope.$index)">退</el-button>
                 </template>
               </el-table-column>
@@ -149,6 +149,7 @@
             </el-table>
           </div>
           <div class="title">退货信息</div>
+          <el-divider style="color: #FFFFFF"></el-divider>
           <div v-show="formobj.returnSitemVos.length > 0">
             <div class="title">维修项目</div>
             <el-table :key="sitemReturnKey" :data="formobj.returnSitemVos" :index="index" border style="width: 100%">
diff --git a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
index c98360aea6..ad5204c194 100644
--- a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
@@ -99,6 +99,7 @@
             </el-col>
           </el-row>
           <div class="title">退货信息</div>
+          <el-divider style="color: #FFFFFF"></el-divider>
           <div v-show="formobj.returnSitemVos.length > 0">
             <div class="title">维修项目</div>
             <el-table :key="sitemReturnKey" :data="formobj.returnSitemVos" :index="index" border style="width: 100%">

From 61fb1908d9ca6f77fdd3ac406edbf3b1b752ea4c Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 1 Nov 2024 09:51:59 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/operation/merchandisereturn/merchandisereturnAdd.vue  | 2 +-
 .../views/operation/merchandisereturn/merchandisereturnInfo.vue | 2 +-
 .../workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue     | 2 +-
 .../views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue | 2 +-
 .../workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
index 962006e8cd..1ad9be8f49 100644
--- a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
+++ b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
@@ -149,7 +149,7 @@
             </el-table>
           </div>
           <div class="title">退货信息</div>
-          <el-divider style="color: #FFFFFF"></el-divider>
+          <el-divider style="background-color: #FFFFFF;margin: 0px !important;"></el-divider>
           <div v-show="formobj.returnSitemVos.length > 0">
             <div class="title">维修项目</div>
             <el-table :key="sitemReturnKey" :data="formobj.returnSitemVos" :index="index" border style="width: 100%">
diff --git a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
index 2b8bb3e3b7..09d28dbc89 100644
--- a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
+++ b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
@@ -99,7 +99,7 @@
             </el-col>
           </el-row>
           <div class="title">退货信息</div>
-          <el-divider style="color: #FFFFFF"></el-divider>
+          <el-divider style="background-color: #FFFFFF;margin: 0px !important;"></el-divider>
           <div v-show="formobj.returnSitemVos.length > 0">
             <div class="title">维修项目</div>
             <el-table :key="sitemReturnKey" :data="formobj.returnSitemVos" :index="index" border style="width: 100%">
diff --git a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
index 645cb3e8e8..f52f67bfb0 100644
--- a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
@@ -102,7 +102,7 @@
             </el-col>
           </el-row>
           <div class="title">退货信息</div>
-          <el-divider style="color: #FFFFFF"></el-divider>
+          <el-divider style="background-color: #FFFFFF;margin: 0px !important;"></el-divider>
           <div v-show="formobj.returnSitemVos.length > 0">
             <div class="title">维修项目</div>
             <el-table :key="sitemReturnKey" :data="formobj.returnSitemVos" :index="index" border style="width: 100%">
diff --git a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
index 0c857ae443..3020f07ff6 100644
--- a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
@@ -149,7 +149,7 @@
             </el-table>
           </div>
           <div class="title">退货信息</div>
-          <el-divider style="color: #FFFFFF"></el-divider>
+          <el-divider style="background-color: #FFFFFF;margin: 0px !important;"></el-divider>
           <div v-show="formobj.returnSitemVos.length > 0">
             <div class="title">维修项目</div>
             <el-table :key="sitemReturnKey" :data="formobj.returnSitemVos" :index="index" border style="width: 100%">
diff --git a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
index ad5204c194..f994bd5111 100644
--- a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
@@ -99,7 +99,7 @@
             </el-col>
           </el-row>
           <div class="title">退货信息</div>
-          <el-divider style="color: #FFFFFF"></el-divider>
+          <el-divider style="background-color: #FFFFFF;margin: 0px !important;"></el-divider>
           <div v-show="formobj.returnSitemVos.length > 0">
             <div class="title">维修项目</div>
             <el-table :key="sitemReturnKey" :data="formobj.returnSitemVos" :index="index" border style="width: 100%">

From 930459c6e9228a3f2d035b6b0cf5120488c6cbfa Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 1 Nov 2024 09:58:41 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operation/merchandisereturn/merchandisereturnAdd.vue    | 6 +++++-
 .../operation/merchandisereturn/merchandisereturnInfo.vue   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
index 1ad9be8f49..42bbdd4254 100644
--- a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
+++ b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
@@ -149,7 +149,7 @@
             </el-table>
           </div>
           <div class="title">退货信息</div>
-          <el-divider style="background-color: #FFFFFF;margin: 0px !important;"></el-divider>
+          <el-divider></el-divider>
           <div v-show="formobj.returnSitemVos.length > 0">
             <div class="title">维修项目</div>
             <el-table :key="sitemReturnKey" :data="formobj.returnSitemVos" :index="index" border style="width: 100%">
@@ -670,4 +670,8 @@ export default {
   line-height: 1px;
   vertical-align: middle;
 }
+.el-divider {
+  margin: 0 !important;
+  background-color: #FFFFFF;
+}
 </style>
diff --git a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
index 09d28dbc89..b2ea016cdf 100644
--- a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
+++ b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
@@ -99,7 +99,7 @@
             </el-col>
           </el-row>
           <div class="title">退货信息</div>
-          <el-divider style="background-color: #FFFFFF;margin: 0px !important;"></el-divider>
+          <el-divider></el-divider>
           <div v-show="formobj.returnSitemVos.length > 0">
             <div class="title">维修项目</div>
             <el-table :key="sitemReturnKey" :data="formobj.returnSitemVos" :index="index" border style="width: 100%">
@@ -270,4 +270,8 @@ export default {
 .addinputInfo {
   margin-left: 120px !important;
 }
+.el-divider {
+  margin: 0 !important;
+  background-color: #FFFFFF;
+}
 </style>

From ae43d824219be04ca28024e8dd7e43cefebec65d Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 1 Nov 2024 10:02:42 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue | 6 +++++-
 .../workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue   | 6 +++++-
 .../workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue  | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
index f52f67bfb0..e4cf7bb83c 100644
--- a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
@@ -102,7 +102,7 @@
             </el-col>
           </el-row>
           <div class="title">退货信息</div>
-          <el-divider style="background-color: #FFFFFF;margin: 0px !important;"></el-divider>
+          <el-divider></el-divider>
           <div v-show="formobj.returnSitemVos.length > 0">
             <div class="title">维修项目</div>
             <el-table :key="sitemReturnKey" :data="formobj.returnSitemVos" :index="index" border style="width: 100%">
@@ -514,4 +514,8 @@ export default {
 .rowClass{
   border-top: 1px solid #E0E3EB;
 }
+.el-divider {
+  margin: 0 !important;
+  background-color: #FFFFFF;
+}
 </style>
diff --git a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
index 3020f07ff6..a0258df10b 100644
--- a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
@@ -149,7 +149,7 @@
             </el-table>
           </div>
           <div class="title">退货信息</div>
-          <el-divider style="background-color: #FFFFFF;margin: 0px !important;"></el-divider>
+          <el-divider></el-divider>
           <div v-show="formobj.returnSitemVos.length > 0">
             <div class="title">维修项目</div>
             <el-table :key="sitemReturnKey" :data="formobj.returnSitemVos" :index="index" border style="width: 100%">
@@ -625,4 +625,8 @@ export default {
   line-height: 1px;
   vertical-align: middle;
 }
+.el-divider {
+  margin: 0 !important;
+  background-color: #FFFFFF;
+}
 </style>
diff --git a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
index f994bd5111..9c3206cda8 100644
--- a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
@@ -99,7 +99,7 @@
             </el-col>
           </el-row>
           <div class="title">退货信息</div>
-          <el-divider style="background-color: #FFFFFF;margin: 0px !important;"></el-divider>
+          <el-divider></el-divider>
           <div v-show="formobj.returnSitemVos.length > 0">
             <div class="title">维修项目</div>
             <el-table :key="sitemReturnKey" :data="formobj.returnSitemVos" :index="index" border style="width: 100%">
@@ -300,4 +300,8 @@ export default {
 .addinputInfo {
   margin-left: 120px !important;
 }
+.el-divider {
+  margin: 0 !important;
+  background-color: #FFFFFF;
+}
 </style>