diff --git a/src/view/ExportSaleData.vue b/src/view/ExportSaleData.vue index c04b097..b122b37 100644 --- a/src/view/ExportSaleData.vue +++ b/src/view/ExportSaleData.vue @@ -32,6 +32,36 @@ +
+ + +
+
+ +
+
+ +
+ + + + +
+
+ +
+ + + +
+
+
+
v / 100 + prop: 'className', + label: 'SKU属性', + align: 'center' }, { prop: 'isVerifyPrice', @@ -91,11 +122,32 @@ import { Message } from 'element-ui' align: 'center', format: v => v ? '核价通过': '核价未通过 / 无法备货' }, + { + prop: 'supplierPrice', + label: '申报价格(CNY)', + align: 'center', + format: v => v / 100, + fixed: "right" + }, + { + prop: 'warehouseInventoryNum', + label: '仓内可用库存', + align: 'center', + fixed: "right" + }, + { + prop: 'productTotalPrice', + label: '货值(CNY)', + align: 'center', + fixed: "right" + }, + ], jsonFields: { "商品名称": "productName", "SPU": "productId", "SKC": "productSkcId", + "SKU ID": "productSkuId", "SKU属性": "className", "申报价格(CNY)": { "field": "supplierPrice", @@ -134,7 +186,8 @@ import { Message } from 'element-ui' "非VMI备货单数 - 在途单数": "notVmiOrderInfo.transportationNum", "非VMI备货单数 - 发货延迟": "notVmiOrderInfo.deliveryDelayNum", "非VMI备货单数 - 到货延迟": "notVmiOrderInfo.arrivalDelayNum", - "备货逻辑": "purchaseConfig" + "备货逻辑": "purchaseConfig", + "货值(CNY)": "productTotalPrice", } } }, @@ -180,7 +233,9 @@ import { Message } from 'element-ui' data.purchaseConfig = item.purchaseConfig; for(let j = 0;j < item.skuQuantityDetailList.length; j++) { - data = {...data, ...item.skuQuantityDetailList[j]} + data = {...data, ...item.skuQuantityDetailList[j], + productTotalPrice: ((item.skuQuantityDetailList[j].supplierPrice / 100) * item.skuQuantityDetailList[j].inventoryNumInfo.warehouseInventoryNum).toFixed(2), + warehouseInventoryNum: item.skuQuantityDetailList[j].inventoryNumInfo.warehouseInventoryNum} this.list.push(data); } } @@ -212,4 +267,9 @@ import { Message } from 'element-ui' diff --git a/src/view/NormalSendGoods.vue b/src/view/NormalSendGoods.vue index 111b5d0..725c959 100644 --- a/src/view/NormalSendGoods.vue +++ b/src/view/NormalSendGoods.vue @@ -234,12 +234,16 @@ pageSize: 100, currentPage: 1, step: 400, + randomValue: 400, timer: [], loadMallIndex: 0, loadMode: 0, // 加载模式,0表示单个店铺加载,1表示一键加载 robMode: 0, // 抢仓模式,0表示普通抢仓,1表示极速抢仓 isCreateDeliveryBill: false, + // 网络超时次数 + networkErrorCount: 0, + successDlgShow: false, successMallId: '', successList: [] @@ -314,6 +318,7 @@ }, handleRobClick (e) { + this.networkErrorCount = 0 if (e === 'normal') { this.robMode = 0 } else if (e === 'faster') { @@ -476,10 +481,13 @@ if (this.isBegin) { setTimeout(() => { this.rob(sn, mallId) - }, this.choosedList.length * this.step) + }, this.choosedList.length * this.step + Math.floor((Math.random() * this.randomValue) + 1)) } } } + if (40002 == res.error_code) { + + } }) }, createDeliveryBill(sn, mallId) {