更新

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.53",
-    "versionCode" : 1153,
+    "versionName" : "1.1.57",
+    "versionCode" : 1157,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages/user/contractLook/inventoryCost.vue

@@ -94,11 +94,15 @@
 				} else {
 					_url = "/warehouseBaseInfo/exportPhoneOut"
 				}
+				uni.showLoading({
+					title: '正在加载'
+				})
 				this.$api.doRequest('post', _url, {
 					startDate: this.parameter.startDate,
 					endDate: this.parameter.endDate,
 					warehouseName: this.parameter.warehouseName
 				}).then(res => {
+					uni.hideLoading()
 					console.log('-----------')
 					console.log(res.data.data)
 					uni.downloadFile({
@@ -125,6 +129,9 @@
 				this.isShowDetailBtn = true
 			},
 			init() {
+				uni.showLoading({
+					title: '正在加载'
+				})
 				this.$api.doRequest('get', '/costManagementInfo/selectCostManagementInfo', {
 					compId: uni.getStorageSync('pcUserInfo').compId,
 					warehouseType: 1
@@ -178,7 +185,9 @@
 	.modal-row {
 		display: flex;
 		justify-content: space-between;
-		padding: 10rpx 60rpx;
+		padding: 10rpx 60rpx ;
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
 	}
 
 	.u-radio-group {

pages/user/report.vue

@@ -165,28 +165,50 @@
 					background="none" />
 			</view>
 			<view class="content5 content-wrap" @click="goToPage(5)">
-				<view class="title">库存成本</view>
+				<view class="title">库存头寸（吨）</view>
 				<u-line color="#EEEEEE" class="u-line" />
 				<view class="row1">
 					<view class="left">
 						<image src="../../static/img/report/kuncunliang.png" mode=""></image>
 						<view class="text">
-							总库存量（吨）
+							实际存量
 						</view>
 					</view>
 					<view class="right">
-						{{inventoryCost}}
+						{{inventoryAct}}
 					</view>
 				</view>
 				<view class="row2">
 					<view class="left">
 						<image src="../../static/img/report/jiazhi.png" mode=""></image>
 						<view class="text">
-							库存价值（元）
+							采购待执行
 						</view>
 					</view>
 					<view class="right">
-						{{inventoryValue}}
+						{{inventoryBuy}}
+					</view>
+				</view>
+				<view class="row2">
+					<view class="left">
+						<image src="../../static/img/report/jiazhi.png" mode=""></image>
+						<view class="text">
+							销售待执行
+						</view>
+					</view>
+					<view class="right">
+						{{inventorySale}}
+					</view>
+				</view>
+				<view class="row2">
+					<view class="left">
+						<image src="../../static/img/report/jiazhi.png" mode=""></image>
+						<view class="text">
+							头寸
+						</view>
+					</view>
+					<view class="right">
+						{{inventoryTC}}
 					</view>
 				</view>
 			</view>
@@ -245,8 +267,10 @@
 			return {
 				scrollTop: 0,
 				carInterval: null,
-				inventoryCost: '',
-				inventoryValue: '',
+				inventoryAct: 0,
+				inventoryBuy: 0,
+				inventorySale: 0,
+				inventoryTC: 0,
 				contractSelect: '0',
 				url: '',
 				nowDate: '2022年全年',
@@ -621,8 +645,10 @@
 							}
 
 						} else if (i == 7) {
-							this.inventoryCost = Number(res.data.data[i].biViewInfoList[0].count).toFixed(2)
-							this.inventoryValue = Number(res.data.data[i].biViewInfoList[1].count).toFixed(2)
+							this.inventoryAct = Number(res.data.data[i].biViewInfoList[0].count).toFixed(2)
+							this.inventoryBuy = Number(res.data.data[i].biViewInfoList[1].count).toFixed(2)
+							this.inventorySale = Number(res.data.data[i].biViewInfoList[2].count).toFixed(2)
+							this.inventoryTC =  Number(Number(this.inventoryAct)+Number(this.inventoryBuy)-Number(this.inventorySale)).toFixed(2)
 
 						} else if (i == 8) {
 							let _x = []