loading调整

manifest.json

@@ -2,8 +2,8 @@
     "name" : "干巷仓库APP",
     "appid" : "__UNI__A67E78B",
     "description" : "",
-    "versionName" : "2.2.1",
+    "versionName" : "2.2.3",
-    "versionCode" : 221,
+    "versionCode" : 223,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

pages/consolidation/consolidation.vue

@@ -225,6 +225,7 @@ export default {
 				createBy: 'admin',
 				secondNum: this.secondNum || 0
 			};
+			uni.$u.throttle(()=>{
 				GoodsActionApi.doConsolidationGoods(data).then((res) => {
 					if (res.code === 200) {
 						uni.showModal({
@@ -245,6 +246,7 @@ export default {
 						this.loading = false;
 					}
 				});
+			},5000)
 		},
 		modalCancel() {
 			this.modalShow = false;

pages/inWarehouse/inWarehouse.vue

@@ -144,7 +144,7 @@
 					this.newMaterialList = [];
 					this.loading = false;
 				} else if (type === 2) {
-					if(this.loading){
+					if (this.loading) {
 						uni.showModal({
 							title: '提示',
 							content: '请等待加载完成!',
@@ -184,9 +184,9 @@
 						isStrict: this.isStrict
 					};
 					this.loading = true;
-					setTimeout(()=>{
+					setTimeout(() => {
 						this.loading = false;
-					},10000)
+					}, 10000)
 					WarehoseApi.checkWarehousing(checkData).then((res) => {
 						if (res.code === 200 && res.data) {
 							this.newMaterialList.push(data);
@@ -269,9 +269,9 @@
 					return;
 				}
 				this.loading = true;
-				setTimeout(()=>{
+				setTimeout(() => {
 					this.loading = false;
-				},30000)
+				}, 30000)
 				uni.showModal({
 					title: '入库操作',
 					content: '是否确认入库?',
@@ -288,10 +288,10 @@
 								location: this.warehouseInfo.location,
 								packagelist: list
 							};
-							uni.$u.throttle(()=>{
+							uni.$u.throttle(() => {
 								WarehoseApi.handlerIntoProductWarehouse(data).then((res) => {
 									if (res.code === 200) {
-										if (!res.data) {
+										if (res.data === 0 || !res.data) {
 											uni.showModal({
 												title: '提示',
 												content: '入库失败：' + res.msg,
@@ -303,12 +303,14 @@
 										}
 										uni.showToast({
 											icon: 'success',
-											title: '入库成功！'
+											title: '入库成功！' + res.msg
 										});
 										this.loading = false;
-										this.oldMaterialList = JSON.parse(JSON.stringify(this.clearData
+										this.oldMaterialList = JSON.parse(JSON.stringify(this
+											.clearData
 											.oldMaterialList));
-										this.newMaterialList = JSON.parse(JSON.stringify(this.clearData
+										this.newMaterialList = JSON.parse(JSON.stringify(this
+											.clearData
 											.newMaterialList));
 										// this.clear();
 									} else {
@@ -319,8 +321,10 @@
 										this.loading = false;
 									}
 								});
-							},5000)
+							}, 5000)
 
+						} else {
+							this.loading = false;
 						}
 					}
 				});

pages/outWarehouse/outWarehouse.vue

@@ -408,6 +408,7 @@
 							}
 							uni.$u.throttle(() => {
 								WarehoseApi.doMaterialOut(data).then((res) => {
+									
 									if (res.code !== 200) {
 										uni.showModal({
 											title: '提示',

pages/unpacking/unpacking.vue

@@ -200,6 +200,7 @@
 					createBy: "admin",
 					firstNum: this.firstNum || 0
 				};
+				uni.$u.throttle(()=>{
 					GoodsActionApi.doUnpackingGoods(data).then((res) => {
 						if (res.code === 200) {
 							uni.showModal({
@@ -220,6 +221,8 @@
 							this.loading = false;
 						}
 					});
+				},5000)
+				
 			},
 			modalCancel(){
 				this.modalShow = false;