瀏覽代碼

前端gjy

gjy 3 年之前
父節點
當前提交
4ddd3a380b
共有 3 個文件被更改,包括 8 次插入6 次删除
  1. 4 3
      pageA/product/business_buy.vue
  2. 2 1
      pageA/product/detail.vue
  3. 2 2
      pages/business/business.vue

+ 4 - 3
pageA/product/business_buy.vue

@@ -230,6 +230,7 @@
 				this.purchaseOrder.settlementPrice = options.basisPrice
 				this.purchaseOrder.settlementPrice = options.basisPrice
 				this.purchaseOrder.procurementPlanType = options.procurementPlanType
 				this.purchaseOrder.procurementPlanType = options.procurementPlanType
 				this.purchaseOrder.procurementPlan=options.procurementPlan
 				this.purchaseOrder.procurementPlan=options.procurementPlan
+				this.purchaseOrder.compId=options.compId
 			},
 			},
 			computed: {
 			computed: {
 				...mapState(['hasLogin','userInfo']),
 				...mapState(['hasLogin','userInfo']),
@@ -269,15 +270,15 @@
 						this.$api.msg('出售数量输入错误')
 						this.$api.msg('出售数量输入错误')
 						return
 						return
 					}
 					}
-					if(!this.purchaseOrder.pointPrice){
+					if(this.purchaseOrder.procurementPlanType=='期货'&&!this.purchaseOrder.pointPrice){
 						this.$api.msg('点价不能为空')
 						this.$api.msg('点价不能为空')
 						return
 						return
 					}
 					}
-					if(this.purchaseOrder.pointPrice>10000){
+					if(this.purchaseOrder.procurementPlanType=='期货'&&this.purchaseOrder.pointPrice>10000){
 						this.$api.msg('点价输入错误')
 						this.$api.msg('点价输入错误')
 						return
 						return
 					}
 					}
-					if(this.purchaseOrder.pointPrice.indexOf('.')!=-1){
+					if(this.purchaseOrder.procurementPlanType=='期货'&&this.purchaseOrder.pointPrice.indexOf('.')!=-1){
 						if(this.purchaseOrder.pointPrice.split(".")[1].length>2){
 						if(this.purchaseOrder.pointPrice.split(".")[1].length>2){
 							this.$api.msg('点价输入错误')
 							this.$api.msg('点价输入错误')
 							return
 							return

+ 2 - 1
pageA/product/detail.vue

@@ -257,6 +257,7 @@
 		onShow() {
 		onShow() {
 		},
 		},
 		onLoad(options) {
 		onLoad(options) {
+			this.goods.compId=options.compId
 			const that = this
 			const that = this
 			uni.showLoading({
 			uni.showLoading({
 				title: '正在加载',
 				title: '正在加载',
@@ -399,7 +400,7 @@
 								url: `/pageA/product/business_buy?id=${this.goods.id}&receiveArea=${this.goods.receiveArea}&minimumVolume=${this.goods.minimumVolume}
 								url: `/pageA/product/business_buy?id=${this.goods.id}&receiveArea=${this.goods.receiveArea}&minimumVolume=${this.goods.minimumVolume}
 										&goodsName=${this.goods.goodsName}&receiveCity=${this.goods.receiveCity}&receivePrivate=${this.goods.receivePrivate}&buyer=${this.goods.buyer}
 										&goodsName=${this.goods.goodsName}&receiveCity=${this.goods.receiveCity}&receivePrivate=${this.goods.receivePrivate}&buyer=${this.goods.buyer}
 										&basisPrice=${this.goods.basisPrice}&unitPrice=${this.goods.unitPrice}&receiveWarehouse=${this.goods.receiveWarehouse}
 										&basisPrice=${this.goods.basisPrice}&unitPrice=${this.goods.unitPrice}&receiveWarehouse=${this.goods.receiveWarehouse}
-										&procurementPlanType=${this.goods.procurementPlanType}&procurementPlan=${this.goods.procurementPlanNo}`
+										&procurementPlanType=${this.goods.procurementPlanType}&procurementPlan=${this.goods.procurementPlanNo}&compId=${this.goods.compId}`
 							// 	url: `/pageA/product/business_buy?id=${this.goods.id}&packing=${this.goods.packing}}&province=${this.goods.province}
 							// 	url: `/pageA/product/business_buy?id=${this.goods.id}&packing=${this.goods.packing}}&province=${this.goods.province}
 							// 	&city=${this.goods.city}&area=${this.goods.area}&storeName=${this.goods.storeName}&seller=${this.goods.seller}
 							// 	&city=${this.goods.city}&area=${this.goods.area}&storeName=${this.goods.storeName}&seller=${this.goods.seller}
 							// 	&companyId=${this.goods.companyId}&sellerPhone=${this.goods.sellerPhone}&minSale=${this.goods.minSale}
 							// 	&companyId=${this.goods.companyId}&sellerPhone=${this.goods.sellerPhone}&minSale=${this.goods.minSale}

+ 2 - 2
pages/business/business.vue

@@ -259,11 +259,11 @@ currentPage:this.currentPage,searchKeyWord:this.searchKeyWord,receivePrivate:thi
 				} else {
 				} else {
 					if (this.TabCur == 0) {
 					if (this.TabCur == 0) {
 						uni.navigateTo({
 						uni.navigateTo({
-							url: `/pageA/product/detail?id=${id}`
+							url: `/pageA/product/detail?id=${id}&compId=${item.compId}`
 						})
 						})
 					} else {
 					} else {
 						uni.navigateTo({
 						uni.navigateTo({
-							url: `/pageA/product/detail_buy?id=${id}`
+							url: `/pageA/product/detail_buy?id=${id}&compId=${item.compId}`
 						})
 						})
 					}
 					}