Merge branch 'master' into sit

src/assets/js/statusList.js

@@ -19,6 +19,7 @@ const cg_order_source_options = [
   { id: "3", label: "项目转单" },
   { id: "4", label: "平台导入" },
   // { id: "5", label: "有赞平台" },
+  { id: "6", label: "售后补换货" },
 ]
 const xs_order_source_options = [
   // { id: "0", label: "备库单" },
@@ -27,5 +28,6 @@ const xs_order_source_options = [
   { id: "3", label: "项目转单" },
   { id: "4", label: "平台导入" },
   // { id: "5", label: "有赞平台" },
+  { id: "6", label: "售后补换货" },
 ]
 export { statusList, cg_order_type_options, xs_order_type_options, cg_order_source_options, xs_order_source_options };

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

@@ -204,12 +204,18 @@ const showColumns = [
     prop: "is_active",
     label: "活动类型",
     _slot_: "is_active",
-    span: 12,
+    span: 8,
   },
+  {
+    prop: "returnCode",
+    label: "售后来源单号",
+    span: 8,
+  },
+  
   {
     prop: "useage",
     label: "订单用途",
-    span: 12,
+    span: 8,
   },
 
   {