From ae1717cbbf7833930d45efef6036e3893285ae35 Mon Sep 17 00:00:00 2001 From: wangfukang <15630117759@163.com> Date: Thu, 7 Mar 2024 22:30:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/addHangOrder.vue | 8 ++++-- pages/index/downStearmList.vue | 8 +++++- pages/index/index.vue | 8 ++++-- pages/index/orderDetail.vue | 13 +++++++-- pages/index/peopleList.vue | 2 +- pages/inventory/addinventory.vue | 6 +++- pages/inventory/gategoryLow.vue | 38 +++++++++++++++++++++++++ pages/inventory/goodsList1.vue | 48 +++++++++++++++++--------------- 8 files changed, 98 insertions(+), 33 deletions(-) diff --git a/pages/index/addHangOrder.vue b/pages/index/addHangOrder.vue index 6825df4..20b8215 100644 --- a/pages/index/addHangOrder.vue +++ b/pages/index/addHangOrder.vue @@ -326,7 +326,6 @@ this.carList.push(item.saleDetailDTOList[i]) } } - this.toggle('bottom', res.result); }else{ this.tui.toast('您的店铺中暂无该商品！') } @@ -427,7 +426,12 @@ title: "请输入实际价格！", icon: 'none' }) - } else { + } else { + for (var i = 0; i < this.temporaryList.length; i++) { + if(this.temporaryList[i].productCount <= 0){ + this.tui.toast("商品数量不能为零！") + } + } let data = { discount: 10, productId: this.goodsDetail.id, diff --git a/pages/index/downStearmList.vue b/pages/index/downStearmList.vue index b1c6cf6..df41c75 100644 --- a/pages/index/downStearmList.vue +++ b/pages/index/downStearmList.vue @@ -410,7 +410,13 @@ } }, //弹窗选择规格后，点击弹窗中选好了按钮 - temporaryCheck() { + temporaryCheck() { + for (var i = 0; i < this.temporaryList.length; i++) { + if(this.temporaryList[i].productCount <= 0){ + this.tui.toast("商品数量不能为零！") + return; + } + } let data = { productId: this.goodsDetail.id, price: this.zPrice, diff --git a/pages/index/index.vue b/pages/index/index.vue index 3c3b27f..8bf6f39 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -57,7 +57,7 @@ - 退货数量 + 退货笔数 @@ -97,10 +97,10 @@ - + + diff --git a/pages/index/orderDetail.vue b/pages/index/orderDetail.vue index 13e0d15..8b21994 100644 --- a/pages/index/orderDetail.vue +++ b/pages/index/orderDetail.vue @@ -233,12 +233,12 @@ - + 取消订单 {{ !isReturn ? '退货' : '确认退货'}} - 回款 + 回款 @@ -442,7 +442,14 @@ current: this.orderXd.orderPicture }) }, - sureNpPay(e) { + sureNpPay(e) { + if(e>this.sales.noEarn){ + uni.showToast({ + title: "回款金额不应超过欠款金额！", + icon: 'none' + }) + return + } if (this.type == 'gys') { this.tui.request('/app/purchase/editPayPrice', 'post', { id: this.sales.id, diff --git a/pages/index/peopleList.vue b/pages/index/peopleList.vue index 4b3fa0b..5ce7c1c 100644 --- a/pages/index/peopleList.vue +++ b/pages/index/peopleList.vue @@ -333,7 +333,7 @@ font-size: 32rpx; margin: 20rpx auto 0; width: 95%; - padding-left: 10rpx; + padding-left: 30rpx; position: relative; } diff --git a/pages/inventory/addinventory.vue b/pages/inventory/addinventory.vue index ae97c04..54246b1 100644 --- a/pages/inventory/addinventory.vue +++ b/pages/inventory/addinventory.vue @@ -624,7 +624,11 @@ } let purchaseDetails = []; this.carList.forEach(function(value, key) { - value.stockLogList.forEach(function(values, keys) { + value.stockLogList.forEach(function(values, keys) { + if(values <= 0){ + that.tui.toast("入库数量不能为零！") + return; + } let obj = { productCount: values, attributeList: keys diff --git a/pages/inventory/gategoryLow.vue b/pages/inventory/gategoryLow.vue index a16f25d..b3da555 100644 --- a/pages/inventory/gategoryLow.vue +++ b/pages/inventory/gategoryLow.vue @@ -67,6 +67,42 @@ + + + + + 提示 + + {{goodsList[0].productName}}商品有以下库存，确认继续删除吗？ + + + + 商品规格 + 数量 + + + + + {{item.attributeList | sliceMsg}} + + + {{item.stockCount}} + + + + + + + + 再想想 + + + 确认删除 + + + @@ -241,6 +277,8 @@ this.dialogTit = '输入分类名' } else if(type == 'attrAdd') { this.dialogTit = '输入属性名' + // this.$refs.addPopup.open() + // return; } else if(type == 'attrValAdd') { this.dialogTit = '输入属性值' } diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue index b96a71e..8fb5060 100644 --- a/pages/inventory/goodsList1.vue +++ b/pages/inventory/goodsList1.vue @@ -1068,7 +1068,8 @@ }) }, //点击底部开单按钮 - goSell() { + goSell() { + let that = this; if (this.khName == '') { this.tui.toast('请选择客户！') return @@ -1139,8 +1140,11 @@ } let purchaseDetails = []; this.carList.forEach(function(value, key) { - - value.stockLogList.forEach(function(values, keys) { + value.stockLogList.forEach(function(values, keys) { + if(values <= 0){ + that.tui.toast("商品数量不能为零！") + return; + } let obj = { productCount: values, attributeList: keys @@ -1153,25 +1157,25 @@ this.saleDetailList = purchaseDetails; obj.saleDetailList = purchaseDetails; let url = '' - if (this.saleId != '') { - url = '/app/sale/shareToBuyNew' - } else { - url = '/app/sale/buyNew' - } - this.tui.request(url, "post", obj, false, false).then((res) => { - if (res.code == 200) { - uni.showToast({ - title: "开单成功", - icon: 'none' - }) - setTimeout(res => { - this.$refs.printerPopup.open('center') - }, 1000) - - } else { - this.tui.toast(res.message) - } - }) + // if (this.saleId != '') { + // url = '/app/sale/shareToBuyNew' + // } else { + // url = '/app/sale/buyNew' + // } + // this.tui.request(url, "post", obj, false, false).then((res) => { + // if (res.code == 200) { + // uni.showToast({ + // title: "开单成功", + // icon: 'none' + // }) + // setTimeout(res => { + // this.$refs.printerPopup.open('center') + // }, 1000) + + // } else { + // this.tui.toast(res.message) + // } + // }) }, //打印取消按钮