shish 4 лет назад
Родитель
Сommit
214935cae5

+ 1 - 1
ghsApp/src/admin/home/workbench.vue

@@ -13,7 +13,7 @@
 			</div>
 			<div class="user-bottom">
 				<navigator url="/admin/home/order" open-type="switchTab" class="info-list">
-					<div class="info-list-name">单</div>
+					<div class="info-list-name">单</div>
 					<div class="info-list-value">
 						{{ $util.numberFormat(data.todayData.order) || 0 }}
 					</div>

+ 8 - 8
ghsApp/src/admin/stat/kdIncome.vue

@@ -30,30 +30,30 @@
 			<template slot="customContent">
 				<view style="font-size:30upx;margin-bottom:30upx;margin-top:20upx;">
 
-					<stock v-if="detailItem.class && !$util.isEmpty(detailItem.class)">
+					<block v-if="detailItem.class && !$util.isEmpty(detailItem.class)">
 						<t-table>
-							<stock v-for="(it, idx) in detailItem.class" :key="idx">					
+							<block v-for="(it, idx) in detailItem.class" :key="idx">					
 								<t-tr>
 									<t-td align="center">{{it.name}}</t-td>
 									<t-td align="center">{{it.num}}笔</t-td>
 									<t-td align="center">¥{{it.amount?parseFloat(it.amount):0}}</t-td>
 								</t-tr>
-							</stock>
+							</block>
 						</t-table>
 						<view style="height:30upx;"> </view>
-					</stock>
+					</block>
 
-					<stock v-if="detailItem.category && !$util.isEmpty(detailItem.category)">
+					<block v-if="detailItem.category && !$util.isEmpty(detailItem.category)">
 						<t-table>
-							<stock v-for="(item, index) in detailItem.category" :key="index">					
+							<block v-for="(item, index) in detailItem.category" :key="index">					
 								<t-tr>
 									<t-td align="center">{{item.name}}</t-td>
 									<t-td align="center">{{item.num}}笔</t-td>
 									<t-td align="center">¥{{item.amount?parseFloat(item.amount):0}}</t-td>
 								</t-tr>
-							</stock>
+							</block>
 						</t-table>
-					</stock>
+					</block>
 
 				</view>
 			</template>

+ 16 - 14
ghsApp/src/admin/stat/stock.vue

@@ -14,20 +14,22 @@
                     <t-tr header><t-th>花材</t-th><t-th>库存</t-th><t-th>操作</t-th></t-tr>
                     <block v-if="!$util.isEmpty(classItemData)">
                         <block v-for="(classItem,classIndex) in classItemData" :key="classIndex">
-                                <t-tr>
-                                    <t-td><text style="color:#3385FF">{{ classItem.className }}</text></t-td>
-                                    <t-td></t-td>
-                                    <t-td></t-td>
-                                </t-tr>
-                            <template v-if="classItem.child && !$util.isEmpty(classItem.child)">
-                                <block v-for="(productItem, productIndex) in classItem.child" :key="productIndex">
-                                    <t-tr>
-                                        <t-td><view>{{productItem.name}}</view></t-td>
-                                        <t-td><view>{{productItem.stock?parseFloat(productItem.stock):0}}</view></t-td>
-                                        <t-td></t-td>
-                                    </t-tr>
-                                </block>
-                            </template>
+							<block v-if="classItem.child && !$util.isEmpty(classItem.child)">
+								<t-tr>
+									<t-td><text style="color:#3385FF;font-weight:bold;">{{ classItem.className }}</text></t-td>
+									<t-td></t-td>
+									<t-td></t-td>
+								</t-tr>
+								<template v-if="classItem.child && !$util.isEmpty(classItem.child)">
+									<block v-for="(productItem, productIndex) in classItem.child" :key="productIndex">
+										<t-tr>
+											<t-td><view>{{productItem.name}}</view></t-td>
+											<t-td><view>{{productItem.stock?parseFloat(productItem.stock):0}}</view></t-td>
+											<t-td></t-td>
+										</t-tr>
+									</block>
+								</template>
+							</block>
                         </block>
                     </block>
                 </t-table>