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

pageA/product/business_buy.vue

@@ -1,447 +1,475 @@
 <template>
 	<view class="center">
 		<view class="transaction">
-			
-		
-		<view  class="c-row b-b">
-			<view class="title">卖方</view>
-			<view class="con-list">
-				<view v-if='goods.customerTypeFlag==2' class="title" @click="liang">{{purchaseOrder.compName?purchaseOrder.compName:goods.compName}}&nbsp></view>
-				<view v-else class="title" @click="liang">{{purchaseOrder.customer?purchaseOrder.customer:goods.customerName}}></view>
+
+
+			<view class="c-row b-b">
+				<view class="title">卖方</view>
+				<view class="con-list">
+					<view v-if='goods.customerTypeFlag==2' class="title" @click="liang">
+						{{purchaseOrder.compName?purchaseOrder.compName:goods.compName}}&nbsp>
+					</view>
+					<view v-else class="title" @click="liang">
+						{{purchaseOrder.customer?purchaseOrder.customer:goods.customerName}}>
+					</view>
+				</view>
 			</view>
-		</view>
-		<view  class="c-row">
-			<view class="title">买方</view>
-			<view class="con-list">
-			<view class="title">{{purchaseOrder.buyer}}</view>
+			<view class="c-row">
+				<view class="title">买方</view>
+				<view class="con-list">
+					<view class="title">{{purchaseOrder.buyer}}</view>
+				</view>
 			</view>
 		</view>
-		</view>
 		<view class="transaction">
-		<view   class="c-row b-b margin-top">
-			<view class="title">收货地区</view>
-			<view class="con-list">
-				<view class="title">{{purchaseOrder.receivePrivate}}{{purchaseOrder.receiveCity}}{{purchaseOrder.receiveArea}}</view>
+			<view class="c-row b-b margin-top">
+				<view class="title">收货地区</view>
+				<view class="con-list">
+					<view class="title">
+						{{purchaseOrder.receivePrivate}}{{purchaseOrder.receiveCity}}{{purchaseOrder.receiveArea}}
+					</view>
+				</view>
 			</view>
-		</view>
-		<view   class="c-row b-b ">
-			<view class="title">收货库</view>
-			<view class="con-list">
-				<view class="title">{{purchaseOrder.receiveWarehouse}}</view>
+			<view class="c-row b-b ">
+				<view class="title">收货库</view>
+				<view class="con-list">
+					<view class="title">{{purchaseOrder.receiveWarehouse}}</view>
+				</view>
 			</view>
-		</view>
-		<view v-if='companyId!=2' class="c-row b-b">
-			<view class="title">货名</view>
-			<view class="con-list">
-			<text>{{purchaseOrder.goodsName}}</text>
+			<view v-if='companyId!=2' class="c-row b-b">
+				<view class="title">货名</view>
+				<view class="con-list">
+					<text>{{purchaseOrder.goodsName}}</text>
+				</view>
 			</view>
-		</view>
-		<view class="c-row b-b">
-			<view class="title">最小成交量（吨）</view>
-			<view class="con-list">
-			<text>{{purchaseOrder.minimumVolume}}</text>
+			<view class="c-row b-b">
+				<view class="title">最小成交量（吨）</view>
+				<view class="con-list">
+					<text>{{purchaseOrder.minimumVolume}}</text>
+				</view>
 			</view>
-		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row">
-			<view  class="title">今日基差（元/吨）</view>
-			<view class="con-list">
-				<view class="picker">
-					<text>{{purchaseOrder.basis}}</text>
+			<view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row">
+				<view class="title">今日基差（元/吨）</view>
+				<view class="con-list">
+					<view class="picker">
+						<text>{{purchaseOrder.basis}}</text>
+					</view>
 				</view>
+			</view>
+
+			<view v-else class="c-row ">
+				<view class="title">采购单价（元/吨）</view>
+				<view class="con-list">
+					<view class="picker">
+						<text>{{purchaseOrder.procurementPrice}}</text>
+					</view>
 				</view>
+			</view>
 		</view>
-	
-		<view v-else class="c-row ">
-			<view   class="title">采购单价（元/吨）</view>
-			<view class="con-list">
-				<view class="picker">
-					<text>{{purchaseOrder.procurementPrice}}</text>
+		<view class="transaction">
+			<view class="c-row b-b margin-top">
+				<view class="title">发票类型</view>
+				<view class="con-list">
+					<picker @change="invoiceChange" :value="invoiceIndex" :range="invoiceType">
+						<view class="picker">
+							{{invoiceIndex>-1?invoiceType[invoiceIndex]:'请选择'}}
+						</view>
+					</picker>
 				</view>
+			</view>
+			<view class="c-row b-b">
+				<view class="title">出售数量（吨）</view>
+				<view class="con-list">
+					<input v-model='purchaseOrder.transactionsNumber' type="number" placeholder="请填写出售数量"
+						placeholder-style="font-size: 12px;" name="input"></input>
 				</view>
