123214

pages/outWarehouse/outWarehouse.vue

@@ -131,16 +131,14 @@ export default {
 				this.outInfo = data;
 				this.newMaterialList = [];
 
-			    let  arry=[]
+				let arry = [];
 				this.columns = [];
 
 				this.outInfo.materialList.forEach((item) => {
 					arry.push(item.partnumber);
-					
+				});
-				})
+				this.columns.push(arry);
-				this.columns.push(arry)
+				this.material_id = this.outInfo.materialList[0].partnumber;
-				this.material_id=this.outInfo.materialList[0].partnumber
-				
 			} else if (type === 2) {
 				if (this.newMaterialList.length > 0) {
 					uni.showModal({
@@ -226,8 +224,7 @@ export default {
 					if (res.confirm) {
 						const data = {
 							shipmentNum: this.outInfo.shipmentNum,
-							patchCode: [this.newMaterialList[0].patchCode],
+							patchCode: [this.newMaterialList[0].patchCode]
-							
 						};
 						WarehoseApi.doMaterialOut(data).then((res) => {
 							if (res.code !== 200) {
@@ -238,23 +235,25 @@ export default {
 									confirmText: '确认'
 								});
 
-							if(res.data.item1=100){
+								return;
+							} else {
+								if (res.data.item1 == 100) {
 									uni.showModal({
 										title: '提示',
-									content: '此物料已经出库完成，没有可以出库的了',
+										content: '此物料已经出库完成，不可以再出库',
 										showCancel: false,
 										confirmText: '确认'
 									});
-							}else if(res.data.item2=100){
+									this.newMaterialList = [];
+								} else if (res.data.item2 == 200) {
 									uni.showModal({
 										title: '提示',
 										content: '不是此物料最早批次，无法出库',
 										showCancel: false,
 										confirmText: '确认'
 									});
-							}
+									this.newMaterialList = [];
-								return;
+								} else {
-							}
 									uni.showModal({
 										title: '提示',
 										content: '出库成功',
@@ -262,6 +261,8 @@ export default {
 										confirmText: '确认'
 									});
 									this.newMaterialList = [];
+								}
+							}
 						});
 					}
 				}