diff --git a/package1/other/logistics.vue b/package1/other/logistics.vue index 3259c78..424f732 100644 --- a/package1/other/logistics.vue +++ b/package1/other/logistics.vue @@ -5,13 +5,12 @@ - 今日订单 + + 今日订单 + ({{waitUpDoorNum}}个待上门取货) 历史订单 > - - + @@ -90,7 +89,8 @@ id:'', type:'', companyName:'', - current:0 + current:0, + waitUpDoorNum:0 } }, created() { @@ -121,8 +121,34 @@ this.endDate = date this.transCompany = this.id this.getList() + this.waitPickUp() }, methods: { + //查询上门取件数量 + waitPickUp(){ + uni.request({ + url: this.tui.interfaceUrl() + '/app/sale/getSaleByCompanyId', + data: { + companyId:this.id, + transportType:1, + status:8 + }, + header: { + 'content-type': 'application/json', + 'appWLToken': this.tui.getToken() + }, + method: 'POST', //'GET','POST' + dataType: 'json', + success: (res) => { + if (res.data.code == 200){ + this.waitUpDoorNum = res.result.orders.length + } + }, + fail: (res) => { + this.tui.toast("网络不给力,请稍后再试~") + } + }) + }, upOrDown(){ var url if(this.type == 1){ //上线状态 diff --git a/package1/stock/addStock.vue b/package1/stock/addStock.vue index 0383ce6..664ceec 100644 --- a/package1/stock/addStock.vue +++ b/package1/stock/addStock.vue @@ -61,7 +61,7 @@ - + @@ -340,22 +340,40 @@ }, //删除整条商品 delShop(item) { - var that = this; - uni.showModal({ - title: "提示", - content: "确定删除此条商品吗?", - success: function(res) { - if (res.confirm) { - for (let i = 0; i < that.carList.length; i++) { - if (that.carList[i].id == item.id) { - that.carList.splice(i, 1) - } - } - that.carType = that.stockList.length - } - that.$forceUpdate() - } - }) + var that = this; + let dataList = [] + var itemData; + itemData = { + checkStockId:uni.getStorageSync('stockId'), + productId: item.id, + productName:item.productName, + productPicture:item.productPicture, + productSn:item.productSn, + checkStockAttributeVos:[] + } + dataList.push(itemData) + this.tui.request("/app/checkStockDetail/addCheckStockDetail", "POST", dataList, false, false).then((res) => { + if (res.code == 200) { + + } else { + this.tui.toast(res.message) + } + }).catch((res) => {}) + // uni.showModal({ + // title: "提示", + // content: "确定删除此条商品吗?", + // success: function(res) { + // if (res.confirm) { + // for (let i = 0; i < that.carList.length; i++) { + // if (that.carList[i].id == item.id) { + // that.carList.splice(i, 1) + // } + // } + // that.carType = that.stockList.length + // } + // that.$forceUpdate() + // } + // }) } } } diff --git a/package1/stock/addStockList.vue b/package1/stock/addStockList.vue index f6e4498..8df07f4 100644 --- a/package1/stock/addStockList.vue +++ b/package1/stock/addStockList.vue @@ -3,7 +3,7 @@ - + @@ -15,33 +15,34 @@ - + - - 品名:{{value[1].productName}} ({{value[1].productSn}}) - 单价:{{value[1].purchasePrice || 0}} 数量:{{value[1].productCount}} - 总价:{{value[1].price}} + 品名:{{item.productName}} + 货号:{{item.productSn}} - + - 商品规格 - 总数量 + 商品规格 + 原数量 + 盘点数 - - - - {{data.attributeList | sliceMsg}} + + + + {{item1.attributeList | sliceMsg}} - - {{data.productCount}} + + {{item1.stockCount}} + + + {{item1.pdNum}} @@ -50,85 +51,30 @@ - - - + + + 备注:{{stock.remark == null ?'':stock.remark}} + + 备注 -