-		</view>
-			</view >
-				<view class="transaction">
-		<view class="c-row b-b margin-top">
-			<view class="title">发票类型</view>
-			<view class="con-list">
-			<picker @change="invoiceChange" :value="invoiceIndex" :range="invoiceType">
-				<view class="picker">
-					{{invoiceIndex>-1?invoiceType[invoiceIndex]:'请选择'}}
+			</view>
+			<view class="c-row b-b">
+				<view class="title">包装方式</view>
+				<view class="con-list">
+					<picker @change="packingChange" :value="packingIndex" :range="packingType">
+						<view class="picker">
+							{{packingIndex>-1?packingType[packingIndex]:'请选择'}}
+						</view>
+					</picker>
 				</view>
-			</picker>
 			</view>
-		</view>
-		<view  class="c-row b-b">
-			<view class="title">出售数量（吨）</view>
-			<view class="con-list">
-			<input v-model='purchaseOrder.transactionsNumber' type="number" placeholder="请填写出售数量" placeholder-style="font-size: 12px;" name="input"></input>
+			<view v-if='packingIndex!=0' class=" beizhu align-start">
+				<view class="title">袋装备注</view>
+				<view>
+					<textarea maxlength="-1" v-model='purchaseOrder.baggingNotes'
+						placeholder="请填写包装规格、质量、包装物要求。例:50kg袋装、大粒、彩包" placeholder-style="font-size: 12px;"
+						class="textareas"></textarea>
+				</view>
 			</view>
-		</view>
-		<view  class="c-row b-b">
-			<view class="title">包装方式</view>
-			<view class="con-list">
-			<picker @change="packingChange" :value="packingIndex" :range="packingType">
-				<view class="picker">
-					{{packingIndex>-1?packingType[packingIndex]:'请选择'}}
+			<view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
+				<view class="title">点价（元/吨）</view>
+				<view class="con-list">
+					<input placeholder="请填写点价" name="input" type="number" placeholder-style="font-size: 12px;"
+						@input='someprice' v-model="purchaseOrder.pointPrice"></input>
 				</view>
-			</picker>
 			</view>
-		</view>
-		<view v-if='packingIndex!=0' class=" beizhu align-start">
-			<view class="title">袋装备注</view>
-			<view >
-			<textarea maxlength="-1" v-model='purchaseOrder.baggingNotes' placeholder="请填写包装规格、质量、包装物要求。例:50kg袋装、大粒、彩包" placeholder-style="font-size: 12px;" class="textareas"></textarea>
+			<view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
+				<view class="title">发票费用（元/吨）</view>
+				<view class="con-list">
+					<input disabled placeholder="请填写发票费用" name="input" @input='someprice'
+						v-model="purchaseOrder.invoiceFee"></input>
+				</view>
 			</view>
-		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
-			<view class="title">点价（元/吨）</view>
-			<view class="con-list">
-			<input placeholder="请填写点价" name="input" type="number" placeholder-style="font-size: 12px;" @input='someprice' v-model="purchaseOrder.pointPrice"></input>
+			<view v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
+				<view class="title">包装费（元/吨）</view>
+				<view class="con-list">
+					<input placeholder="请填写包装费" name="input" @input='someprice' v-model="packingFee"></input>
+					
+				</view>
 			</view>
-		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
-			<view class="title">发票费用（元/吨）</view>
-			<view class="con-list">
-			<input disabled placeholder="请填写发票费用" name="input" @input='someprice' v-model="purchaseOrder.invoiceFee"></input>
+			<view v-if="purchaseOrder.procurementPlanType=='期货'" class=" align-start ">
+				<view class="titles">结算价格</view>
+				<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
+				<text
+					style="font-size: 18px;color: #FD714F;margin-left: 25px;">￥{{purchaseOrder.settlementPrice}}</text>
+				<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
 			</view>
 		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'" class="c-row b-b align-start">
