diff --git a/pages/billing/changeGoods1.vue b/pages/billing/changeGoods1.vue index 0d87baa..aca6b9f 100644 --- a/pages/billing/changeGoods1.vue +++ b/pages/billing/changeGoods1.vue @@ -310,7 +310,7 @@ getShareList(id) { this.tui.request("/app/product/getShareList", "POST", { categoryId: this.categoryId, - supplierName: this.searchName, + searchStr: this.searchName, pageNum: this.pageNum, pageSize: '10' }, false, false).then((res) => { diff --git a/pages/billing/outOrder.vue b/pages/billing/outOrder.vue deleted file mode 100644 index 80b5e0c..0000000 --- a/pages/billing/outOrder.vue +++ /dev/null @@ -1,184 +0,0 @@ - - - - - diff --git a/pages/index/downStearmList.vue b/pages/index/downStearmList.vue index c0f1e7e..189ccbe 100644 --- a/pages/index/downStearmList.vue +++ b/pages/index/downStearmList.vue @@ -579,7 +579,7 @@ //点击分类获取商品列表 getShareList(id) { this.tui.request("/app/productShare/getShareList", "POST", { - keywords: this.searchName, + searchStr: this.searchName, id: this.khid, pageNum: this.pageNum, pageSize: '10' diff --git a/pages/index/logistics.vue b/pages/index/logistics.vue deleted file mode 100644 index 4076fef..0000000 --- a/pages/index/logistics.vue +++ /dev/null @@ -1,23 +0,0 @@ - - - - - diff --git a/pages/index/orderDetail.vue b/pages/index/orderDetail.vue index 7f3a8f3..bc0259c 100644 --- a/pages/index/orderDetail.vue +++ b/pages/index/orderDetail.vue @@ -77,13 +77,20 @@ - - - 退货金额 - - ￥ - {{ returnAmount}} - + + + 退货金额 + + ￥ + {{ returnAmount}} + + + + 欠款抵扣 + + ￥ + {{ qkdk}} + 还款金额 @@ -102,9 +109,9 @@ 配送人员 - - + + + @@ -199,12 +206,12 @@ - + 取消订单 {{ !isReturn ? '退货' : '确认退货'}} - 回款 + 回款 @@ -248,7 +255,9 @@ isReturnPrice: 1, type: '', orderXd:[], - collection:[] + collection:[], + qkdk:0, + lbgName:[] } }, components: { @@ -258,10 +267,12 @@ returnAmount() { if (this.changeAmount) { if (this.sales.noEarn >= this.changeAmount) { - this.sales.newNoEarn = (this.sales.noEarn - this.changeAmount).toFixed(2); + this.sales.newNoEarn = (this.sales.noEarn - this.changeAmount).toFixed(2); + this.qkdk = this.changeAmount return 0 } else { - this.sales.newNoEarn = 0 + this.sales.newNoEarn = 0 + this.qkdk = this.sales.noEarn return (this.changeAmount - this.sales.noEarn).toFixed(2) } } @@ -300,6 +311,9 @@ return 0 } } + }, + onShow(){ + this.lbgName = JSON.parse(JSON.stringify(this.lbgName)) }, onLoad(option) { if (option.id != null && option.id != undefined && option.id != "") { @@ -423,6 +437,12 @@ }); } } + }, + //发货方式选择 + goPopleList(popleType) { + uni.navigateTo({ + url: '/pages/index/peopleList?popleType=' + popleType + }) }, getReturnOrder(id) { this.tui.request("/app/return/list", "post", { @@ -446,29 +466,23 @@ }).catch((res) => {}) }, checkBoxChange() { - if (this.radio1 == 0 && this.orderByWorkerList.length == 0) { - this.transCompanyInput() + if (this.radio1 == 1) { + this.lbgName = [] } }, - transCompanyInput() { - this.tui.request("/worker/getWXByCondition", "post", {}, false, false).then((res) => { - if (res.code == 200) { - this.orderByWorkerList = res.result; - this.orderByWorkerCandidates = res.result.map(item => { - return item.workerName - }) - } else { - this.tui.toast(res.message) - } - }) - }, open() { this.popupShow = true }, close() { this.popupShow = false }, - sureReturn() { + sureReturn() { + if(this.radio1 == 0){ + if(this.lbgName == []){ + this.tui.toast("请选择配送人员") + return; + } + } this.list.forEach(item1 => { item1.stockLogList1.forEach(item2 => { if (item2.returnCount) { @@ -479,14 +493,6 @@ }) }) - let worderId = '' - if (this.orderByWorker) { - for (let key in this.orderByWorkerList) { - if (this.orderByWorker == this.orderByWorkerList[key].workerName) { - worderId = this.orderByWorkerList[key].workerId - } - } - } this.sales.noEarn = this.sales.newNoEarn; this.sales.saleId = this.sales.id; this.sales.totalAomount = this.returnAmount; @@ -494,7 +500,7 @@ returnSale: this.sales, returnSaleDetailList: this.list, transCompany: this.radio1 == 0 ? '99999999' : '', - orderByWorker: worderId, + orderByWorker: this.lbgName.workerId, isReturnPrice: 1 }, false, false).then((res) => { uni.showToast({ diff --git a/pages/index/peopleList.vue b/pages/index/peopleList.vue index a296f24..4ee95ea 100644 --- a/pages/index/peopleList.vue +++ b/pages/index/peopleList.vue @@ -26,29 +26,32 @@ - + {{item.companyName}} {{item.workerName}} 拨打电话 - + 收费标准 + + + 本单返佣2元 - + 收费标准 - {{item.remark}} + {{remark}} @@ -66,7 +69,8 @@ people: '', //快递、物流、发车的id radioType: '', //选择的是快递还是物流 companyType: '', //运输公司类型 快递公司有值 物流公司直接传空 - modelShow:false + modelShow:false, + remark:'' } }, onShow(){ @@ -176,8 +180,9 @@ }) }, //打开弹出层 - toggle(type) { - this.type = type + toggle(type,remark) { + this.type = type + this.remark = remark this.$refs.popup.open(type) }, //关闭弹出层 diff --git a/pages/index/searchData.vue b/pages/index/searchData.vue deleted file mode 100644 index 6c37880..0000000 --- a/pages/index/searchData.vue +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/pages/index/shareStyle.vue b/pages/index/shareStyle.vue index 194832d..cdd2650 100644 --- a/pages/index/shareStyle.vue +++ b/pages/index/shareStyle.vue @@ -176,7 +176,7 @@ getShareList(id) { this.tui.request("/app/product/getShareList", "POST", { categoryId: this.categoryId, - supplierName: this.searchName, + searchStr: this.searchName, pageNum: this.pageNum, pageSize: '100' }, false, false).then((res) => { diff --git a/pages/index/waitStorageDetail.vue b/pages/index/waitStorageDetail.vue index a1516f9..49349c5 100644 --- a/pages/index/waitStorageDetail.vue +++ b/pages/index/waitStorageDetail.vue @@ -11,7 +11,7 @@ 品名：{{item.productName == null ?'暂无':item.productName}} 货号：{{item.productSn == null ?'暂无':item.productSn}} - 总价：{{item.price == null ?'暂无':item.price}} 数量：{{item.productCount == null ?'暂无':item.productCount}} + 单价：{{item.purchasePrice == null ?'暂无':item.purchasePrice}} 数量：{{item.productCount == null ?'暂无':item.productCount}} 总价：{{item.price == null ?'暂无':item.price}} @@ -22,7 +22,7 @@ {{items.attributeList | sliceMsg}} - 数量：{{items.productCount == null ?'暂无':item.productCount}} + 数量：{{items.productCount == null ?'暂无':items.productCount}} diff --git a/pages/inventory/addinventory.vue b/pages/inventory/addinventory.vue index 31e8be3..23ab956 100644 --- a/pages/inventory/addinventory.vue +++ b/pages/inventory/addinventory.vue @@ -482,15 +482,15 @@ m].attributeList, this.carList.get(carList1[i].id).stockLogList.get( carList1[i].saleDetailQueryDTO[m].attributeList) + carList1[i] .saleDetailQueryDTO[m].productCount) - this.carList.get(carList1[i].id).productCount += carList1[i].saleDetailQueryDTO[ - m].productCount + } else { //规格不同 this.carList.get(carList1[i].id).stockLogList.set(carList1[i] .saleDetailQueryDTO[ - m].attributeList, carList1[i].saleDetailQueryDTO[m].productCount) - this.carList.get(carList1[i].id).productCount += carList1[i].saleDetailQueryDTO[ - m].productCount - } + m].attributeList, carList1[i].saleDetailQueryDTO[m].productCount) + } + this.carList.get(carList1[i].id).productCount += carList1[i].saleDetailQueryDTO[ + m].productCount + that.carList.get(carList1[i].id).price = that.carList.get(carList1[i].id).productCount * that.carList.get(carList1[i].id).purchasePrice } } else { //商品不同 let obj = { @@ -662,7 +662,6 @@ this.carList.get(index).stockLogList.set(index1,e) this.carList.get(index).productCount = 0 this.carList.get(index).stockLogList.forEach(function(value, key) { - console.log(that.carList.get(index)) that.carList.get(index).productCount = that.carList.get(index).productCount + value that.carList.get(index).price = that.carList.get(index).productCount * that.carList.get(index).purchasePrice }) diff --git a/pages/inventory/changeGoods1.vue b/pages/inventory/changeGoods1.vue index b7beb50..d649c94 100644 --- a/pages/inventory/changeGoods1.vue +++ b/pages/inventory/changeGoods1.vue @@ -313,7 +313,7 @@ getShareList(id) { this.tui.request("/app/product/getShareList", "POST", { categoryId: this.categoryId, - supplierName: this.searchName, + searchStr: this.searchName, pageNum: this.pageNum, pageSize: '10' }, false, false).then((res) => { diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue index e9926f2..7fbe07a 100644 --- a/pages/inventory/goodsList1.vue +++ b/pages/inventory/goodsList1.vue @@ -62,7 +62,7 @@ - + diff --git a/pages/inventory/inventory.vue b/pages/inventory/inventory.vue index bc9a274..7f58444 100644 --- a/pages/inventory/inventory.vue +++ b/pages/inventory/inventory.vue @@ -168,7 +168,7 @@ getShareList(id) { this.tui.request("/app/product/getShareList", "POST", { categoryId: this.categoryId, - supplierName: this.searchName, + searchStr: this.searchName, pageNum: this.pageNum, pageSize: '10' }, false, false).then((res) => { diff --git a/pages/login/login.vue b/pages/login/login.vue index 3a2e4ce..cc03f04 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -78,8 +78,8 @@ export default { data() { return { - mobile: '13521030702', - username: '13521030702', + mobile: '15101147760', + username: '15101147760', code: '', password: '123456', loginWay: true, //true账号密码登录 false验证码登录 diff --git a/pages/rebate/detail.vue b/pages/rebate/detail.vue index 1bd0c86..a04708a 100644 --- a/pages/rebate/detail.vue +++ b/pages/rebate/detail.vue @@ -1,42 +1,48 @@ - + \ No newline at end of file diff --git a/pages/rebate/rebate.vue b/pages/rebate/rebate.vue index 81b4a56..5e6c092 100644 --- a/pages/rebate/rebate.vue +++ b/pages/rebate/rebate.vue @@ -1,30 +1,41 @@ @@ -32,77 +43,88 @@ export default { data() { return { - notYetCommissionList:[], - commissionList:[] + notYetCommissionList: [], + commissionList: [] }; }, - onLoad() { - this.getList() - this.getCommissionList() - }, - computed:{ - balance() { - let result = 0 - this.commissionList.forEach(value => { - result += value.commission - }) - return result - } - }, - methods:{ - onCardClick(e) { - console.log(e) - }, - getList() { - console.log('this.$store',this.$store.shopId) - this.tui.request('/app/returnCommission/listWithReturned', 'get', { - shopId:'001' - }, false, false, true).then((res) => { - if (res.code !== 200) return - this.notYetCommissionList = res.result - console.log(res) - }) - }, - getCommissionList() { - this.tui.request('/app/returnCommission/listWithNoReturn', 'get', { - shopId:'002' - }, false, false, true).then((res) => { - if (res.code !== 200) return - this.commissionList = res.result - }) - }, - goToDetail() { - uni.navigateTo({ - url:`/pages/rebate/detail` - }) - }, - goToWithdrawal() { - uni.navigateTo({ - url:`/pages/rebate/withdrawal?balance=${this.balance}` - }) - } - } + onLoad() { + this.getList() + this.getCommissionList() + }, + computed: { + balance() { + let result = 0 + this.commissionList.forEach(value => { + result += value.commission + }) + return result + } + }, + methods: { + onCardClick(e) { + console.log(e) + }, + getList() { + console.log('this.$store', this.$store.shopId) + this.tui.request('/app/returnCommission/listWithReturned', 'get', { + shopId: '001' + }, false, false, true).then((res) => { + if (res.code !== 200) return + this.notYetCommissionList = res.result + console.log(res) + }) + }, + getCommissionList() { + this.tui.request('/app/returnCommission/listWithNoReturn', 'get', { + shopId: '002' + }, false, false, true).then((res) => { + if (res.code !== 200) return + this.commissionList = res.result + }) + }, + goToDetail() { + uni.navigateTo({ + url: `/pages/rebate/detail` + }) + }, + goToWithdrawal() { + uni.navigateTo({ + url: `/pages/rebate/withdrawal?balance=${this.balance}` + }) + } + } } + .content-balance { + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + margin: 36upx; + flex: 1; + + .balance-text { + font-size: 32upx; + margin-bottom: 86upx; + } + } + + .content-actions { + display: flex; + padding-top: 50upx; + padding-bottom: 35upx; + + .u-button { + flex-basis: 40%; + } + } + .inventoryList{ + .uni-card{ + margin: 0 !important; + padding: 0 !important; + } + } + + \ No newline at end of file