Parcourir la source

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

gjy il y a 3 ans
Parent
commit
8370ca6393

+ 1 - 1
pageA/product/detail.vue

@@ -6,7 +6,7 @@
 		<image style='width:100%;' src='../../static/img/jiaoyi/bg@3x.png'></image>
 		<view class="introduce-section">
 			<view style='height:70px;'>
-				<view class="title">{{goods.title}}(元/吨)</view>
+				<view class="title">{{goods.title}}</view>
 				<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">

+ 2 - 2
pageA/product/sales_detail.vue

@@ -6,7 +6,7 @@
 		<image style='width:100%;' src='../../static/img/jiaoyi/bg@3x.png'></image>
 		<view class="introduce-section">
 			<view style='height:70px;'>
-				<view class="title">{{goods.title}}(元/吨)</view>
+				<view class="title">{{goods.title}}</view>
 				<view class='flex justify-between'>
 					<view style='flex:1.5;color:#878C9C;'>{{goods.sendPrivate}}{{goods.sendCity}}{{goods.sendArea}}{{goods.sendWarehouse}}</view>
 					<view  v-if='goods.salePlanType=="现货"' class="title-tip">
@@ -16,7 +16,7 @@
 						{{goods.basisPrice}}
 					</view>
 				</view>
-				<view style='text-align:right;' v-if='goods.salePlanType=="现货"'>采购价格</view>
+				<view style='text-align:right;' v-if='goods.salePlanType=="现货"'>销售价格</view>
 				<view style='text-align:right;' v-if='goods.salePlanType=="期货"'>今日基差</view>
 			</view>
 		</view>

+ 1 - 1
pageB/contract/contract.vue

@@ -223,7 +223,7 @@
 			},
 			commit1(item) {
 				uni.navigateTo({
-					url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&customer=${item.customer}&goodsName=${item.goodsName}`
+					url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&contracter=${item.contracter}&goodsName=${item.goodsName}`
 				})
 			},
 			commit2(item) {

+ 2 - 2
pageB/contract/look.vue

@@ -13,7 +13,7 @@
 				<view class="c-row b-b">
 					<text class="tit">买方名称:</text>
 					<view class="con-list">
-						<text>{{goods.customer}}</text>
+						<text>{{goods.contracter}}</text>
 					</view>
 				</view>
 				<view class="c-row">
@@ -147,7 +147,7 @@
 		},
 		onLoad(option) {
 			this.goods.goodsName = option.goodsName
-			this.goods.customer = option.customer
+			this.goods.contracter = option.contracter
 			this.id = option.id
 			this.planId=option.planId
 			this.goods.contractNo = option.contractNo

+ 1 - 1
pageD/myRelease/sellDetails.vue

@@ -50,7 +50,7 @@
 			<view class="c-row b-b" v-if="deptList.salePlanType == '现货'">
 				<text class="tit">单价(元/吨)</text>
 				<view class="con-list">
-					{{deptList.unitPrice}}
+					{{deptList.salePrice}}
 				</view>
 			</view>
 			<view class="c-row b-b" v-if="deptList.salePlanType == '期货'">

+ 1 - 1
pageD/myRelease/sellEdit.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.salePrice"></input>
 				</view>
 			</view>
 			<view class="c-row b-b" v-if="this.typesIndex == 1">

+ 1 - 1
pageD/myRelease/sellGrain.vue

@@ -50,7 +50,7 @@
 			<view class="c-row b-b" v-if="this.typesIndex == 0">
 				<text class="tit">单价(元/吨)</text>
 				<view class="con-list">
-					<input placeholder="请填写单价" name="input" v-model="deptList.unitPrice"></input>
+					<input placeholder="请填写单价" name="input" v-model="deptList.salePrice"></input>
 				</view>
 			</view>
 			<view class="c-row b-b" v-if="this.typesIndex == 1">

+ 52 - 5
pageD/warehousings/ex_warehouse.vue

@@ -108,7 +108,11 @@
 				</view>
 				<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
 					:size-type="['compressed']" @on-success="getImgUrl" @on-remove="onRemove"
-					@on-uploaded="isAdd = true" :before-upload="filterFileType"></upload>
+					@on-uploaded="isAdd = true" :before-upload="filterFileType"
+					v-if="WarehouseInOutInfo.addressUrl == null || WarehouseInOutInfo.addressUrl == '' "></upload>
+				<image :src="WarehouseInOutInfo.addressUrl" mode=""
+					v-if="WarehouseInOutInfo.addressUrl != null || WarehouseInOutInfo.addressUrl != '' "
+					class="picture"></image>
 				<!-- <view style="height: 90px; margin-left: 16px;" class="flex">
 							<image v-bind:src="license1" class="picture1" v-if="this.license1 != null || this.license1 !=''"></image>
 						<view  @click="uploadPictures">
@@ -333,10 +337,29 @@
 						id: id1
 					}).then(res => {
 						this.WarehouseInOutInfo = res.data.data
-						if(this.WarehouseInOutInfo.warehouseInOutDetail != null || this.WarehouseInOutInfo.warehouseInOutDetail != ""){
+						if (this.WarehouseInOutInfo.warehouseInOutDetail != null || this.WarehouseInOutInfo
+							.warehouseInOutDetail != "") {
 							this.list = this.WarehouseInOutInfo.warehouseInOutDetail
 						}
-						
+						this.ruIndex = this.WarehouseInOutInfo.inOutTypeKey
+						this.warehouseIndex1 = this.WarehouseInOutInfo.binNumberKey
+						this.warehouseIndex = this.WarehouseInOutInfo.warehouseNameKey
+						this.pinIndex = this.WarehouseInOutInfo.gradeKey
+						var positionid
+						for (var i = 0; i < this.warehouselist.length; i++) {
+							if (this.warehouselist[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
+								this.warehouseIndex = i
+								positionid = this.warehouselist[i].id
+							}
+						}
+					// this.warehouse1 = this.warehouseChange3(positionid)
+					// console.log(this.warehouse1,"仓库号")
+						for (var i = 0; i < this.warehouse1.length; i++) {
+							if (this.warehouse1[i] == this.WarehouseInOutInfo.binNumber) {
+								this.warehouseIndex1 = i
+							}
+						}
+
 					})
 					.catch(res => {
 						uni.showToast({
@@ -346,7 +369,23 @@
 						})
 					});
 			},
+	 async warehouseChange3(id){
+			var that = this
+			this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
+				id: id,
+			}).then(res => {
+				var arr = []
+				for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
+				
+					arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
+				}
+				that.warehouse1 = arr
+				this.warehouselist11 = res.data.data
+			})
+			return 	that.warehouse1
+		},
 			warehouseChange(e) {
+				console.log(e)
 				var id = ''
 				this.warehouseIndex = e.detail.value
 				this.WarehouseInOutInfo.warehouseName = this.warehouse[this.warehouseIndex]
@@ -370,6 +409,7 @@
 			warehouseChange1(e) {
 				var id = ''
 				this.warehouseIndex1 = e.detail.value
+				this.WarehouseInOutInfo.binNumberKey = this.warehouseIndex1
 				this.WarehouseInOutInfo.binNumber = this.warehouse1[this.warehouseIndex1]
 			},
 
@@ -504,7 +544,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({
@@ -512,7 +552,7 @@
 							icon: 'none',
 							duration: 2000
 						})
-					
+
 						// setTimeout(() => {
 						// 	uni.navigateBack({})
 						// }, 200)
@@ -898,4 +938,11 @@
 		height: 90px;
 		border-radius: 10px;
 	}
