Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/erp/warehousing/warehousing.vue

@@ -489,7 +489,8 @@
 								for (let i = 0; i < res.data.data.length; i++) {
 								 // "MYCGYMHLJ2021102401"
 									if (res.data.data[i].contractNo == this.detailData
-										.contractNo) { //如果查到该合同
+										.contractNo) { 
+											uni.setStorageSync('erpContractNo',res.data.data[i])//如果查到该合同
 										if (res.data.data[i].inOutType == '采购入库') {
 											if (res.data.data[i].unitContractPrice) {
 												this.detailData.tips = '卖方' + res.data.data[i].seller +
@@ -528,6 +529,7 @@
 				this.detailData.inOutTaskNo = this.inOutNoList[e[0]].inOutTaskNo
 				this.detailData.agent = this.inOutNoList[e[0]].agent
 				if (this.inOutNoList[e[0]].contractNo) {
+					uni.setStorageSync('erpContractNo',this.inOutNoList[e[0]])
 					this.detailData.contractNo = this.inOutNoList[e[0]].contractNo
 				} else {
 					this.detailData.contractNo = this.inOutNoList[e[0]].moveTaskNo
@@ -672,6 +674,9 @@
 				}
 			},
 			calculate() {
+				const query = uni.createSelectorQuery().in(this);
+				                        query.selectAll('.left')
+										console.log(query)
 				this.netWeight = (this.detailData.grossWeight - this.detailData.tare - this.detailData.deductionWeight)
 					.toFixed(2)
 			},
@@ -728,6 +733,7 @@
 				this.isEditYF = false
 			},
 			submit(num) {
+				console.log(this.detailData)
 				if (!this.detailData.inOutTaskNo) {
 					this.$api.msg('暂无入库任务')
 					return
@@ -899,9 +905,9 @@
 					this.$api.msg('请上传磅单')
 					return
 				}
-				if(!this.detailData.cost){
-					this.detailData.cost=0
-				}
+				// if(!this.detailData.cost){
+				// 	this.detailData.cost=0
+				// }
 				// if (!this.detailData.cost && num == 2) {
 				// 	this.$api.msg('未获取到成本，请编辑后提交')
 				// 	return