Merge branch 'dev' into sit

src/views/sellOut/sellAfterApply/columns.js

@@ -1,4 +1,9 @@
 const columns = [
+  {
+    prop: "orderCode",
+    label: "订单编号",
+    width: "160"
+  },
   {
     prop: "returnCode",
     label: "售后申请单",

src/views/sellOut/sellAfterApply/index.vue

@@ -128,10 +128,10 @@
                       value="sellOutNum"
                     ></el-option>
 
-                    <!-- <el-option
+                    <el-option
                       label="销售订单编号"
                       value="sellOrderNum"
-                    ></el-option> -->
+                    ></el-option>
 
                     <el-option label="商品编号" value="goodsNum"></el-option>
                     <el-option label="商品名称" value="goodsName"></el-option>