开单会出现0 null 解决

ghsApp/src/admin/billing/index.vue

@@ -226,6 +226,24 @@ export default {
 		},
 		confirmSelectEvent() {
 			if (this.selectList.length > 0) {
+
+				//因历史遗留原因，打开花材页马上点花材出现数量0或null的情况，需要过滤 shish 20210716
+				let selectList = this.selectList;
+				let list = [];
+				console.log('过滤前',selectList)
+				for (let i=0;i<selectList.length;i++){
+					if(/(^[1-9]\d*$)/.test(selectList[i].bigCount) == false && /(^[1-9]\d*$)/.test(selectList[i].smallCount) == false){
+						continue
+					}
+					list.push(selectList[i])
+				}
+				if(list.length <= 0){
+					this.$msg("请选择花材")
+					return
+				}
+				console.log('过滤后',list)
+				this.setSelectInfoByType({ type: this.pageType, info: list });
+
 				uni.navigateTo({
 					url: "/admin/billing/affirm"
 				});

ghsApp/src/admin/home/workbench.vue

@@ -209,6 +209,11 @@ export default {
 					img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,
 					url: "/pagesStorehouse/stockWarn/manage"
 				},
+				{
+					name: "盘点",
+					img: `${this.$constant.imgUrl}/ghs/home/pandian.png`,
+					url: "/pagesStorehouse/inventory/list"
+				},
 				{
 					name: "调拨出库",
 					img: `${this.$constant.imgUrl}/ghs/home/dbck.png`,
@@ -219,11 +224,6 @@ export default {
 					img: `${this.$constant.imgUrl}/ghs/home/dbrk.png`,
 					url: "/pagesStorehouse/allot/allotPut"
 				},
-				{
-					name: "盘点",
-					img: `${this.$constant.imgUrl}/ghs/home/pandian.png`,
-					url: "/pagesStorehouse/inventory/list"
-				},
 				{
 					name: "报损单",
 					img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`,

ghsApp/src/pagesPurchase/add.vue

@@ -292,6 +292,26 @@ export default {
 		},
 		confirmSelectEvent() {
 			if (this.selectList.length > 0) {
+
+
+				//因历史遗留原因，打开花材页马上点花材出现数量0或null的情况，需要过滤 shish 20210716
+				let selectList = this.selectList;
+				let list = [];
+				console.log('过滤前',selectList)
+				for (let i=0;i<selectList.length;i++){
+					if(/(^[1-9]\d*$)/.test(selectList[i].bigCount) == false && /(^[1-9]\d*$)/.test(selectList[i].smallCount) == false){
+						continue
+					}
+					list.push(selectList[i])
+				}
+				if(list.length <= 0){
+					this.$msg("请选择花材")
+					return
+				}
+				console.log('过滤后',list)
+				this.setSelectInfoByType({ type: this.pageType, info: list });
+
+
 				uni.navigateTo({
 					url: "/pagesPurchase/details"
 				});

ghsApp/src/pagesStorehouse/allot/exSelect.vue

@@ -278,10 +278,29 @@ export default {
 
 		confirmSelectEvent() {
 			if (this.selectList.length > 0) {
+
+
+				//因历史遗留原因，打开花材页马上点花材出现数量0或null的情况，需要过滤 shish 20210716
+				let selectList = this.selectList;
+				let list = [];
+				console.log('过滤前',selectList)
+				for (let i=0;i<selectList.length;i++){
+					if(/(^[1-9]\d*$)/.test(selectList[i].bigCount) == false && /(^[1-9]\d*$)/.test(selectList[i].smallCount) == false){
+						continue
+					}
+					list.push(selectList[i])
+				}
+				if(list.length <= 0){
+					this.$msg("请选择花材")
+					return
+				}
+				console.log('过滤后',list)
+				this.setSelectInfoByType({ type: this.pageType, info: list });
+
+
 				uni.navigateBack({
 					delta: 1
 				});
-				// this.showSubmitModel = true;
 			}
 		},
 		change(e) {

ghsApp/src/pagesStorehouse/inventory/select.vue

@@ -253,21 +253,38 @@ export default {
 			if (val.index === 0) {
 				this.cancelEvent();
 			} else {
-				// console.log(444, this.selectList);
 				uni.navigateBack({
 					delta: 1
 				});
-
 				this.cancelEvent();
 			}
 		},
 		confirmSelectEvent() {
-			this.submitEvent(1);
-			// if (this.selectList.length > 0) {
-			// 	this.showSubmitModel = true;
-			// } else {
-   //      this.$msg('请选择花材')
-   //    }
+			
+			if (this.selectList.length > 0) {
+
+				//因历史遗留原因，打开花材页马上点花材出现数量0或null的情况，需要过滤 shish 20210716
+				let selectList = this.selectList;
+				let list = [];
+				console.log('过滤前',selectList)
+				for (let i=0;i<selectList.length;i++){
+					if(/(^[1-9]\d*$)/.test(selectList[i].bigCount) == false && /(^[1-9]\d*$)/.test(selectList[i].smallCount) == false){
+						continue
+					}
+					list.push(selectList[i])
+				}
+				if(list.length <= 0){
+					this.$msg("请选择花材")
+					return
+				}
+				console.log('过滤后',list)
+				this.setSelectInfoByType({ type: this.pageType, info: list });
+
+				this.submitEvent(1);
+
+			} else {
+        		this.$msg('请选择花材')
+      		}
 		},
 		change(e) {
 			if (this.tabIndex == e.index) {

hdApp/src/admin/billing/index.vue

@@ -316,9 +316,27 @@ export default {
 		},
 		confirmSelectEvent() {
 			if (this.selectList.length > 0) {
+
+				//因历史遗留原因，打开花材页马上点花材出现数量0或null的情况，需要过滤 shish 20210716
+				let selectList = this.selectList;
+				let list = [];
+				for (let i=0;i<selectList.length;i++){
+					if(/(^[1-9]\d*$)/.test(selectList[i].bigCount) == false && /(^[1-9]\d*$)/.test(selectList[i].smallCount) == false){
+						continue
+					}
+					list.push(selectList[i])
+				}
+				if(list.length <= 0){
+					this.$msg("请选择花材")
+					return
+				}
+				console.log('list',list)
+				this.setSelectInfoByType({ type: this.pageType, info: list });
+
 				uni.navigateTo({
 					url: "/admin/billing/affirm"
 				});
+
 			} else {
 				this.$msg("请选择花材");
 			}

hdApp/src/pagesPurchase/ghsProduct.vue

@@ -407,7 +407,26 @@ export default {
 		},
 		confirmSelectEvent() {
 			if (this.selectList.length > 0) {
-        uni.removeStorageSync('selectCouponInfo')
+
+
+				//因历史遗留原因，打开花材页马上点花材出现数量0或null的情况，需要过滤 shish 20210716
+				let selectList = this.selectList;
+				let list = [];
+				for (let i=0;i<selectList.length;i++){
+					if(/(^[1-9]\d*$)/.test(selectList[i].bigCount) == false && /(^[1-9]\d*$)/.test(selectList[i].smallCount) == false){
+						continue
+					}
+					list.push(selectList[i])
+				}
+				if(list.length <= 0){
+					this.$msg("请选择花材")
+					return
+				}
+				this.setSelectInfoByType({ type: this.pageType, info: list });
+				
+
+
+        		uni.removeStorageSync('selectCouponInfo')
 				uni.navigateTo({
 					url: `/admin/billing/affirmGhs?id=${this.options.id}`
 				});