+
+	.picture {
+		width: 75px;
+		height: 75px;
+		border-radius: 10px;
+		margin-left: 16px;
+	}
 </style>

+ 4 - 5
pageD/warehousings/warehousings.vue

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

+ 6 - 5
pages/business/business.vue

@@ -57,12 +57,13 @@
 						<view class='tag1 tag-bule radius line-pink' v-if='item.salePlanType=="现货"'>现货</view>
 						<view class='tag1 tag-bule radius line-pink' v-if='item.salePlanType=="期货"'>期货</view>
 						<view class='tag1 tag-yellow radius line-green'>{{item.goodsName}}</view>
-						<view class='tag1 tag-red radius line-yellow'>{{item.weight}}吨</view>
+						<view class='tag1 tag-red radius line-yellow' v-if="TabCur== 0">{{item.plannedPurchaseVolume}}吨</view>
+						<view class='tag1 tag-red radius line-yellow' v-if="TabCur== 1">{{item.plannedSaleVolume}}吨</view>
 					</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货"'>今日基差</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货"'>采购价格</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="期货"'>今日基差</view>
-					<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="现货"'>采购价格</view>
+					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="期货" && TabCur== 0'>今日基差</view>
+					<view style='color:#878C9C;padding-top:5px;' v-if='item.procurementPlanType=="现货" && TabCur== 0'>采购价格</view>
+					<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="期货" && TabCur== 1'>今日基差</view>
+					<view style='color:#878C9C;padding-top:5px;' v-if='item.salePlanType=="现货" && TabCur== 1'>销售价格</view>
 				</view>
 			</view>
 			<view v-show="isLoadMore">

+ 6 - 1
pages/release/release.vue

@@ -17,7 +17,12 @@
 					<view class="address">{{item.privates}}{{item.city}}{{item.Area}}</view>
 					<view class="flex ">
 						<view class="weight">{{item.plannedVolume > 0 ? item.plannedVolume : 0}}吨</view>
-						<text class="unitPrice">{{item.unitPrice}} <text class="amount">元/吨</text></text>
+						<view v-if='item.planType=="期货"'>
+							<text class="unitPrice">{{item.basisPrice}} <text class="amount">元/吨</text></text>
+						</view>
+						<view v-if='item.planType=="现货"'>
+							<text class="unitPrice">{{item.unitPrice}} <text class="amount">元/吨</text></text>
+						</view>
 					</view>
 				</view>
 				<hr style="margin: 16px 0; color: #EEEEEE;">