浏览代码

导入字段修改

lucky-lzx 2 年之前
父节点
当前提交
684f6045b9
共有 2 个文件被更改,包括 20 次插入19 次删除
  1. 7 6
      src/views/orderEntry/orderEnter/columns.js
  2. 13 13
      src/views/orderEntry/orderImport/index.vue

+ 7 - 6
src/views/orderEntry/orderEnter/columns.js

@@ -45,7 +45,7 @@ const listCol = [{
   // },
   {
     prop: "discount_price",
-    label: "优惠金额",
+    label: "订单总金额",
     width: "140px",
   },
   // {
@@ -63,11 +63,7 @@ const listCol = [{
     label: "收费模式",
     width: "140px",
   },
-  {
-    prop: "order_remark",
-    label: "订单备注",
-    width: "140px",
-  },
+  
   {
     prop: "contactor",
     label: "收货人",
@@ -83,6 +79,11 @@ const listCol = [{
     label: "联系地址",
     width: "140px",
   },
+  {
+    prop: "order_remark",
+    label: "订单备注",
+    width: "140px",
+  },
   // {
   //   prop: "",
   //   label: "订单编号",

+ 13 - 13
src/views/orderEntry/orderImport/index.vue

@@ -69,15 +69,15 @@ export default {
         "平台商品编号",
         "单价(元)",
         "数量",
-        "优惠前总金额",
-        "优惠金额",
-        "商品优惠后金额",
+        // "优惠前总金额",
+        "订单总金额",
+        // "商品优惠后金额",
         "优惠活动名称",
         "收费模式",
-        "订单备注",
         "收货人",
         "联系电话",
         "联系地址",
+        "订单备注",
       ];
       if (head.length !== header.length) {
         // console.log("自定义head长度",head.length)
@@ -116,15 +116,15 @@ export default {
           plat_code: b[4] + "",
           price: b[5] + "",
           num: b[6] + "",
-          before_discount_all_price: b[7] + "",
-          discount_price: b[8] + "",
-          after_price: b[9] + "",
-          activity_name: b[10] + "",
-          mode: b[11] + "",
-          order_remark: b[12] + "",
-          contactor: b[13] + "",
-          mobile: b[14] + "",
-          addr: b[15] + "",
+          // before_discount_all_price: b[7] + "",
+          discount_price: b[7] + "",
+          // after_price: b[9] + "",
+          activity_name: b[8] + "",
+          mode: b[9] + "",
+          contactor: b[10] + "",
+          mobile: b[11] + "",
+          addr: b[12] + "",
+          order_remark: b[13] + "",
         };
 
         this.tableData.push(model);