利润

ghsApp/src/admin/home/workbench.vue

@@ -31,7 +31,7 @@
 				<text v-if="!$util.isEmpty(errorPirceList)" @click="showErrorPriceFn" 
 				style="float:right;color:yellow;font-weight:bold;font-size:30upx;">价格异常，点击查看</text>
 			</div>
-			<div class="income-amount" @click="pageTo({url:'/admin/stat/kdIncome'})">
+			<div class="income-amount" @click="pageTo({url:'/admin/stat/profit'})">
 				<div>收入</div>
 				<div class="price">{{ $util.numberFormat(data.todayData.income) }}</div>
 			</div>

hdApp/src/admin/order/detail.vue

@@ -67,7 +67,7 @@
       </view>
 
       <view class="module-com" v-if="!$util.isEmpty(orderInfo.workList)">
-        <view class="module-tit">制作单</view>
+        <view class="module-tit">任务</view>
         <view class="module-det">
           <block v-if="!$util.isEmpty(orderInfo.workList)">
             <detailWork v-for="(items, subIndex) in orderInfo.workList" :key="subIndex" :info="items"></detailWork>

hdApp/src/admin/stat/kindLz.vue

@@ -19,7 +19,7 @@
 							<t-td><view style="color:black;font-size:25upx;">{{item.saleNum}}</view></t-td>
 						</t-tr>
 						<t-tr>
-							<t-td><view style="text-align:right;font-size:30upx;">111122</view></t-td>
+							<t-td><view style="text-align:right;font-size:30upx;">采购 {{profit.cgTotalNum}}，销售 {{profit.saleTotalNum}}</view></t-td>
 						</t-tr>
 
 					</t-table>

hdApp/src/admin/work/statCat.vue

@@ -14,7 +14,7 @@
 				<block>
 					<t-table :headerBackgroundColor="'#F0F2F6'">
 
-						<t-tr header><t-th>时间</t-th><t-th>名称</t-th><t-th>制作单</t-th><t-th>商品数</t-th><t-th>使用花材</t-th></t-tr>
+						<t-tr header><t-th>时间</t-th><t-th>名称</t-th><t-th>任务</t-th><t-th>商品数</t-th><t-th>使用花材</t-th></t-tr>
 
 						<view v-for="(item, index) in statData" :key="index">
 							<t-tr>

hdApp/src/pages.json

@@ -14,7 +14,7 @@
 		{
 			"root": "admin/work",
 			"pages": [
-				{"path": "add","style": {"navigationBarTitleText": "新建制作单"}},
+				{"path": "add","style": {"navigationBarTitleText": "新建任务"}},
 				{"path": "statCat","style": {"navigationBarTitleText": "花束统计"}},
 				{"path": "statCatItem","style": {"navigationBarTitleText": "明细"}},
 				{"path": "addResult","style": {"navigationBarTitleText": "新建成功"}},
@@ -298,7 +298,8 @@
 				{"path": "cgStat","style": {"navigationBarTitleText": "采购统计"}},
 				{"path": "cgItem","style": {"navigationBarTitleText": "采购花材"}},
 				{"path": "mayPayStat","style": {"navigationBarTitleText": "应付款"}},
-				{"path": "kind","style": {"navigationBarTitleText": "花束统计"}}
+				{"path": "kind","style": {"navigationBarTitleText": "花束统计"}},
+				{"path": "kindLz","style": {"navigationBarTitleText": "绿植统计"}}
 			]
 		},
 		{