修改bug

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,

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,

pages/index/index.vue

@@ -57,7 +57,7 @@
 					</u-grid-item>
 					<u-grid-item>
 						<u-count-to :start-val="0" :end-val="shopInfo.returnTotalCount"></u-count-to>
-						<view class="grid-text">退货数量</view>
+						<view class="grid-text">退货笔数</view>
 					</u-grid-item>
 				</u-grid>
 			</view>
@@ -97,10 +97,10 @@
 			<u-popup :show="settingShow" @close="settingShow = false" closeOnClickOverlay mode="left" safeAreaInsetTop
 				safeAreaInsetTop>
 				<view class="popup-content">
-					<view class="content-avatar">
+					<!-- <view class="content-avatar">
 						<u-avatar :src="avatar"></u-avatar>
 						<view class="shop-name">{{ shopName }}</view>
-					</view>
+					</view> -->
 					<view style="z-index:999">
 						<u-cell-group>
 							<u-cell icon="grid-fill" url="/pages/index/checkShop" title="切换当前店铺" clickable isLink
@@ -112,6 +112,8 @@
 								clickable isLink arrow-direction="left"></u-cell>
 							<u-cell icon="man-add-fill" url="/pages/index/waitStorage?inStorageStatus=1" title="采购单历史" clickable isLink
 								arrow-direction="left"></u-cell>
+							<u-cell icon="man-add-fill" url="/pages/index/goodsStock" title="盘点管理" clickable isLink
+								arrow-direction="left"></u-cell>
 							<view class="border-line"></view>
 							<u-cell icon="account-fill" url="/pages/index/peopleList?popleType=khName" title="客户管理"
 										clickable isLink arrow-direction="left"></u-cell>

pages/index/orderDetail.vue

@@ -233,12 +233,12 @@
 			</view>
 		</u-popup>
 		<view class="tui-tabbar">
-			<view class="tui-btn-mr" v-if="sales.status != 6">
+			<view class="tui-btn-mr" v-if="sales.status != 6 && sales.status != 2">
 				<kk-printer ref="kkprinter" :bufferData="bufferData" @onPrint="onPrint"></kk-printer>
 			</view>
 			<view class="tui-btn-mr" v-if="sales.status == 0 || sales.status == 1" @click="cancelOrder">取消订单</view>
 			<view class="tui-btn-mr" v-if="sales.status == 4" @click="returnGoods">{{ !isReturn ? '退货' : '确认退货'}}</view>
-			<view class="tui-btn-mr" @tap="inputDialogToggle()" v-if="sales.status != 6 && !editNoPrice">回款</view>
+			<view class="tui-btn-mr" @tap="inputDialogToggle()" v-if="sales.status != 6 && !editNoPrice && sales.status != 2">回款</view>
 		</view>
 		<!-- 回款金额输入框 -->
 		<uni-popup ref="inputDialog" type="dialog">
@@ -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,

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;
 	}
 

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

pages/inventory/gategoryLow.vue

@@ -67,6 +67,42 @@
 					</view>
 				</view>
 			</view>
+		</uni-popup>
+		<!-- 查看商品库存弹出层 -->
+		<uni-popup ref="addPopup" background-color="#fff">
+			<view class="popup-content" style="height:auto !important;">
+				<view style="font-size: 36rpx;font-weight: bold;text-align: center;">提示</view>
+				<view v-if="goodsList !=''"
+					style="width:100%;font-weight:bold;text-align: center;font-size: 28rpx;margin: 20rpx 0;">
+					{{goodsList[0].productName}}商品有以下库存，确认继续删除吗？
+				</view>
+				<view class="tui-order-item boxbg">
+					<view style="display: flex;border-bottom: 1px solid #eee;height: 50rpx;line-height: 50rpx;">
+						<view style="width: 70%;text-align: center;border-right: 1px solid #eee;">商品规格</view>
+						<view style="width: 29%;text-align: center;">数量</view>
+					</view>
+					<view class="shop-box" v-for="(item,index) in goodsList" :key="index" style="position: relative;">
+						<view style='height: 50rpx;line-height: 50rpx;'>
+							<view style="width: 70%;text-align: center;border-right: 1px solid #eee;float: left;height: 50rpx;overflow: hidden;">
+								{{item.attributeList | sliceMsg}}
+							</view>
+							<view style="width: 29%;text-align: center;float: left;">
+								{{item.stockCount}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- <u-loadmore :status="status" /> -->
+				<view class="popup-bottom">
+					<view class="popup-bottom-left">
+						<view class="bottom-btn" @tap="this.$refs.addPopup.close()"
+							style="background: linear-gradient(90deg, #FF9797, #FFC1E0);">再想想</view>
+					</view>
+					<view class="popup-bottom-right">
+						<view class="bottom-btn" @tap="this.show = true">确认删除</view>
+					</view>
+				</view>
+			</view>
 		</uni-popup>
 	</view>
 
@@ -241,6 +277,8 @@
 						this.dialogTit = '输入分类名'
 					} else if(type == 'attrAdd') {
 						this.dialogTit = '输入属性名'
+						// this.$refs.addPopup.open()
+						// return;
 					} else if(type == 'attrValAdd') {
 						this.dialogTit = '输入属性值'
 					}

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 != '') {
+				// if (this.saleId != '') {
-					url = '/app/sale/shareToBuyNew'
+				// 	url = '/app/sale/shareToBuyNew'
-				} else {
+				// } else {
-					url = '/app/sale/buyNew'
+				// 	url = '/app/sale/buyNew'
-				}
+				// }
-				this.tui.request(url, "post", obj, false, false).then((res) => {
+				// this.tui.request(url, "post", obj, false, false).then((res) => {
-					if (res.code == 200) {
+				// 	if (res.code == 200) {
-						uni.showToast({
+				// 		uni.showToast({
-							title: "开单成功",
+				// 			title: "开单成功",
-							icon: 'none'
+				// 			icon: 'none'
-						})
+				// 		})
-						setTimeout(res => {
+				// 		setTimeout(res => {
-							this.$refs.printerPopup.open('center')
+				// 			this.$refs.printerPopup.open('center')
-						}, 1000)
+				// 		}, 1000)
-
+
-					} else {
+				// 	} else {
-						this.tui.toast(res.message)
+				// 		this.tui.toast(res.message)
-					}
+				// 	}
-				})
+				// })
 
 			},
 			//打印取消按钮