前端gjy

pageA/product/Identity_switching.vue

@@ -17,9 +17,7 @@
 							<view class='but but3' v-if="item.authenticationStatus == '未通过'">{{item.authenticationStatus}}</view>
 							<view class='but but4' v-if="item.authenticationStatus == '已覆盖'">{{item.authenticationStatus}}</view>
 						</view>
-						<view class="info2">{{item.customerPhone}}</view>
-					
-						
+						<view class="info2">{{item.customerPhone}}</view>	
 					</view>
 	
 				</view>
@@ -129,10 +127,17 @@
 				item.checked=true
 				this.$api.doRequest('post', '/identityAuthenticationInfo/api/setDefault', {
 						id:item.id,
+						defaultFlag:1,
 						commonId: this.userInfo.id
 					}).then(res => {
 						if(res.data.code==200){
 							// this.lists = res.data.data.records
+							
+							wx.navigateBack({
+							 
+							  delta: 1
+							 
+})
 						}
 					})
 					.catch(res => {

pageA/product/business_buy.vue

@@ -211,7 +211,6 @@
 				};
 			},
 			onLoad(options) {
-				console.log(options)
 				this.id=options.id
 				this.purchaseOrder.planId=options.id
 				this.purchaseOrder.seller = options.seller
@@ -306,6 +305,9 @@
 					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) {

pageA/product/business_sale.vue

@@ -66,7 +66,7 @@
 			<view class="con-list">
 			<picker @change="invoiceChange" :value="invoiceIndex" :range="invoiceType">
 				<view class="picker">
-					{{packingIndex>-1?invoiceType[packingIndex]:'请选择'}}
+					{{invoiceIndex>-1?invoiceType[invoiceIndex]:'请选择'}}
 				</view>
 			</picker>
 			</view>
@@ -213,7 +213,6 @@
 				};
 			},
 			onLoad(options) {
-				console.log(options)
 				this.id=options.id
 				this.purchaseOrder.planId=options.id
 				this.purchaseOrder.seller = options.seller

pageA/product/detail.vue

@@ -10,7 +10,7 @@
 				<view class='flex justify-between'>
 					<view style='flex:1.5;color:#878C9C;'>{{goods.receivePrivate}}{{goods.receiveCity}}{{goods.receiveArea}}{{goods.receiveWarehouse}}</view>
 					<view  v-if='goods.procurementPlanType=="现货"' class="title-tip">
-						<text class="price">{{goods.unitPrice}}</text>
+						<text class="price">{{goods.procurementPrice}}</text>
 					</view>
 					<view style='text-align:right;'  v-else class="title-tip">
 						{{goods.basisPrice}}

pageA/product/sales_detail.vue

@@ -507,7 +507,7 @@
 						// &unloadingFee=${that.goods.unloadingFee}`
 						url:`/pageA/product/business_sale?id=${that.goods.id}&buyer=${that.goods.buyer}&seller=${that.goods.seller}&sendPrivate=${that.goods.sendPrivate}
 						&sendCity=${that.goods.sendCity}&sendArea=${that.goods.sendArea}&sendWarehouse=${that.goods.sendWarehouse}&goodsName=${that.goods.goodsName}
-						&minimumVolume=${that.goods.minimumVolume}&unitPrice=${that.goods.unitPrice}&basisPrice=${that.goods.basisPrice}`
+						&minimumVolume=${that.goods.minimumVolume}&unitPrice=${that.goods.unitPrice}&basisPrice=${that.goods.basisPrice}&salePlanType=${that.goods.salePlanType}`
 					})
 				}
 			}

pageB/contract/look.vue

@@ -57,14 +57,17 @@
 						<text>{{item.deductionItems}}</text>
 					</view>
 				</view>
-				<view class="c-row ">
-					<button v-if='item.loadPoundImg' class="cu-btn commit margin-tb-sm lg"
-						style="background-color:  #4CD964; width: 210rpx;height: 30px; "
-						@click="shipments(item)">发货磅单</button>
-					<button v-if='item.unloadPoundImg' class="cu-btn commit margin-tb-sm lg"
-						style="background-color:  #1CBBB4; margin-left: 15px; width: 210rpx;height: 30px;"
-						@click="unload(item)">收货磅单</button>
-					<!-- </view> -->
+				<view  v-if='item.loadPoundImg'>
+					<view class="poundtitle">发货磅单</view>
+					<view class="poundlists">
+						<image :src="item.loadPoundImg" mode="" class="poundlist"></image>
+					</view>
+				</view>
+				<view  v-if='item.unloadPoundImg'>
+					<view class="poundtitle">发货磅单</view>
+					<view class="poundlists">
+						<image :src="item.loadPoundImg" mode="" class="poundlist"></image>
+					</view>
 				</view>
 
 			</view>
@@ -1020,4 +1023,17 @@
 	.btns {
 		background-color: #22C572;
 	}
+	.poundlist{
+		width: 62px;
+		height: 85px;
+	}
+	.poundlists{
+		margin-left: 14px;
+		margin-top: 10px;
+		}
+	.poundtitle{
+		font-size: 15px;
+		margin-left: 14px;
+		margin-top: 10px;
+	}
 </style>

pageD/myRelease/buyDetails.vue

@@ -51,7 +51,7 @@
 		<view class="c-row b-b" v-if="procurementPlanInfos.procurementPlanType == '现货'">
 			<text class="tit">单价（元/吨）</text>
 			<view class="con-list">
-				{{procurementPlanInfos.unitPrice}}
+				{{procurementPlanInfos.procurementPrice}}
 			</view>
 		</view>
 		<view class="c-row b-b" v-if="procurementPlanInfos.procurementPlanType == '期货'">

pageD/myRelease/buyGrain.vue

@@ -49,7 +49,7 @@
 			<view class="c-row b-b" v-if="this.typesIndex != 1">
 				<text class="tit">单价（元/吨）</text>
 				<view class="con-list">
-					<input placeholder="请填写单价" name="input" v-model="deptList.unitPrice"></input>
+					<input placeholder="请填写单价" name="input" v-model="deptList.procurementPrice"></input>
 				</view>
 			</view>
 			<view class="c-row b-b" v-if="this.typesIndex == 1">
@@ -442,16 +442,16 @@
 					return
 				}
 				if (this.deptList.procurementPlanType == '现货') {
-					if (!this.deptList.unitPrice) {
+					if (!this.deptList.procurementPrice) {
 						this.$api.msg('单价不能为空')
 						return
 					}
-					if (this.deptList.unitPrice > 100000 || this.deptList.unitPrice < 1) {
+					if (this.deptList.procurementPrice > 100000 || this.deptList.procurementPrice < 1) {
 						this.$api.msg('单价输入错误')
 						return
 					}
-					if (this.deptList.unitPrice.indexOf('.') != -1) {
-						if (this.deptList.unitPrice.split('.')[1].length > 2) {
+					if (this.deptList.procurementPrice.indexOf('.') != -1) {
+						if (this.deptList.procurementPrice.split('.')[1].length > 2) {
 							this.$api.msg('单价输入错误')
 							return
 						}

pageD/myRelease/sellGrain.vue

@@ -562,6 +562,11 @@
 					this.$api.msg('验证码输入有误！')
 					return
 				}
+
+				// this.insertProcurementPlanInfo = this.deptList
+				// this.insertProcurementPlanInfo.basisPrice = -this.insertProcurementPlanInfo.basisPrice
+				// this.insertProcurementPlanInfo.commonId = this.userInfo.id
+				// this.insertProcurementPlanInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 				this.insertSalePlanInfo = this.deptList
 				this.insertSalePlanInfo.basisPrice = -this.insertSalePlanInfo.basisPrice
 				this.insertSalePlanInfo.commonId = this.userInfo.id

pageD/warehousings/ex_warehouse.vue

@@ -333,6 +333,10 @@
 						id: id1
 					}).then(res => {
 						this.WarehouseInOutInfo = res.data.data
+						if(this.WarehouseInOutInfo.warehouseInOutDetail != null || this.WarehouseInOutInfo.warehouseInOutDetail != ""){
+							this.list = this.WarehouseInOutInfo.warehouseInOutDetail
+						}
+						
 					})
 					.catch(res => {
 						uni.showToast({
@@ -406,8 +410,8 @@
 					this.$api.msg('皮重输入错误')
 					return
 				}
-				if (this.WarehouseInOutInfo.tare.indexOf('.') != -1) {
-					if (this.WarehouseInOutInfo.tare.split('.')[1].length > 2) {
+				if (this.WarehouseInOutInfo.tare.toString().indexOf('.') != -1) {
+					if (this.WarehouseInOutInfo.tare.toString().split('.')[1].length > 2) {
 						this.$api.msg('皮重输入错误')
 						return
 					}
@@ -500,8 +504,7 @@
 				if (this.imgUrls.length > 0) {
 					this.WarehouseInOutInfo.addressUrl = this.imgUrls[0]
 				}
-				console.log(this.WarehouseInOutInfo, "卖粮对象")
-	
+				console.log(this.WarehouseInOutInfo,"出库暂存对象")
 				this.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse', this.WarehouseInOutInfo).then(res => {
 					if (res.data.code == 200) {
 						uni.showToast({
@@ -509,10 +512,10 @@
 							icon: 'none',
 							duration: 2000
 						})
-						// uni.navigateBack({})
-						setTimeout(() => {
-							uni.navigateBack({})
-						}, 200)
+					
+						// setTimeout(() => {
+						// 	uni.navigateBack({})
+						// }, 200)
 					} else {
 						uni.showToast({
 							title: res.data.message,
@@ -562,8 +565,8 @@
 					this.$api.msg('皮重输入错误')
 					return
 				}
-				if (this.WarehouseInOutInfo.tare.indexOf('.') != -1) {
-					if (this.WarehouseInOutInfo.tare.split('.')[1].length > 2) {
+				if (this.WarehouseInOutInfo.tare.toString().indexOf('.') != -1) {
+					if (this.WarehouseInOutInfo.tare.toString().split('.')[1].length > 2) {
 						this.$api.msg('皮重输入错误')
 						return
 					}

pageD/warehousings/warehousings.vue

@@ -295,7 +295,7 @@ import upload from '@/components/upload.vue';
 				month="0"+(month+1)
 			}
 			this.time = year+'-'+month+"-"+date1
-			this.getList(this.WarehouseInOutInfo.id)
+			 this.getList(this.WarehouseInOutInfo.id)
 		},
 		methods: {
 			getList(id1){
@@ -303,7 +303,10 @@ import upload from '@/components/upload.vue';
 				this.$api.doRequest('get','/warehouseInOutInfo/getInfo',{id:id1}).then(res => {
 					
 					that.WarehouseInOutInfo = res.data.data
-					 that.list = that.WarehouseInOutInfo.warehouseInOutDetail
+					if( that.WarehouseInOutInfo.warehouseInOutDetail != null ||  that.WarehouseInOutInfo.warehouseInOutDetail != ""){
+						that.list = that.WarehouseInOutInfo.warehouseInOutDetail
+					}
+					 
 					this.pinIndex = this.WarehouseInOutInfo.gradeKey
 					this.WarehouseInOutInfo.deductionAmount = Math.abs(res.data.data.deductionAmount) 
 

pages/attestation/indexTwo.vue

@@ -123,41 +123,46 @@
 				}
 			},
 			select(item) {
-				if (item.basis == "false") {
-					for (var i = 0; i < this.businessman.length; i++) {
-						if (this.businessman[i] == item) {
-							item.basis = "true"
-						} else {
-							this.businessman[i].basis = "false"
-						}
-					}
-
-					// this.defaults1 = "default2"
-				} else if (item.basis == "true") {
-					item.basis = "false"
-					// this.defaults2 = "default1"
-				}
-				this.identityAuthenticationInfo.commonId = this.userInfo.id
-				this.identityAuthenticationInfo.defaultFlag = 1
-				this.identityAuthenticationInfo.id = item.id
-				this.$api.doRequest('post', '/identityAuthenticationInfo/api/setDefault', this.identityAuthenticationInfo,
-						'application/json;charset=UTF-8').then(res => {
+				if(item.authenticationStatus == '已认证'){
+					if (item.basis == "false") {
 						for (var i = 0; i < this.businessman.length; i++) {
-							if (this.businessman.defaultFlag == 1) {
-								this.defaults = "default2"
+							if (this.businessman[i] == item) {
+								item.basis = "true"
 							} else {
-								this.defaults = "default1"
+								this.businessman[i].basis = "false"
 							}
 						}
-						this.getList()
-					})
-					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
+					
+						// this.defaults1 = "default2"
+					} else if (item.basis == "true") {
+						item.basis = "false"
+						// this.defaults2 = "default1"
+					}
+					this.identityAuthenticationInfo.commonId = this.userInfo.id
+					this.identityAuthenticationInfo.defaultFlag = 1
+					this.identityAuthenticationInfo.id = item.id
+					this.$api.doRequest('post', '/identityAuthenticationInfo/api/setDefault', this.identityAuthenticationInfo,
+							'application/json;charset=UTF-8').then(res => {
+							for (var i = 0; i < this.businessman.length; i++) {
+								if (this.businessman.defaultFlag == 1) {
+									this.defaults = "default2"
+								} else {
+									this.defaults = "default1"
+								}
+							}
+							this.getList()
 						})
-					});
+						.catch(res => {
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						});
+				}else{
+					this.$api.msg('已认证的身份才能设为默认！')
+				}
+				
 
 			},
 			open(item) {