Procházet zdrojové kódy

改价和平均成本

shish před 8 měsíci
rodič
revize
46e923252d

+ 16 - 8
ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -10,12 +10,19 @@
 				<view class="pre-save-price" v-if="info.hasSavePrice && info.hasSavePrice == 1">预存价格已导入</view>
 
 				<template>
-					<view style="width:690upx;overflow:hidden;padding-left:35upx;">
+					<view style="width:690upx;overflow:hidden;padding-left:30upx;">
 						<view class="flex title" v-if="info.status == 3"> 入库前请确认售价: </view>
 						<view class="flex title" v-else> 确认售价: </view>
 						<view class="flex title">
 							<text style="font-size:24upx;font-weight:normal;color:#CCCCCC;">
-								<text style="color:black;font-weight:bold;margin:0 5upx 0 0;">花材名称</text> / <text style="color:red;font-weight:normal;margin:0 5upx 0 5upx;">进货价</text> / <text style="color:#3385FF;font-weight:bold;margin:0 5upx 0 5upx;">平均成本</text> / 旧批发价 / 入库数 / 原库存</text>
+								<text style="color:black;font-weight:bold;margin:0 5upx 0 0;">花材名称</text>/
+								<text style="color:red;font-weight:normal;margin:0 5upx 0 5upx;">进价</text>/
+								<text style="color:black;font-weight:normal;margin:0 5upx 0 5upx;">成本</text>/
+								<text style="color:#3385FF;font-weight:normal;margin:0 5upx 0 5upx;">平均成本</text>/
+								<text style="color:#CCCCCC;margin:0 5upx 0 5upx;">旧批发价</text>/
+								<text style="color:#CCCCCC;margin:0 5upx 0 5upx;">入库数</text>/
+								<text style="color:#CCCCCC;margin:0 0upx 0 5upx;">原库存</text>
+							</text>
 						</view>
 
 						<view v-for="(res,i) in flowersList" :key="i">
@@ -24,12 +31,13 @@
 									<view style="margin-bottom:6upx;">
 										<text class="name" @click="pageTo({url:'/admin/item/detail?id='+ res.productId})">
 											{{res.name?res.name.substr(0,11):''}}
-											<text style="color:red;margin-left:13upx;font-weight:normal;font-size:26upx;">¥{{res.bigPrice?parseFloat(res.bigPrice):0}}</text>
-											<text style="color:#3385FF;margin-left:13upx;font-weight:bold;font-size:26upx;">¥{{res.cost?parseFloat(res.cost):0}}</text>
-											<text style="color:#CCCCCC;margin-left:13upx;font-weight:normal;font-size:26upx;">旧¥{{res.beforeModifyPrice?parseFloat(res.beforeModifyPrice):0}}</text>
-											<text style="color:#CCCCCC;margin-left:13upx;font-weight:normal;font-size:26upx;">{{res.itemNum?parseFloat(res.itemNum):0}}{{res.bigUnit}}</text>
-											<text style="color:#CCCCCC;margin-left:13upx;font-weight:normal;font-size:26upx;">{{res.beforeModifyStock?parseFloat(res.beforeModifyStock):0}}{{res.bigUnit}}</text>
-											<text style="color:green;margin-left:13upx;font-weight:normal;">...</text>
+											<text style="color:red;margin-left:9upx;font-weight:normal;font-size:26upx;">¥{{res.bigPrice?parseFloat(res.bigPrice):0}}</text>
+											<text style="color:black;margin-left:9upx;font-size:26upx;font-weight:normal;">¥{{res.currentCost?parseFloat(res.currentCost):0}}</text>
+											<text style="color:#3385FF;margin-left:9upx;font-weight:normal;font-size:26upx;">¥{{res.cost?parseFloat(res.cost):0}}</text>
+											<text style="color:#CCCCCC;margin-left:9upx;font-weight:normal;font-size:26upx;">旧¥{{res.beforeModifyPrice?parseFloat(res.beforeModifyPrice):0}}</text>
+											<text style="color:#CCCCCC;margin-left:9upx;font-weight:normal;font-size:26upx;">{{res.itemNum?parseFloat(res.itemNum):0}}{{res.bigUnit}}</text>
+											<text style="color:#CCCCCC;margin-left:9upx;font-weight:normal;font-size:26upx;">{{res.beforeModifyStock?parseFloat(res.beforeModifyStock):0}}{{res.bigUnit}}</text>
+											<text style="color:green;margin-left:9upx;font-weight:normal;">...</text>
 										</text>
 									</view>
 									<view>