shish 9 kuukautta sitten
vanhempi
commit
1684d1049b

+ 2 - 2
ghsApp/src/admin/billing/index2.vue

@@ -66,10 +66,10 @@
 						<text style="margin-left:14upx;">¥{{ parseFloat(customData.price) }}</text>
 						<text style="margin-left:14upx;">{{customData.ratio}}{{customData.smallUnit}}/{{customData.bigUnit}}</text>
 						<!-- 花样年花,要求不显示成本,其他批发商需要 -->
-						<text style="margin-left:14upx;" v-if="customData.mainId!=1553">成本 {{customData.cost?parseFloat(customData.cost):0}}</text>
+						<text style="margin-left:14upx;" v-if="customData.mainId!=1553">成本 {{customData.avCost?parseFloat(customData.avCost):0}}</text>
 					</view>
 					<view class="num_bx">
-						<input style="width:280upx" v-model="customData.userPrice" @focus="customData.userPrice = null" :class="[Number(customData.cost) > Number(customData.userPrice) ? 'warning-price' : '']"
+						<input style="width:280upx" v-model="customData.userPrice" @focus="customData.userPrice = null" :class="[Number(customData.avCost) > Number(customData.userPrice) ? 'warning-price' : '']"
 						:disabled="false" type="digit" placeholder="单价" />
 						<text style="font-size:35upx;font-weight:bold;color:#666666;">元</text>
 					</view>

+ 1 - 1
ghsApp/src/admin/item/components/item2.vue

@@ -48,7 +48,7 @@
 					<view class="open-bx">
 						剩<text style="font-size:23upx;">{{ info.stock?parseFloat(info.stock):0 }}</text>
 						<text style="margin-left:9upx;font-size:23upx;" v-if="info.onStock>0">路上<text style="font-weight:700;">{{info.onStock}}</text></text>
-						<text style="margin-left:9upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">成本{{ info.cost ? parseInt(info.cost) : 0 }}</text>
+						<text style="margin-left:9upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">成本{{ info.avCost ? parseFloat(info.avCost) : 0 }}</text>
 						<text style="margin-left:9upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">销{{ info.actualSold ? parseInt(info.actualSold) : 0 }}</text>
 						<text style="margin-left:9upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">
 							{{info.ratioType == 0 ? info.ratio :'若干'}}支

+ 1 - 1
ghsApp/src/pagesStorehouse/allot/exSelect.vue

@@ -57,7 +57,7 @@
 		<modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.name" color="#333" :size="32" padding="30rpx 30rpx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx" v-if="customData">
-					<view class="kc"> 库存{{ customData.stock?parseFloat(customData.stock):0 }} </view>
+					<view class="kc"> 库存{{ customData.stock?parseFloat(customData.stock):0 }} 成本¥{{ customData.avCost?parseFloat(customData.avCost):0 }}</view>
 					<view class="num_bx">
 						<!-- #ifdef APP-PLUS -->
 						<input style="width: 490upx" v-model="customData.bigCount" v-if="globalUnitType == 0" type="number" />