成本

ghsApp/src/admin/stat/profit.vue

@@ -37,7 +37,7 @@
 							<t-tr>
 								<t-td align="center">
 									<view style="font-weight:bold;font-size:30upx;">
-										花材损耗 ¥{{profit.wastagePrice||0}}
+										花材报损 成本¥{{profit.wastageCost||0}} 售价¥{{profit.wastagePrice||0}}
 									</view>
 								</t-td>
 							</t-tr>

ghsApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -9,13 +9,17 @@
 				<block v-if="!$util.isEmpty(list.data)">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
 						<view style="width:100%;">
-						<t-tr header>
-							<t-th><view style="width:130upx;color:#333333;font-size:30upx;font-weight:bold;">时间</view></t-th>
-							<t-th><view style="width:120upx;color:#333333;font-size:30upx;font-weight:bold;">名称</view></t-th>
-							<t-th><view style="width:190upx;color:#333333;font-size:30upx;font-weight:bold;">事项</view></t-th>
-							<t-th><view style="color:#333333;font-size:30upx;font-weight:bold;">变动</view></t-th>
-							<t-th><view style="color:#333333;font-size:30upx;font-weight:bold;">剩余</view></t-th>
-						</t-tr>
+							<t-tr header>
+								<t-th><view style="width:130upx;color:#333333;font-size:30upx;font-weight:bold;">时间</view></t-th>
+								<t-th><view style="width:120upx;color:#333333;font-size:30upx;font-weight:bold;">名称</view></t-th>
+								<t-th><view style="width:190upx;color:#333333;font-size:30upx;font-weight:bold;">事项</view></t-th>
+								<t-th><view style="color:#333333;font-size:30upx;font-weight:bold;">变动</view></t-th>
+								<t-th><view style="color:#333333;font-size:30upx;font-weight:bold;">剩余</view></t-th>
+							</t-tr>
+						</view>
+						<view style="margin:20upx 0 0 70upx;">
+							<button class="admin-button-com" :class="[hideCost==0?'blue':'']" style="margin-right:20upx;" @click="hideCost=0">显示成本</button>
+							<button class="admin-button-com" :class="[hideCost==1?'blue':'']" @click="hideCost=1">不显成本</button>
 						</view>
 						<view style="margin-top:20upx;">
 							<view v-for="(item, index) in list.data" :key="index">
@@ -55,7 +59,7 @@
 									<td>
 										<view style="color:#9c9595;margin-left:50upx;">
 											<view v-if="!$util.isEmpty(item.remark)" style="color:red;">{{ item.remark }}</view>
-											<view v-if="Number(item.avCost)>0"> 
+											<view v-if="Number(item.avCost)>0 && hideCost ==0"> 
 												<text v-if="item.io == 1">+成本</text><text v-else>-成本</text>￥{{ item.unitCost?parseFloat(item.unitCost):0 }}x{{ item.itemNum?parseFloat(item.itemNum):0 }}=￥{{ item.changeCost?parseFloat(item.changeCost):0 }}
 												当前成本 ￥{{item.totalCost?parseFloat(item.totalCost):0}} 
 												<view>当前数量 {{item.totalStock?parseFloat(item.totalStock):0}} 平均成本 <text style="margin-left:8upx;">{{ item.avCost?parseFloat(item.avCost):0 }}</text></view>
@@ -93,7 +97,8 @@ export default {
 		return {
 			searchTime:'',
 			startTime: "",
-			endTime: ""
+			endTime: "",
+			hideCost:0
 		};
 	},
 	onPullDownRefresh() {

hdApp/src/admin/home/apply.vue

@@ -49,7 +49,7 @@ export default {
                 { name: "库存预警", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/pagesStorehouse/stockWarn/manage",pf:1},
                 { name: "买花", img: `${this.$constant.hostUrl}/image/ghs/home/icon_ghs2.png`, url: "/pagesPurchase/order",pf:1},
                 { name: "买花记录", img: `${this.$constant.hostUrl}/image/ghs/home/icon_caigou2.png`, url: "/pagesPurchase/shopping",pf:1},
-                { name: "损耗", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/breakage/list",pf:1},
+                { name: "报损", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/breakage/list",pf:1},
                 { name: "拆散", img: `${this.$constant.hostUrl}/image/ghs/home/kcyjs2.png`, url: "/admin/part/list",pf:1}
             ]
         },