利润

ghsApp/src/manifest.json

@@ -58,7 +58,7 @@
                     "entitlements" : {
                         "com.apple.developer.associated-domains" : [ "applinks:fronttg.wixhb.com" ]
                     }
-                }
+                }          
             },
             /* SDK配置 */
             "sdkConfigs" : {

hdApp/src/admin/home/apply.vue

@@ -41,7 +41,7 @@ export default {
             title:'商品',
             list:[
                 { name: "商品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1},
-                { name: "分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/category",pf:1},
+                { name: "商城分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/category",pf:1},
                 { name: "种类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/kind",pf:1},
                 { name: "涨价设置", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/price-increase",pf:1},
                 { name: "运费规则", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/freight",pf:1},
@@ -51,7 +51,7 @@ export default {
         {
           title: '制作',
           list: [
-            { name: "制作记录", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1},
+            { name: "制作", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1},
             { name: "制作统计", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/statCat",pf:1},
             { name: "制作设置", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/set",pf:1},
           ]
@@ -75,7 +75,7 @@ export default {
           title: '数据统计',
           list: [
             {name: "利润表",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/profit",pf:1},
-            {name: "收入渠道",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/kdIncome",pf:1},
+            {name: "收入统计",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/kdIncome",pf:1},
             {name: "花材销量",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/productSale",pf:1},
             // {name: "客户下单榜",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/customSale",pf:1},
             {name: "采购统计",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/cgStat",pf:1},

hdApp/src/admin/home/workbench.vue

@@ -179,7 +179,7 @@ export default {
         { name: "会员码", img: `${this.$constant.imgUrl}/ghs/home/shop.png`, url: "/admin/cg/member",pf:1},
         { name: "花材", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/item/list",pf:1 },
         { name: "改价", img: `${this.$constant.imgUrl}/ghs/home/gj.png`, url: "/admin/changePrice/list",pf:1},
-        { name: "制作记录", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1 },
+        { name: "制作", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1 },
         { name: "供货商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:1 },
         { name: "拆散", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/part/list",pf:1},
         { name: "损耗", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1},

hdApp/src/admin/stat/profit.vue

@@ -8,31 +8,39 @@
 			<view class="space-view ex-table">
 				<block>
 					<t-table :headerBackgroundColor="'#F0F2F6'">
-
 						<t-tr header>
 							<t-th>类型</t-th>
 							<t-th>金额</t-th>
 							<t-th>操作</t-th>
 						</t-tr>
-
 						<t-tr v-for="(item, inIndex) in profit.income" :key="inIndex">
-							<t-td><view>{{item.name}}</view></t-td>
-							<t-td><view>{{item.amount}}</view></t-td>
-							<t-td><view></view></t-td>
+							<t-td><view style="color:black;font-size:30upx;">{{item.name}}</view></t-td>
+							<t-td><view style="color:black;font-size:30upx;">{{item.amount}}</view></t-td>
+							<t-td><view>-</view></t-td>
 						</t-tr>
 						<!--同个节点v-for key重复会报错，所以再包一层-->
 						<view>
 							<t-tr v-for="(item, exIndex) in profit.expend" :key="exIndex">
-								<t-td><view>{{item.name}}</view></t-td>
-								<t-td v-if="item.amount==0"><view>0</view></t-td>
-								<t-td v-else><view>-{{item.amount}}</view></t-td>
-								<t-td><view></view></t-td>
+								<t-td><view style="color:black;font-size:30upx;">{{item.name}}</view></t-td>
+								<t-td v-if="item.amount==0"><view style="color:black;font-size:30upx;">0</view></t-td>
+								<t-td v-else><view style="color:black;font-size:30upx;">-{{item.amount}}</view></t-td>
+								<t-td><view>-</view></t-td>
 							</t-tr>
-							</view>
+						</view>
 						<t-tr>
-							<t-td align="center"><view style="font-weight:bold;color:black;">合计：{{profit.balance||0}}</view></t-td>
+							<t-td align="center">
+								<view style="font-weight:bold;color:black;font-size:32upx;">利润 ¥{{profit.balance||0}}</view>
+							</t-td>
 						</t-tr>
-
+						<block v-if="profit.wastagePrice && Number(profit.wastagePrice)>0">
+							<t-tr>
+								<t-td align="center">
+									<view style="font-weight:bold;color:red;font-size:30upx;">
+										由于花材损耗，少赚了 ¥{{profit.wastagePrice||0}}
+									</view>
+								</t-td>
+							</t-tr>
+						</block>
 					</t-table>
 				</block>
 			</view>
@@ -64,26 +72,6 @@ export default {
 			showTimeDropdown: false,
 			nowShop: "",
 			showShopDropdown: false,
-			columns: [
-				{
-					name: "姓名",
-					dataIndex: "name",
-					color: "info"
-				},
-				{
-					name: "开单额",
-					dataIndex: "amount",
-					color: "info",
-					width: 120,
-					align: "center"
-				},
-				{
-					name: "开单数",
-					dataIndex: "num",
-					color: "info",
-					align: "center"
-				}
-			],
 			dataList: [],
 			params:{
 				itemId: '',

hdApp/src/components/module/dateSelect.vue

@@ -12,6 +12,13 @@
         <view v-if="dropdownShow" :style="{top}" class="select-fixed_bx">
             <slot>
 
+                <view class="select-item-box">
+                    <view class="title">选日期</view>
+                    <view class="item-child_box" >
+                        <view class="admin-button-com mini-btn default custom" @click="showDatePicker(2)">{{startDate || '选择日期'}}</view>
+                    </view>
+                </view>
+
                 <view class="select-item-box">
                     <view class="title">按月份</view>
                     <picker mode="date" :value="date" :start="startDate" :end="endDate" fields="month" @change="bindMonthChange" >
@@ -127,12 +134,18 @@ export default {
             this.dateIndex = index
         },
         confirmPicker(e) {//选择
-             if(this.dateIndex == 0){
+            this.showPicker = false;
+            if(this.dateIndex == 0){
+                this.startDate = e.value
+            }else if(this.dateIndex == 1){
+                this.endDate = e.value
+            }else if(this.dateIndex == 2){
                 this.startDate = e.value
-             }else{
                 this.endDate = e.value
-             }
-             this.showPicker = false;
+                this.customDateConfirm()
+            }else{
+                this.endDate = e.value
+            }
         },
         customDateConfirm() {
             if(this.$util.isEmpty(this.startDate)){

hdApp/src/pages.json

@@ -283,7 +283,7 @@
 			"pages": [
 				{"path": "profit","style": {"navigationBarTitleText": "利润表"}},
 				{"path": "productSale","style": {"navigationBarTitleText": "花材销量"}},
-				{"path": "kdIncome","style": {"navigationBarTitleText": "收入渠道"}},
+				{"path": "kdIncome","style": {"navigationBarTitleText": "收入统计"}},
 				{"path": "incomeStat","style": {"navigationBarTitleText": "应收款"}},
 				{"path": "cgStat","style": {"navigationBarTitleText": "采购统计"}},
 				{"path": "cgItem","style": {"navigationBarTitleText": "采购花材"}},