Merge branch 'sit'

src/components/globalComponents/show-goods-data-table/main.vue

@@ -29,7 +29,7 @@
         <el-popover placement="top" width="300" trigger="hover">
           <ul>
             <li>
-              <span>SKU编号：</span><span>{{ sitem.skuCode }}</span>
+              <span>上线商品编号：</span><span>{{ sitem.skuCode }}</span>
             </li>
             <li
               v-if="
@@ -39,7 +39,7 @@
                 private_field.some((item) => item == '1')
               "
             >
-              <span>SPU编号：</span><span>{{ sitem.spuCode }}</span>
+              <span>商品成本编号：</span><span>{{ sitem.spuCode }}</span>
             </li>
             <li>
               <span>平台商品编码：</span
@@ -157,7 +157,7 @@
         <el-popover placement="top" width="300" trigger="hover">
           <ul>
             <li>
-              <span>SPU编号：</span><span>{{ sitem.spuCode }}</span>
+              <span>商品成本编号：</span><span>{{ sitem.spuCode }}</span>
             </li>
           </ul>
           <i class="el-icon-warning-outline fr" slot="reference"></i>

src/views/orderEntry/orderConfirm/index.vue

@@ -160,7 +160,7 @@
                         <el-popover placement="top" width="300" trigger="hover">
                           <ul>
                             <li>
-                              <span>SKU编号：</span
+                              <span>上线商品编号：</span
                               ><span>{{ conGoodData.skuCode }}</span>
                             </li>
                             <li
@@ -171,7 +171,7 @@
                                 private_field.some((item) => item == '1')
                               "
                             >
-                              <span>SPU编号：</span
+                              <span>商品成本编号：</span
                               ><span>{{ conGoodData.spuCode }}</span>
                             </li>
                             <!-- <li>
@@ -305,7 +305,7 @@
                           >
                             <ul>
                               <li>
-                                <span>SKU编号：</span
+                                <span>上线商品编号：</span
                                 ><span>{{ subGoodData.skuCode }}</span>
                               </li>
                               <li
@@ -316,7 +316,7 @@
                                   private_field.some((item) => item == '1')
                                 "
                               >
-                                <span>SPU编号：</span
+                                <span>商品成本编号：</span
                                 ><span>{{ subGoodData.spuCode }}</span>
                               </li>
                               <!-- <li>

src/views/purchaseIn/wsmInOrder/columns.js

@@ -34,7 +34,7 @@ export default [
 
   {
     prop: "spuCode",
-    label: "SPU编号",
+    label: "商品成本编号",
     width: "145px",
   },
   {

src/views/sellOut/salesOrder/components/ShowDataTableColumns.js

@@ -125,12 +125,12 @@ const showColumns = [
 
   // {
   //   prop: "good_code",
-  //   label: "SPU编号",
+  //   label: "商品成本编号",
   //   span: 6,
   // },
   // {
   //   prop: "skuCode",
-  //   label: "SKU编号",
+  //   label: "上线商品编号",
   //   span: 6,
   // },
   {