确认收货

pages/management/receive-confirm.vue

@@ -363,7 +363,7 @@
 			async _receiptBillUpdate (e) {
 				try {
 					let res = await receiptBillUpdate(e)
-					if (res.code !== 1) {
+					if (res.code === 1) {
 						uni.showToast({
 							title: res.desc,
 							icon: 'none'
@@ -375,7 +375,6 @@
 			},
 			// 修改调出仓库弹窗
 			checkWarehouse (type, title, e) {
-				
 				if (type === 1) {
 					this.modalObj = {type: type, title: title, id: e.flid}
 					this.value = e.ckbm
@@ -386,6 +385,20 @@
 			},
 			// 修改调出仓库确定
 			modalConfirm () {
+				if ((this.modalObj.type === 1 || this.modalObj.type === 2) && this.value === '') {
+					uni.showToast({
+						title: '请设置收货仓库',
+						icon: 'none'
+					})
+					return
+				}
+				if (this.modalObj.type === 2 && this.val3 === '') {
+					uni.showToast({
+						title: '请设置收货库位',
+						icon: 'none'
+					})
+					return
+				}
 				let mc = ''
 				this.range.map(el => {
 					if (el.value === this.value) {
@@ -398,8 +411,8 @@
 						if (e.flid === this.modalObj.id) {
 							e.ckbm = this.value
 							e.ckmc = mc
-							let {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz} = {...e}
-							let obj = {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz}
+							let {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz, djid, djbh} = {...e}
+							let obj = {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz, djid, djbh}
 							arr.push(obj)
 						}
 					})
@@ -408,8 +421,8 @@
 						e.ckbm = this.value
 						e.ckmc = mc
 						e.kwmc = this.val3
-						let {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz} = {...e}
-						let obj = {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz}
+						let {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz, djid, djbh} = {...e}
+						let obj = {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz, djid, djbh}
 						arr.push(obj)
 					})
 				}