|
|
@@ -86,26 +86,19 @@ export default {
|
|
|
// 表格请求数据的地址
|
|
|
requestUrl: "/api/v1/ams/getSaleOrderInfoes?apiId=408",
|
|
|
selectionType: "select",
|
|
|
-<<<<<<< HEAD
|
|
|
comparison: "saleNumber",
|
|
|
columnIndexs: [0, 1, 2, 3, 4, 8, 9, 10, 11, 12, 13, 14, 15]
|
|
|
-=======
|
|
|
->>>>>>> f2150ab3172b86585a09574acc2db8baa1c3db03
|
|
|
},
|
|
|
option2: {
|
|
|
// 表格请求数据的地址
|
|
|
requestUrl: "/api/v1/ams/getSaleOrderReportedes?apiId=408",
|
|
|
-<<<<<<< HEAD
|
|
|
comparison: "saleNumber",
|
|
|
columnIndexs: [0, 1, 2, 3, 7, 8, 9, 10, 11, 12, 13, 14, 15]
|
|
|
-=======
|
|
|
->>>>>>> f2150ab3172b86585a09574acc2db8baa1c3db03
|
|
|
},
|
|
|
option4: {
|
|
|
// 表格请求数据的地址
|
|
|
requestUrl:
|
|
|
"/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&saleType=1",
|
|
|
-<<<<<<< HEAD
|
|
|
comparison: "saleNumber",
|
|
|
columnIndexs: [
|
|
|
0,
|
|
|
@@ -126,8 +119,6 @@ export default {
|
|
|
18,
|
|
|
20
|
|
|
]
|
|
|
-=======
|
|
|
->>>>>>> f2150ab3172b86585a09574acc2db8baa1c3db03
|
|
|
},
|
|
|
mapList: [],
|
|
|
mapItemList: [],
|
