Merge branch 'v3.0-dev-before' of http://120.46.155.214:3000/xiaodai2022/order-ui-pc into v3.0-dev-before

src/components/globalComponents/show-goods-data-table/ShowDataTableColumns.js

@@ -288,7 +288,7 @@ const onlineColumns = [
     span: 6
   },
   // {
-  //   prop: "platform_code_en",
+  //   prop: "plat_code",
   //   label: "平台商品编码",
   //   span: 6,
   // },

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

@@ -64,7 +64,7 @@
             </li>
             <li>
               <span>平台商品编码：</span>
-              <span>{{ sitem.platform_code_en }}</span>
+              <span>{{ sitem.plat_code }}</span>
             </li>
           </ul>
           <i slot="reference" class="el-icon-warning-outline fr" />

src/views/bbc/bbcOnline/columns.js

@@ -75,8 +75,8 @@ const listCol = [
     'min-width': '160px'
   },
   // {
-  //   prop: "platform_code_en",
-  //   label: "平台编号",
+  //   prop: "plat_code",
+  //   label: "平台商品编号",
   //   width: "170px",
   // },
   // {

src/views/goodStore/goodsOnline/columns.js

@@ -73,8 +73,8 @@ const listCol = [
     'min-width': '160px'
   },
   // {
-  //   prop: "platform_code_en",
-  //   label: "平台编号",
+  //   prop: "plat_code",
+  //   label: "平台商品编号",
   //   width: "170px",
   // },
   // {

src/views/orderEntry/orderConfirm/columns.js

@@ -299,7 +299,7 @@ const onlineColumns = [
     span: 24
   },
   // {
-  //   prop: "platform_code_en",
+  //   prop: "plat_code",
   //   label: "平台商品编码",
   //   span: 6,
   // },

src/views/orderEntry/orderConfirm/index.vue

@@ -164,7 +164,7 @@
                             </li>
                             <!-- <li>
                               <span>平台商品编码：</span
-                              ><span>{{ conGoodData.platform_code_en }}</span>
+                              ><span>{{ conGoodData.plat_code }}</span>
                             </li> -->
                           </ul>
                           <i class="el-icon-warning-outline fr" slot="reference"></i>
@@ -280,7 +280,7 @@
                               </li>
                               <!-- <li>
                                 <span>平台商品编码：</span
-                                ><span>{{ subGoodData.platform_code_en }}</span>
+                                ><span>{{ subGoodData.plat_code }}</span>
                               </li> -->
                             </ul>
                             <i class="el-icon-warning-outline fr" slot="reference"></i>

src/views/sellOut/zixunOrder/components/transferGoodModal.vue

@@ -656,7 +656,7 @@ export default {
             sendtype: "1", // 发货方式
             arrtime: in_arrival_time || "", // 到货时间
             remark: "",
-            proof_type: "1", // 通过or驳回
+            proof_type: "2", // 通过or驳回
             proof_url: "", // 驳回至
             companyNo: in_companyNo || "",
             goodtype: Number(sale_price) === 0 ? "2" : "1",