Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

public/MP_verify_GQ6FGqhLDtAOj69c.txt

@@ -0,0 +1 @@
+GQ6FGqhLDtAOj69c

src/views/exportTrade/salesContract/components/goodsInfo.vue

@@ -89,11 +89,11 @@
             :disabled="detailData.status == 1">删除</el-button>
           <div v-if="!goodsEditShow"
             style="display:flex;flex-direction: column;justify-content: center;margin-left: 10px;">
-            <el-tooltip effect="dark" content="向上移动" placement="top">
+            <el-tooltip effect="dark" content="上"  placement="left">
               <i v-if="index != 0" :disabled="detailData.status == 1" class="el-icon-arrow-up" @click="moveUp(row, index)"
                 style="color:#409EFF;"></i>
             </el-tooltip>
-            <el-tooltip effect="dark" content="向下移动" placement="bottom"> <i v-if="index != (data.length - 1)"
+            <el-tooltip effect="dark" content="下" placement="right"> <i v-if="index != (data.length - 1)"
                 :disabled="detailData.status == 1" class="el-icon-arrow-down" @click="moveDown(row, index)"
                 style="color:#409EFF;"></i>
             </el-tooltip>

src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -214,6 +214,9 @@ export default {
         }, {
           name: 'totalMoney',
           type: 'sum',
+        }, {
+            name: 'returnsNumber',
+            type: 'sum',
         }],
         column: [{
           label: '销售单号',