-			<view class="title">包装费（元/吨）</view>
-			<view class="con-list">
-		<input placeholder="请填写包装费" placeholder-style="font-size: 12px;" name="input" type="number" @input='someprice' v-model="purchaseOrder.packingFee"></input>
-		</view>
-		</view>
-		<view  v-if="purchaseOrder.procurementPlanType=='期货'"  class=" align-start ">
-			<view class="titles">结算价格</view>
-			<text class="textA">结算价格=点价+基差+发票费用+包装费</text>
-			<text style="font-size: 18px;color: #FD714F;margin-left: 25px;">￥{{purchaseOrder.settlementPrice}}</text>
-			<!-- <input placeholder="请填写 例:袋装XX斤/散装" name="input" @input='packingInput' v-model="purchaseOrder.settlementPrice"></input> -->
-		</view>
-		</view>
-			<button class="btn" @click="commit()">提交</button>
+		<button class="btn" @click="commit()">提交</button>
 	</view>
 </template>
 
 <script>
 	import {
-	    mapState 
+		mapState
 	} from 'vuex';
 	export default {
-			data() {
-				return {
-					tradeInfo:{
-						salebuyId:0,
-						packing:'',
-						memo:'',
-						buyer:'',
-						buyerPhone:'',
-						procurementPrice:0,
-						address:'',
-						count:0,
-						province:'',
-						area:'',
-						priceType:'',
-						invoiceType:'',
-						acceptType:'',
-						seller:'',
-						sellerPhone:'',
-						packingMoney:0,
-						type:0,
-						modalName:"",
-					},
-					purchaseOrder: {
-						invoiceFee:0,
-						packingFee:null,
-						packingType:"散装",
-						packingTypeKey:1,
-						type:'不开发票',
-						typeKey:1
-					},
-					invoiceTypeIndex:0,
-					invoiceTypeIndex1:0,
-					acceptTypeIndex:0,
-					priceTypeIndex:0,
-					bankNameIndex:0,
-					packingIndex:0,
-					invoiceIndex:0,
-					packingType: ['散粮','大袋','小袋'],
-					// invoiceType: ['不开发票', '普通发票', '增值税发票'],
-					invoiceType: ['不开发票','增值税发票'],
-					acceptType: ['第三方检验（国家检验资质）', '交收地库或港出具的检验', '现场看货','其他'],
-					priceType: ['库内价', '到库价', '到港价'],
-					priceTypeIndex1:'库内价',
-					region: [],
-					salebuyId:0,
-					memo:'',
-					buyer:'',
-					buyerPhone:'',
-					procurementPrice:0,
-					address:'',
-					count:0,
-					id:0,
-					price:'库内价',
-					invoice:'不开发票',
-					accept:'',
-					seller:'',
-					sellerPhone:'',
-					minSale:'',
-					province:'',
-					city:'',
-					area:'',
-					storeName:'',
-					exsitCount:0,
-					isFutures:'',
-					bankNameList:'',
-					Company:[],
-					goods:{},
-					companyId:'',
-					tradeCompanyId:'',
-					basis:0,
-					basisBig:0,
-					basisSmall:0,
-					invoiceMoney:0,
-					unloadingFee:0,
-					packingMoney:0,
-					packing:'散装'
-				};
-			},
-			onLoad(options) {
-				this.id=options.id
-				this.purchaseOrder.planId=options.id
-				this.purchaseOrder.seller = options.seller
-				this.purchaseOrder.goodsName = options.goodsName
-				this.purchaseOrder.receivePrivate = options.receivePrivate
-				this.purchaseOrder.receiveCity = options.receiveCity
-				this.purchaseOrder.receiveArea = options.receiveArea
-				this.purchaseOrder.minimumVolume = options.minimumVolume
-				this.purchaseOrder.buyer = options.buyer
-				this.purchaseOrder.customer = options.customerName
-				this.purchaseOrder.basis = options.basisPrice
-				this.purchaseOrder.procurementPrice = options.procurementPrice
-				this.purchaseOrder.receiveWarehouse = options.receiveWarehouse
-				this.purchaseOrder.settlementPrice = options.basisPrice
-				this.purchaseOrder.procurementPlanType = options.procurementPlanType
-				this.purchaseOrder.procurementPlan=options.procurementPlan
-				this.purchaseOrder.compId=options.compId
-			},
-			computed: {
-				...mapState(['hasLogin','userInfo']),
-			},
-			onShow() {
-				this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo',{commonId:this.userInfo.id}).then(res => {
-					if(res.data.code==200){
-						this.goods=res.data.data
-						if(this.goods.customerTypeFlag==1){
-							this.purchaseOrder.invoiceFee=-20
-							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.invoiceFee)
-						}else{
-							this.purchaseOrder.invoiceFee=0
-							this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.invoiceFee)
-						}
+		data() {
+			return {
+				tradeInfo: {
+					salebuyId: 0,
+					packing: '',
+					memo: '',
+					buyer: '',
+					buyerPhone: '',
+					procurementPrice: 0,
+					address: '',
+					count: 0,
+					province: '',
+					area: '',
+					priceType: '',
+					invoiceType: '',
+					acceptType: '',
+					seller: '',
+					sellerPhone: '',
+					packingMoney: 0,
+					type: 0,
+					modalName: "",
+				},
+				purchaseOrder: {
+					invoiceFee: 0,
+					packingFee: null,
+					packingType: "散装",
+					packingTypeKey: 1,
+					type: '不开发票',
+					typeKey: 1
+				},
+				invoiceTypeIndex: 0,
+				invoiceTypeIndex1: 0,
+				acceptTypeIndex: 0,
+				priceTypeIndex: 0,
+				bankNameIndex: 0,
+				packingIndex: 0,
+				invoiceIndex: 0,
+				packingType: ['散粮', '大袋', '小袋'],
+				// invoiceType: ['不开发票', '普通发票', '增值税发票'],
+				invoiceType: ['不开发票', '增值税发票'],
+				acceptType: ['第三方检验（国家检验资质）', '交收地库或港出具的检验', '现场看货', '其他'],
+				priceType: ['库内价', '到库价', '到港价'],
+				priceTypeIndex1: '库内价',
+				region: [],
+				salebuyId: 0,
+				memo: '',
+				buyer: '',
+				buyerPhone: '',
+				procurementPrice: 0,
+				address: '',
+				count: 0,
+				id: 0,
+				price: '库内价',
+				invoice: '不开发票',
+				accept: '',
+				seller: '',
+				sellerPhone: '',
+				minSale: '',
+				province: '',
+				city: '',
+				area: '',
+				storeName: '',
+				exsitCount: 0,
+				isFutures: '',
+				bankNameList: '',
+				Company: [],
+				goods: {},
+				companyId: '',
+				tradeCompanyId: '',
+				basis: 0,
+				basisBig: 0,
+				basisSmall: 0,
+				invoiceMoney: 0,
+				unloadingFee: 0,
+				packingMoney: 0,
+				packing: '散装',
+				packingFee: 0
+			};
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.purchaseOrder.planId = options.id
+			this.purchaseOrder.seller = options.seller
+			this.purchaseOrder.goodsName = options.goodsName
+			this.purchaseOrder.receivePrivate = options.receivePrivate
+			this.purchaseOrder.receiveCity = options.receiveCity
+			this.purchaseOrder.receiveArea = options.receiveArea
+			this.purchaseOrder.minimumVolume = options.minimumVolume
+			this.purchaseOrder.buyer = options.buyer
+			this.purchaseOrder.customer = options.customerName
+			this.purchaseOrder.basis = options.basisPrice
+			this.purchaseOrder.procurementPrice = options.procurementPrice
+			this.purchaseOrder.receiveWarehouse = options.receiveWarehouse
+			this.purchaseOrder.settlementPrice = options.basisPrice
+			this.purchaseOrder.procurementPlanType = options.procurementPlanType
+			this.purchaseOrder.procurementPlan = options.procurementPlan
+			this.purchaseOrder.compId = options.compId
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		onShow() {
+			this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo', {
+				commonId: this.userInfo.id
+			}).then(res => {
+				if (res.data.code == 200) {
+					this.goods = res.data.data
+					if (this.goods.customerTypeFlag == 1) {
+						this.purchaseOrder.invoiceFee = -20
+						this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) - Number(this
+							.purchaseOrder.invoiceFee)
+					} else {
+						this.purchaseOrder.invoiceFee = 0
+						this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) - Number(this
+							.purchaseOrder.invoiceFee)
 					}
-					uni.hideLoading()
-				})
-			},
-			methods: {
-				liang(){
-					uni.navigateTo({
-						url: `/pageA/product/Identity_switching?goodsName=${this.purchaseOrder.goodsName}
+				}
+				uni.hideLoading()
+			})
+		},
+		methods: {
+			liang() {
+				uni.navigateTo({
+					url: `/pageA/product/Identity_switching?goodsName=${this.purchaseOrder.goodsName}
 						&receivePrivate=${this.purchaseOrder.receivePrivate}&receiveCity=${this.purchaseOrder.receiveCity}
 						&receiveArea=${this.purchaseOrder.receiveArea}&minimumVolume=${this.purchaseOrder.minimumVolume}
 						&buyer=${this.purchaseOrder.buyer}&basisPrice=${this.purchaseOrder.basis}&procurementPrice=${this.purchaseOrder.procurementPrice}
 						&receiveWarehouse=${this.purchaseOrder.receiveWarehouse}&procurementPlanType=${this.purchaseOrder.procurementPlanType}
 						&procurementPlanNo=${this.purchaseOrder.procurementPlan}`
-					})
-				},
-				commit(){
-					if(!this.purchaseOrder.transactionsNumber){
-						this.$api.msg('出售数量不能为空')
-						return
-					}
-					if(this.purchaseOrder.transactionsNumber>10000||this.purchaseOrder.transactionsNumber<1){
-						this.$api.msg('出售数量输入错误')
-						return
-					}
-					if(this.purchaseOrder.procurementPlanType=='期货'&&!this.purchaseOrder.pointPrice){
-						this.$api.msg('点价不能为空')
-						return
-					}
-					if(this.purchaseOrder.procurementPlanType=='期货'&&this.purchaseOrder.pointPrice>10000){
+				})
+			},
+			commit() {
+				if (!this.purchaseOrder.transactionsNumber) {
+					this.$api.msg('出售数量不能为空')
+					return
+				}
+				if (this.purchaseOrder.transactionsNumber > 10000 || this.purchaseOrder.transactionsNumber < 1) {
+					this.$api.msg('出售数量输入错误')
+					return
+				}
+				if (this.purchaseOrder.procurementPlanType == '期货' && !this.purchaseOrder.pointPrice) {
+					this.$api.msg('点价不能为空')
+					return
+				}
+				if (this.purchaseOrder.procurementPlanType == '期货' && this.purchaseOrder.pointPrice > 10000) {
+					this.$api.msg('点价输入错误')
+					return
+				}
+				if (this.purchaseOrder.procurementPlanType == '期货' && this.purchaseOrder.pointPrice.indexOf('.') != -1) {
+					if (this.purchaseOrder.pointPrice.split(".")[1].length > 2) {
 						this.$api.msg('点价输入错误')
 						return
 					}
-					if(this.purchaseOrder.procurementPlanType=='期货'&&this.purchaseOrder.pointPrice.indexOf('.')!=-1){
-						if(this.purchaseOrder.pointPrice.split(".")[1].length>2){
-							this.$api.msg('点价输入错误')
-							return
-						}
-					}
-					this.purchaseOrder.packingFee=-this.purchaseOrder.packingFee
-					if(this.purchaseOrder.packingFee>0||this.purchaseOrder.packingFee<-2000){
-						this.$api.msg('包装费输入错误')
-						return
-					}
-					if(!this.purchaseOrder.customer){
-						if(this.goods.customerTypeFlag==1){
-							this.purchaseOrder.customer=this.goods.customerName
-						}else{
-							this.purchaseOrder.customer=this.goods.compName
-						}
+				}
+
+				this.purchaseOrder.packingFee = -this.packingFee
+
+				if (this.purchaseOrder.packingFee > 0 || this.purchaseOrder.packingFee < -2000) {
+					this.$api.msg('包装费输入错误')
+					return
+				}
+				if (!this.purchaseOrder.customer) {
+					if (this.goods.customerTypeFlag == 1) {
+						this.purchaseOrder.customer = this.goods.customerName
+					} else {
+						this.purchaseOrder.customer = this.goods.compName
 					}
-					if(!this.purchaseOrder.seller){
-						if(this.goods.customerTypeFlag==1){
-							this.purchaseOrder.seller=this.goods.customerName
-							this.purchaseOrder.sellerPhone=this.goods.customerPhone
-						}else{
-							this.purchaseOrder.seller=this.goods.compName
-							this.purchaseOrder.sellerPhone=this.goods.customerPhone
-						}
+				}
+				if (!this.purchaseOrder.seller) {
+					if (this.goods.customerTypeFlag == 1) {
+						this.purchaseOrder.seller = this.goods.customerName
+						this.purchaseOrder.sellerPhone = this.goods.customerPhone
+					} else {
+						this.purchaseOrder.seller = this.goods.compName
+						this.purchaseOrder.sellerPhone = this.goods.customerPhone
 					}
-					var that=this
-					this.purchaseOrder.commonId=that.userInfo.id
-					this.purchaseOrder.pcFlag=0
-					if(this.purchaseOrder.procurementPlanType == "期货"){
+				}
+				var that = this
+				this.purchaseOrder.commonId = that.userInfo.id
+				this.purchaseOrder.pcFlag = 0
+				if (this.purchaseOrder.procurementPlanType == "期货") {
 					this.purchaseOrder.unitPrice = this.purchaseOrder.settlementPrice
-					}
-					uni.showModal({
-						content: '订单提交后将发送给买方，是否确定提交？',
-						success: function (res) {
-							if (res.confirm) {
-								that.$api.doRequest('post','/purchaseOrder/api/insertPurchaseOrder', that.purchaseOrder).then(res => {
-									if(res.data.code==200){
-										that.$api.doRequest('post','/purchaseOrder/api/submitPurchaseOrder', {id:res.data.data}).then(res1 => {
-											if(res1.data.code==200){
-												// uni.navigateTo({
-												// 	url: `/pageA/product/detail`
-												// })
-												uni.showToast({
-													title: '提交成功，等待买方回复',
-													icon: 'none',
-													duration: 2000,
-													success() {
-														uni.navigateBack(1)
-													}
-												})
-											}else{
-												uni.showToast({
-													title: res.data.message,
-													icon: 'none',
-													duration: 2000
-												})
-											}
-										}).catch(res => {
+				}
+				uni.showModal({
+					content: '订单提交后将发送给买方，是否确定提交？',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post', '/purchaseOrder/api/insertPurchaseOrder', that
+								.purchaseOrder).then(res => {
+								if (res.data.code == 200) {
+									that.$api.doRequest('post',
+										'/purchaseOrder/api/submitPurchaseOrder', {
+											id: res.data.data
+										}).then(res1 => {
+										if (res1.data.code == 200) {
+											// uni.navigateTo({
+											//  url: `/pageA/product/detail`
+											// })
+											uni.showToast({
+												title: '提交成功，等待买方回复',
+												icon: 'none',
+												duration: 2000,
+												success() {
+													uni.navigateBack(1)
+												}
+											})
+										} else {
 											uni.showToast({
 												title: res.data.message,
 												icon: 'none',
 												duration: 2000
 											})
-										})
-										// uni.navigateBack();
-									}else{
-										uni.showToast({
-											title: '提交失败：'+res.data.message,
-											icon: 'none',
-											duration: 2000
-										})
-									}
-								}).catch(res => {
-									if(res.errmsg){
+										}
+									}).catch(res => {
 										uni.showToast({
-											title: res.errmsg,
+											title: res.data.message,
 											icon: 'none',
 											duration: 2000
 										})
-									}
-									else{
-										uni.showToast({
-											title: "系统异常，请联系管理员",
-											icon: 'none',
-											duration: 2000
-										})
-									}
-								})
-							}
+									})
+									// uni.navigateBack();
+								} else {
+									uni.showToast({
+										title: '提交失败：' + res.data.message,
+										icon: 'none',
+										duration: 2000
+									})
+								}
+							}).catch(res => {
+								if (res.errmsg) {
+									uni.showToast({
+										title: res.errmsg,
+										icon: 'none',
+										duration: 2000
+									})
+								} else {
+									uni.showToast({
+										title: "系统异常，请联系管理员",
+										icon: 'none',
+										duration: 2000
+									})
+								}
+							})
 						}
-					})
-				},
-				someprice(e){
-					if(this.purchaseOrder.pointPrice&&this.purchaseOrder.invoiceFee&&this.purchaseOrder.packingFee){
-						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.pointPrice)+Number(this.purchaseOrder.invoiceFee)+Number(-this.purchaseOrder.packingFee)
-					}else if(this.purchaseOrder.pointPrice&&this.purchaseOrder.invoiceFee){
-						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.pointPrice)+Number(this.purchaseOrder.invoiceFee)
-					}else if(this.purchaseOrder.pointPrice&&this.purchaseOrder.packingFee){
-						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.pointPrice)+Number(-this.purchaseOrder.packingFee)
-					}else if(this.purchaseOrder.pointPrice){
-						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.pointPrice)
-					}else if(this.purchaseOrder.packingFee){
-						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(-this.purchaseOrder.packingFee)
-					}else if(this.purchaseOrder.invoiceFee){
-						this.purchaseOrder.settlementPrice=Number(this.purchaseOrder.basis)+Number(this.purchaseOrder.invoiceFee)
-					}else{
-						this.purchaseOrder.settlementPrice=this.purchaseOrder.basis
 					}
-				},
-				bankNameChange(e){
-					this.bankNameIndex=e.detail.value
-					this.buyer =this.Company[e.detail.value].companyName
-					this.buyerPhone=this.Company[e.detail.value].companyPhone
-					this.tradeCompanyId=this.Company[e.detail.value].id
-				},
-				AcceptTypeChange(e) {
-					this.acceptTypeIndex = e.detail.value
-					this.accept = this.acceptType[this.acceptTypeIndex];
-				},
-				packingChange(e){
-					this.packingIndex = e.detail.value
-					this.purchaseOrder.packingTypeKey=e.detail.value+1
-					this.purchaseOrder.packingType = this.packingType[this.packingIndex];
-				},
-				invoiceChange(e){
-					this.invoiceIndex = e.detail.value
-					this.purchaseOrder.typeKey=e.detail.value+1
-					this.purchaseOrder.type = this.invoiceType[this.invoiceIndex];
-					if(this.invoiceIndex == 0){
-						if(this.goods.customerTypeFlag==1){
-							this.purchaseOrder.invoiceFee=-20
-						}else{
-							this.purchaseOrder.invoiceFee=0
-						}
-					}
-					else{
-						this.purchaseOrder.invoiceFee=0
+				})
+			},
+			someprice(e) {
+
+				if (this.purchaseOrder.pointPrice && this.purchaseOrder.invoiceFee && this.packingFee) {
+					this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) + Number(this.purchaseOrder
+						.pointPrice) + Number(this.purchaseOrder.invoiceFee) + Number(-this.packingFee)
+				} else if (this.purchaseOrder.pointPrice && this.purchaseOrder.invoiceFee) {
+					this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) + Number(this.purchaseOrder
+						.pointPrice) + Number(this.purchaseOrder.invoiceFee)
+				} else if (this.purchaseOrder.pointPrice && this.packingFee) {
+					this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) + Number(this.purchaseOrder
+						.pointPrice) + Number(-this.packingFee)
+				} else if (this.purchaseOrder.pointPrice) {
+					this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) + Number(this.purchaseOrder
+						.pointPrice)
+				} else if (this.packingFee) {
+					this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) + Number(-this.packingFee)
+				} else if (this.purchaseOrder.invoiceFee) {
+					this.purchaseOrder.settlementPrice = Number(this.purchaseOrder.basis) + Number(this.purchaseOrder
+						.invoiceFee)
+				} else {
+					this.purchaseOrder.settlementPrice = this.purchaseOrder.basis
+				}
+			},
+			bankNameChange(e) {
+				this.bankNameIndex = e.detail.value
+				this.buyer = this.Company[e.detail.value].companyName
+				this.buyerPhone = this.Company[e.detail.value].companyPhone
+				this.tradeCompanyId = this.Company[e.detail.value].id
+			},
+			AcceptTypeChange(e) {
+				this.acceptTypeIndex = e.detail.value
+				this.accept = this.acceptType[this.acceptTypeIndex];
+			},
+			packingChange(e) {
+				this.packingIndex = e.detail.value
+				this.purchaseOrder.packingTypeKey = e.detail.value + 1
+				this.purchaseOrder.packingType = this.packingType[this.packingIndex];
+			},
+			invoiceChange(e) {
+				this.invoiceIndex = e.detail.value
+				this.purchaseOrder.typeKey = e.detail.value + 1
+				this.purchaseOrder.type = this.invoiceType[this.invoiceIndex];
+				if (this.invoiceIndex == 0) {
+					if (this.goods.customerTypeFlag == 1) {
+						this.purchaseOrder.invoiceFee = -20
+					} else {
+						this.purchaseOrder.invoiceFee = 0
 					}
-				},
-				changeZhihang(){
-					uni.navigateTo({
-						url: '/pageA/pages/newcompany'
-					})
-				},
-				PriceTypeChange(e) {
-					this.priceTypeIndex = e.detail.value
-					this.price = this.priceType[this.priceTypeIndex]
-				},
-				RegionChange(e) {
-					this.region = e.detail.value
-					this.province = this.region[0];
-					this.area = this.region[0]+this.region[1]+this.region[2];
-				},
-				textareaInput(e) {
-					this.memo = e.detail.value
-				},
-				buyerInput(e){
-					this.buyer = e.detail.value
-				},
-				buyerPhoneInput(e){
-					this.buyerPhone = e.detail.value
-				},
-				addressInput(e){
-					this.address = e.detail.value
-				},
-				countInput(e){
-					this.count = e.detail.value
-				},
-			}
+				} else {
+					this.purchaseOrder.invoiceFee = 0
+				}
+			},
+			changeZhihang() {
+				uni.navigateTo({
+					url: '/pageA/pages/newcompany'
+				})
+			},
+			PriceTypeChange(e) {
+				this.priceTypeIndex = e.detail.value
+				this.price = this.priceType[this.priceTypeIndex]
+			},
+			RegionChange(e) {
+				this.region = e.detail.value
+				this.province = this.region[0];
+				this.area = this.region[0] + this.region[1] + this.region[2];
+			},
+			textareaInput(e) {
+				this.memo = e.detail.value
+			},
+			buyerInput(e) {
+				this.buyer = e.detail.value
+			},
+			buyerPhoneInput(e) {
+				this.buyerPhone = e.detail.value
+			},
+			addressInput(e) {
+				this.address = e.detail.value
+			},
+			countInput(e) {
+				this.count = e.detail.value
+			},
 		}
+	}
 </script>
 
 <style scoped>
@@ -449,71 +477,82 @@
 		padding: 10px 20px;
 		background-color: #F5F6FA;
 	}
+
 	.cu-form-group input {
 		text-align: right;
 	}
+
 	.cu-form-group textarea {
 		text-align: right;
 	}
-	.margin-bottom{
-		margin-bottom:30px;
+
+	.margin-bottom {
+		margin-bottom: 30px;
 	}
+
 	.c-row {
-	    display: -webkit-box;
-	    display: -webkit-flex;
-	    display: flex;
-	    -webkit-box-align: center;
-	    -webkit-align-items: center;
-	    align-items: center;
-	    padding: 20rpx 30rpx;
-	    position: relative;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
 	}
+
 	.con-list {
-	    -webkit-box-flex: 1;
-	    -webkit-flex: 1;
-	    flex: 1;
-	    display: -webkit-box;
-	    display: -webkit-flex;
-	    display: flex;
-	    -webkit-box-orient: vertical;
-	    -webkit-box-direction: normal;
-	    -webkit-flex-direction: column;
-	    flex-direction: column;
-	    color: #303133;
-	    line-height: 40rpx;
-	    text-align: right;
-	    padding-right: 20rpx;
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
 	}
-	.transaction{
+
+	.transaction {
 		background-color: #FFFFFF;
 		margin-top: 10px;
 		padding-bottom: 10px;
 		border-radius: 20px;
 	}
-	.btn{
+
+	.btn {
 		width: 100%;
 		background-color: #22C572;
 		border-radius: 20px;
 		margin-top: 10px;
 		color: white;
 	}
-	.textareas{
+
+	.textareas {
 		width: 95%;
 		background-color: #F9F9FA;
 		padding: 10px 20px 0px 20px;
 		border-radius: 10px;
 	}
-	.beizhu{
+
+	.beizhu {
 		margin-left: 15px;
 		margin-bottom: 20px;
 		/* margin: 10px; */
 		margin-top: 10px;
 	}
-	.titles{
+
+	.titles {
 		margin-left: 20px;
 		margin-top: 10px;
 	}
-	.textA{
+
+	.textA {
 		margin-left: 20px;
 		color: #AFB3BF;
 		font-size: 10px;

pageA/product/business_sale.vue

@@ -169,7 +169,7 @@
 					bankNameIndex:0,
 					packingIndex:0,
 					invoiceIndex:0,
-					packingType: ['散袋(默认)','大袋','小袋'],
+					packingType: ['散粮','大袋','小袋'],
 					// invoiceType: ['不开发票', '普通发票', '增值税发票'],
 					invoiceType: ['不开发票','增值税发票'],
 					acceptType: ['第三方检验（国家检验资质）', '交收地库或港出具的检验', '现场看货','其他'],

pageA/product/detail.vue

@@ -1,8 +1,11 @@
 <template>
 	<!--采购详情-->
 	<view class="container">
-		<view class="back-btn cuIcon-back" @click="navBack"></view>
+		<view class="">
+			<view class="back-btn cuIcon-back" @click="navBack"></view>
 		<view class='title1'>采购详情</view>
+		</view>
+		
 		<image style='width:100%;' src='../../static/img/jiaoyi/bg@3x.png'></image>
 		<view class="introduce-section">
 			<view style='height:70px;'>
@@ -570,6 +573,7 @@
 		left:50%;
 		transform: translateX(-50%);
 		top: 40upx;
+		padding-top: var(--status-bar-height);
 		z-index:9999;
 		color:#fff;
 		font-size: 36rpx;

pageA/product/lookup.vue

@@ -4,7 +4,7 @@
 			<view style='background:#fff;display:flex;' class="cu-bar search">
 			<view style='flex:6;' class="search-form round" >
 				<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
-				<input type="text" maxlength="20" v-model="searchKeyWord" @input='search' placeholder="请输入货名或标题" confirm-type="search"></input>
+				<input type="text" maxlength="20" v-model="searchKeyWord" @confirm="doSearch()" @input='search' placeholder="请输入货名或标题" confirm-type="search"></input>
 				
 			</view>
 			<view @click='doSearch()' style="width:4%;flex:1;">搜索</view>
@@ -183,6 +183,9 @@
 					this.loadOldKeyword()
 					this.loadHotKeyword()
 				}
+				else{
+					this.searchKeyWord = e.detail.value
+				}
 			},
 			blur(){
 				uni.hideKeyboard()

pages/attestation/index.vue

@@ -310,6 +310,7 @@
 
 <style>
 	.center {
+		overflow-x: hidden;
 		padding: 10px 20px;
 	}
 
@@ -347,7 +348,6 @@
 		width: 100%;
 		height: 350rpx;
 		margin-top: 20rpx;
-
 	}
 
 	.arrows {

pages/business/business.vue

@@ -3,7 +3,12 @@
 		<view class="top-style">
 			<view style='background:#fff;border-bottom:1px solid #EEE;padding-bottom:10px;'>
 				<view class="cu-bar search">
-					<view style='position:absolute;left:30px;top:50%;transform: translateY(-50%);'>
+					<view style='position:absolute;left:30px;top:50%;transform: translateY(-50%);' @click='status=true'>
+						{{location}}<image style='width:10px;height:6px;margin-left:4px;position:relative;top:-2px;'
+							src='../../static/img/jiaoyi/down.png'></image>
+					</view>
+					<u-picker mode="selector" @confirm='locationChange' v-model="status" :range="locationType"></u-picker>
+					<!-- <view>
 						<picker style='display:inline-block;' @change="locationChange" :value="location"
 							:range="locationType">
 							<view class="picker">
@@ -12,7 +17,8 @@
 						</picker>
 						<image style='width:10px;height:6px;margin-left:4px;position:relative;top:-2px;'
 							src='../../static/img/jiaoyi/down.png'></image>
-					</view>
+					</view> -->
+					
 					<view class="search-form round" @click="naviageToPage('/pageA/product/lookup?TabCur=')">
 						<text style='color: #ccc;text-indent:56px;' class="cuIcon-search"></text>
 						<input type="text" placeholder="请输入货名或标题" confirm-type="search"></input>
@@ -93,9 +99,10 @@
 				isLoadMore: false, //是否加载中
 				showTran: true,
 				scrollTop: 0,
+				status:false,
 				pageSize: 10,
 				searchKeyWord: '',
-				receivePrivate: '',
+				receivePrivate: '全国',
 				currentPage: 1,
 				categoryList: [{
 					title: '我要买粮',
@@ -106,7 +113,10 @@
 				}],
 				TabCur: 0,
 				current: 1,
-				location: 0,
+				location: '全国',
+				params:{
+					province: true,
+				},
 				locationType: ['全国', '黑龙江', '河南', '山东', '安徽', '吉林', '河北', '江苏', '内蒙古', '四川', '湖南', '湖北', '辽宁',
 					'江西', '云南', '新疆', '山西', '广西', '陕西', '广东', '甘肃', '重庆', '贵州', '浙江', '福建',
 					'宁夏', '天津', '海南', '青海', '西藏', '上海', '北京'
@@ -203,8 +213,9 @@
 				})
 			},
 			locationChange(e) {
-				this.location = e.detail.value
-				this.receivePrivate = e.detail.value
+				console.log(e)
+				this.location = this.locationType[e[0]]
+				this.receivePrivate = this.locationType[e[0]]
 				this.currentPage = 1
 				this.loadData()
 			},
@@ -246,7 +257,7 @@
 						showFlag: 1,
 						currentPage: this.currentPage,
 						searchKeyWord: this.searchKeyWord,
-						receivePrivate: this.receivePrivate =="0" ? '':this.locationType[this.receivePrivate]
+						receivePrivate: this.receivePrivate
 					}).then(res => {
 						uni.hideLoading()
 						this.buyInfo = res.data.data.records

pages/tran/tran.vue

@@ -15,12 +15,12 @@
 			<swiper-item class="tab-content" data-id="1">
 				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="onReachBottomTmp">
 					<block v-if="TabCur==0">
-						<view class="cu-bar search">
+						<!-- <view class="cu-bar search">
 							<view class="search-form round" @click="naviageToPage('/pageA/product/search?TabCur=2')">
 								<text class="cuIcon-search"></text>
 								<input type="text" placeholder="搜索" confirm-type="search"></input>
 							</view>
-						</view>
+						</view> -->
 						<view class="guess-section">
 							<view 
 								v-for="(item , index) in tranInfo" :key="index"
@@ -57,12 +57,12 @@
 			<swiper-item class="tab-content" data-id="0">
 				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="onReachBottomTmp">
 					<block v-if="TabCur==1">
-						<view class="cu-bar search">
+						<!-- <view class="cu-bar search">
 							<view class="search-form round" @click="naviageToPage('/pageA/product/search?TabCur=3')">
 								<text class="cuIcon-search"></text>
 								<input type="text" placeholder="搜索" confirm-type="search"></input>
 							</view>
-						</view>
+						</view> -->
 						<view class="guess-section">
 							<view 
 								v-for="(item, index) in carInfo" :key="index"

websocket_sdk.js

@@ -291,7 +291,6 @@ export default class Websocket {
 			    },
 			    method: 'GET',
 			    success: (res) => {			
-					console.log("websocket myTips",res)
 					if (res.data.data) {
 			    		let name = 'myTip';
 			    		let value = res.data.data.myTip;