Merge remote-tracking branch 'origin/master'

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></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%">
@@ -669,4 +670,8 @@ export default {
   line-height: 1px;
   vertical-align: middle;
 }
+.el-divider {
+  margin: 0 !important;
+  background-color: #FFFFFF;
+}
 </style>

yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue

@@ -99,6 +99,7 @@
             </el-col>
           </el-row>
           <div class="title">退货信息</div>
+          <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%">
@@ -269,4 +270,8 @@ export default {
 .addinputInfo {
   margin-left: 120px !important;
 }
+.el-divider {
+  margin: 0 !important;
+  background-color: #FFFFFF;
+}
 </style>

yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue

@@ -102,6 +102,7 @@
             </el-col>
           </el-row>
           <div class="title">退货信息</div>
+          <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%">
@@ -513,4 +514,8 @@ export default {
 .rowClass{
   border-top: 1px solid #E0E3EB;
 }
+.el-divider {
+  margin: 0 !important;
+  background-color: #FFFFFF;
+}
 </style>

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></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%">
@@ -624,4 +625,8 @@ export default {
   line-height: 1px;
   vertical-align: middle;
 }
+.el-divider {
+  margin: 0 !important;
+  background-color: #FFFFFF;
+}
 </style>

yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue

@@ -99,6 +99,7 @@
             </el-col>
           </el-row>
           <div class="title">退货信息</div>
+          <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%">
@@ -299,4 +300,8 @@ export default {
 .addinputInfo {
   margin-left: 120px !important;
 }
+.el-divider {
+  margin: 0 !important;
+  background-color: #FFFFFF;
+}
 </style>