开发环境

ghsApp/src/admin/billing/index.vue

@@ -155,33 +155,50 @@ export default {
 		modalCancel() {
 			this.isModel = false;
 			this.customData = {};
-		}, // 取消 确认
+		},
+		// 取消 确认
 		affirm(val) {
-				if(this.customData.bigCount==0 && this.customData.smallCount==0){
-					this.delAllEvent(this.customData)}
+
 				if (val.index === 0) {
+					this.delAllEvent(this.customData)
 					this.modalCancel();
-				} else {
-					const { bigCount,smallCount,bigNum,bigUnit,smallNum,smallUnit,ratio} = this.customData;
-					const ratioNum = Number(ratio);
-					//超过库存时 设置为库存最大值 1
-					if (Number(bigCount) * ratioNum + Number(smallCount) > Number(bigNum) * ratioNum + Number(smallNum)) {
-						uni.showToast({
-							// title: `库存只有${bigNum}${bigUnit}${smallNum}${smallUnit}`,
-							title: '库存不足',
-							icon: "none"
-						});
-						this.customData.bigCount = 0;
-						this.customData.smallCount = 0;
-						this.delAllEvent(this.customData)
-					} else {
-						this.updateItemEvent(this.customData);
-						this.modalCancel();
-					}
-					// this.updateItemEvent(this.customData);
-					// this.modalCancel();
+					return false
+				}
+
+				if(this.customData.bigCount==null && this.customData.smallCount==null){
+					this.delAllEvent(this.customData)
+					uni.showToast({title: '请填写数量',icon: "none"})
+					return false
 				}
 
+				if(this.customData.bigCount==0 && this.customData.smallCount==0){
+					this.delAllEvent(this.customData)
+					uni.showToast({title: '请填写数量',icon: "none"})
+					return false
+				}
+				if(this.customData.bigCount<0 || this.customData.smallCount<0){
+					this.delAllEvent(this.customData)
+					uni.showToast({title: '数量填写错误',icon: "none"})
+					return false
+				}
+				 
+				const { bigCount,smallCount,bigNum,bigUnit,smallNum,smallUnit,ratio} = this.customData;
+				const ratioNum = Number(ratio);
+				//超过库存时 设置为库存最大值 1
+				if (Number(bigCount) * ratioNum + Number(smallCount) > Number(bigNum) * ratioNum + Number(smallNum)) {
+					uni.showToast({
+						title: '库存不足',
+						icon: "none"
+					});
+					this.customData.bigCount = 0;
+					this.customData.smallCount = 0;
+					this.delAllEvent(this.customData)
+				} else {
+					this.updateItemEvent(this.customData);
+					this.modalCancel();
+				}
+				// this.updateItemEvent(this.customData);
+				// this.modalCancel();
 
 		},
 		cancelEvent() {

ghsApp/src/components/module/app-commodity.vue

@@ -218,19 +218,24 @@ export default {
 
 		},
 		customNum() {
-			// if(!this.info.bigCount){
 			if(this.offVerifyRepertory){
-				if(this.info.stock<=0){uni.showToast({title:'库存不足',icon:'none'});return;}
+				if(this.info.stock<=0){
+					uni.showToast({title:'库存不足',icon:'none'})
+					return;
+				}
 			}
 
 			if(!this.bigCount && !this.smallCount){
+				
 				let params = {
 					...this.info,
 					bigCount: this.bigCount,
 					smallCount: this.smallCount
 				};
+
 				this.$emit("addOneEvent", this.info,params);
 			}
+			
 			this.$emit("customNum", {
 				...this.info,
 				bigCount: this.bigCount,

ghsApp/src/mixins/product.js

@@ -386,9 +386,8 @@ export default {
 		},
 
 		addCustomNumEvent(item,params1,type) {
-			const list = this.selectList;
+				const list = this.selectList;
 
-			// if (!has) {}
 				let info = { classId: item.classId, id: item.id };
 
 				const classInfo =
@@ -414,10 +413,10 @@ export default {
 				if(type!='noAdd'){
 					this.setSelectInfoByType({ type: this.pageType, info: list });
 				}
-			this.$nextTick(()=>{
-				this.customNum(params1)
-			})
-			// this.$forceUpdate();
+				this.$nextTick(()=>{
+					this.customNum(params1)
+				})
+				// this.$forceUpdate();
 		},
 		/**
 		 * 减去商品
@@ -451,6 +450,7 @@ export default {
 			}else{
 				for (let index = 0; index < list.length; index++) {
 					const element = list[index];
+					console.log("element.id == item.id ",element.id ,item.id )
 					if (element.id == item.id ) {
 						list.splice(index, 1);
 						break;

ghsApp/src/pagesPurchase/add.vue

@@ -229,24 +229,33 @@ export default {
 				console.log('customData',this.customData);
 				console.log('val.index',val.index);
 				if (val.index === 3) {
-					this.modalCancel();
 					this.delAllEvent(this.customData);
+					this.modalCancel();
 					return
 				}
 				if(this.customData.bigCount==0 && this.customData.smallCount==0){
 					this.delAllEvent(this.customData)}
 
 				if (val.index === 0) {
+					this.delAllEvent(this.customData);
 					this.modalCancel();
 				} else {
 					if(this.customData.itemPrice<=0){
 						uni.showToast({title:"请输入总价格",icon:"none"})
 						return;
 					}
-					if(this.customData.bigCount<=0&&this.customData.smallCount<=0){
+					if(this.customData.bigCount==0&&this.customData.smallCount==0){
+						uni.showToast({title:"请输入花材数量",icon:"none"})
+						return;
+					}
+					if(this.customData.bigCount==null&&this.customData.smallCount==null){
 						uni.showToast({title:"请输入花材数量",icon:"none"})
 						return;
 					}
+					if(this.customData.bigCount<0 || this.customData.smallCount<0){
+						uni.showToast({title:"数量输入错误",icon:"none"})
+						return;
+					}
 					if(this.customData.realityWeight<=0){
 						uni.showToast({title:"请输入花材重量",icon:"none"})
 						return;

ghsApp/src/pagesStorehouse/allot/exSelect.vue

@@ -201,35 +201,47 @@ export default {
 			this.isFocus = false;
 			this.isFocusOne = false;
 			this.$nextTick(()=>{
-				if(this.customData.bigCount==0 && this.customData.smallCount==0){
-					this.delAllEvent(this.customData)}
+				//取消操作
 				if (val.index === 0) {
-					this.modalCancel();
-				} else {
-					this.updateItemEvent(this.customData);
-					this.modalCancel();
-					// const {
-					// 	bigCount,
-					// 	smallCount,
-					// 	bigNum,
-					// 	bigUnit,
-					// 	smallNum,
-					// 	smallUnit,
-					// 	ratio
-					// } = this.customData;
-					// const ratioNum = Number(ratio);
-					//
-					// //超过库存时 设置为库存最大值
-					// if (Number(bigCount) * ratioNum + Number(smallCount) > Number(bigNum) * ratioNum + Number(smallNum)) {
-					// 	uni.showToast({title: `库存只有${bigNum}${bigUnit}${smallNum}${smallUnit}`,icon: "none"});
-					// 	this.customData.bigCount = 0;
-					// 	this.customData.smallCount = 0;
-					// 	this.delAllEvent(this.customData)
-					// } else {
-					// 	this.updateItemEvent(this.customData);
-					// 	this.modalCancel();
-					// }
+					this.delAllEvent(this.customData)
+					this.modalCancel()
+					return false
+				}
+				if(this.customData.bigCount==0 && this.customData.smallCount==0){
+					uni.showToast({title:"请输入花材数量",icon:"none"})
+					return
+				}
+				if(this.customData.bigCount==null && this.customData.smallCount==null){
+					uni.showToast({title:"请输入花材数量",icon:"none"})
+					return
+				}
+				if(this.customData.bigCount<0 || this.customData.smallCount<0){
+					uni.showToast({title:"请输入花材数量",icon:"none"})
+					return
 				}
+				this.updateItemEvent(this.customData);
+				this.modalCancel();
+				// const {
+				// 	bigCount,
+				// 	smallCount,
+				// 	bigNum,
+				// 	bigUnit,
+				// 	smallNum,
+				// 	smallUnit,
+				// 	ratio
+				// } = this.customData;
+				// const ratioNum = Number(ratio);
+				//
+				// //超过库存时 设置为库存最大值
+				// if (Number(bigCount) * ratioNum + Number(smallCount) > Number(bigNum) * ratioNum + Number(smallNum)) {
+				// 	uni.showToast({title: `库存只有${bigNum}${bigUnit}${smallNum}${smallUnit}`,icon: "none"});
+				// 	this.customData.bigCount = 0;
+				// 	this.customData.smallCount = 0;
+				// 	this.delAllEvent(this.customData)
+				// } else {
+				// 	this.updateItemEvent(this.customData);
+				// 	this.modalCancel();
+				// }
 			})
 
 		},

ghsApp/src/pagesStorehouse/inventory/select.vue

@@ -204,14 +204,26 @@ export default {
 			this.isFocus = false;
 			this.isFocusOne = false;
 			this.$nextTick(()=>{
-				if(this.customData.bigCount==0 && this.customData.smallCount==0){
-					this.delAllEvent(this.customData)}
 				if (val.index === 0) {
+					this.delAllEvent(this.customData)
 					this.modalCancel();
-				} else {
-					this.updateItemEvent(this.customData);
-					this.modalCancel();
+					return;
+				}
+				if(this.customData.bigCount==0 && this.customData.smallCount==0){
+					uni.showToast({title:"请输入花材数量",icon:"none"})
+					return;
+				}
+				if(this.customData.bigCount==null && this.customData.smallCount==null){
+					uni.showToast({title:"请输入花材数量",icon:"none"})
+					return;
+				}
+				if(this.customData.bigCount<0 || this.customData.smallCount<0){
+					uni.showToast({title:"数量输入错误",icon:"none"})
+					return;
 				}
+				this.updateItemEvent(this.customData);
+				this.modalCancel();
+				
 			})
 
 		},

hdApp/src/admin/billing/index.vue

@@ -254,14 +254,31 @@ export default {
 			this.isFocus = false;
 			this.isFocusOne = false;
 			this.$nextTick(()=>{
-				if(this.customData.bigCount==0 && this.customData.smallCount==0){
-					this.delAllEvent(this.customData)}
+
 				if (val.index === 0) {
+					this.delAllEvent(this.customData)
 					this.modalCancel();
-				} else {
-					this.updateItemEvent(this.customData);
-					this.modalCancel();
+					return false;
+				}
+
+				if(this.customData.bigCount==0 && this.customData.smallCount==0){
+					uni.showToast({title: '请填写花材数量',icon: "none"})
+					return
 				}
+
+				if(this.customData.bigCount==null && this.customData.smallCount==null){
+					uni.showToast({title: '请填写花材数量',icon: "none"})
+					return
+				}
+
+				if(this.customData.bigCount<0 || this.customData.smallCount<0){
+					uni.showToast({title: '数量填写错误',icon: "none"})
+					return
+				}
+
+				this.updateItemEvent(this.customData);
+				this.modalCancel();
+				
 			})
 
 		},

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -331,28 +331,41 @@ export default {
 			this.isFocus = false;
 			this.isFocusOne = false;
 			this.$nextTick(()=>{
-				if(this.customData.bigCount==0 && this.customData.smallCount==0){
-					this.delAllEvent(this.customData)}
+
 				if (val.index === 0) {
+					this.delAllEvent(this.customData)
 					this.modalCancel();
+					return false
+				}
+				if(this.customData.bigCount==0 && this.customData.smallCount==0){
+					uni.showToast({title: '请填写花材数量',icon: "none"})
+					return
+				}
+				if(this.customData.bigCount==null && this.customData.smallCount==null){
+					uni.showToast({title: '请填写花材数量',icon: "none"})
+					return
+				}
+				if(this.customData.bigCount<0 || this.customData.smallCount<0){
+					uni.showToast({title: '数量填写错误',icon: "none"})
+					return
+				}
+
+				const { bigCount,smallCount,bigNum,bigUnit,smallNum,smallUnit,ratio} = this.customData;
+				const ratioNum = Number(ratio);
+				//超过库存时 设置为库存最大值 1
+				if (Number(bigCount) * ratioNum + Number(smallCount) > Number(bigNum) * ratioNum + Number(smallNum)) {
+					uni.showToast({
+						title: '库存不足',
+						icon: "none"
+					});
+					this.customData.bigCount = 0;
+					this.customData.smallCount = 0;
+					this.delAllEvent(this.customData)
 				} else {
-					const { bigCount,smallCount,bigNum,bigUnit,smallNum,smallUnit,ratio} = this.customData;
-					const ratioNum = Number(ratio);
-					//超过库存时 设置为库存最大值 1
-					if (Number(bigCount) * ratioNum + Number(smallCount) > Number(bigNum) * ratioNum + Number(smallNum)) {
-						uni.showToast({
-							// title: `库存只有${bigNum}${bigUnit}${smallNum}${smallUnit}`,
-							title: '库存不足',
-							icon: "none"
-						});
-						this.customData.bigCount = 0;
-						this.customData.smallCount = 0;
-						this.delAllEvent(this.customData)
-					} else {
-						this.updateItemEvent(this.customData);
-						this.modalCancel();
-					}
+					this.updateItemEvent(this.customData);
+					this.modalCancel();
 				}
+				
 			})
 
 		},