预订

ghsApp/src/admin/billing/index.vue

@@ -126,7 +126,7 @@ import productMins from "@/mixins/product";
 import { getClassRemind,hasClassRemind } from "@/api/item-class";
 import { mapGetters } from "vuex";
 export default {
-	name: "Billing",
+	name: "index",
 	components: {
 		AppTabs,
 		AppSearchModule,
@@ -183,8 +183,13 @@ export default {
 		if (!this.$util.isEmpty(this.option.customId)){
 			this.selectJobId = this.option.customId
 		}
-
-		this.initData({requestType:'kd'})
+		let book = this.option.book ? this.option.book : 0
+		if(book == 0){
+			this.initData({requestType:'kd'})
+		}else{
+			this.checkStock = false
+			this.initData({requestType:'book'})
+		}
 
 		//提醒花材分类位置移动
 		getClassRemind().then(res=>{

ghsApp/src/admin/custom/selectCustom.vue

@@ -99,13 +99,14 @@ export default {
     },
     selectCurrent(item,scanEnv=0){
       let style = this.option.style ? this.option.style : 1
+      let book = this.option.book ? this.option.book : 0
       this.selectStyle = style
       if(style == 1){
         //选择客户并开单情况
         if(this.$util.isScanEnv() || scanEnv == 1){
-          this.$util.pageTo({url: '/admin/billing/affirm',type:2,query: {customId: item.id,customName:item.name}})
+          this.$util.pageTo({url: '/admin/billing/affirm='+item.id+'&customName='+item.name,type:2})
         }else{
-          this.$util.pageTo({url: '/admin/billing/index',type:2,query: {customId: item.id,customName:item.name}})
+          this.$util.pageTo({url: '/admin/billing/index?customId='+item.id+'&customName='+item.name+'&book='+book,type:2})
         }
       }else if(style == 2){
         //用于选择客户并且需要返回的情况

ghsApp/src/admin/home/components/OrderItem.vue

@@ -2,7 +2,7 @@
     <view  @click="pageTo({url:'/pagesOrder/detail',query: {id: item.id}})">
         <view class="order-top_box" style="position:relative;">
 
-        <image style="width:105upx;position:absolute;top:80upx;right:12upx;" v-if="currentStatus == 1"
+        <image style="width:105upx;position:absolute;top:80upx;right:12upx;" v-if="currentStatus == 1 && item.book == 0"
         @click.stop="pageTo({url:'/admin/billing/toPay',query: {orderId:item.id,orderSn:item.orderSn,actPrice:item.actPrice}})"
          mode="widthFix" :src="`${constant.imgUrl}/icon/codePay8.png`"></image>
 

ghsApp/src/admin/home/workbench.vue

@@ -60,41 +60,6 @@
 			</div>
 
 		</div>
-<template v-if="lookMoney == 1">
-		<div class="module-com order-wrap" @click="pageTo({url:'/admin/stat/kdIncome'})">
-			<div class="total-blo">
-				<div class="total-list2"> 
-					<div class="app-color-3">系统收款</div>
-					<div class="list-num">
-						<view>{{countStat.systemCount||0}}</view>
-						<view>{{countStat.systemIncome?parseFloat(countStat.systemIncome):0}}</view>
-					</div>
-				</div>
-				<div class="total-list2"> 
-					<div class="app-color-3">线下微信</div>
-					<div class="list-num">
-						<view>{{countStat.kfWxCount||0}}</view>
-						<view>{{countStat.kfWxIncome?parseFloat(countStat.kfWxIncome):0}}</view>
-					</div> 
-				</div>
-				<div class="total-list2"> 
-					<div class="app-color-3">现金</div>
-					<div class="list-num">
-						<view>{{countStat.cashCount||0}}</view>
-						<view>{{countStat.cashIncome?parseFloat(countStat.cashIncome):0}}</view>
-					</div> 
-				</div>
-				<div class="total-list2"> 
-					<div class="app-color-3">赊账</div>
-					<div class="list-num">
-						<view>{{countStat.debtCount||0}}</view>
-						<view>{{countStat.debtIncome?parseFloat(countStat.debtIncome):0}}</view>
-					</div> 
-				</div>
-			</div>
-		</div>
-
-	</template>
 
 		<!-- 消息 -->
 		<div class="module-com news-wrap">
@@ -115,7 +80,11 @@
 			<!-- 个人和花店开单 -->
 			<view class="tabs-head_bx">
 				<image @click="skKd()" :src="isScanEnv ? skSrc3 : skSrc" mode="widthFix"></image>
-				<image @click="customKd()" :src="isScanEnv ? pfSrc3 : pfSrc" mode="widthFix" ></image>				
+				<image @click="customKd()" :src="isScanEnv ? pfSrc3 : pfSrc" mode="widthFix" ></image>
+			</view>
+			<view class="tabs-head_bx">
+				<image @click="orderGather()" :src="ydhz" mode="widthFix" ></image>
+				<image @click="bookOrder()" :src="ydd" mode="widthFix"></image>
 			</view>
 			<view v-if="!$util.isEmpty(errorPirceList)" style="text-align:center;"><text @click="showErrorPriceFn" 
 				style="color:red;font-weight:bold;font-size:30upx;">【花材价格异常，点击查看】</text></view>
@@ -211,11 +180,12 @@ export default {
 			pfSrc: `${this.$constant.imgUrl}/ghs/home/pf.jpg`,
 			skSrc3: `${this.$constant.imgUrl}/ghs/home/sk33.jpg`,
 			pfSrc3: `${this.$constant.imgUrl}/ghs/home/pf3.jpg`,
+			ydd: `${this.$constant.imgUrl}/ghs/home/ydd.jpg`,
+			ydhz: `${this.$constant.imgUrl}/ghs/home/ydhz.jpg`,
 			isScanEnv:false,
 			isMini:0,
 			todayDebt:0,
 			totalDebt:0,
-			countStat:{systemIncome:0,systemCount:0,debtCount:0,debtIncome:0,kfWxCount:0,kfWxIncome:0},
 			overview:[],
 			//登录状态 0未登录 1登录
 			loginStyle :0,
@@ -342,7 +312,13 @@ export default {
 			})
 		},
 		customKd(){
-			this.pageTo({ url: '/admin/custom/selectCustom',query: {style:1}})
+			this.pageTo({ url: '/admin/custom/selectCustom?style=1'})
+		},
+		bookOrder(){
+			this.pageTo({ url: '/admin/custom/selectCustom?style=1&book=1'})
+		},
+		orderGather(){
+			this.pageTo({ url: '/admin/order/statBook'})
 		},
 		skKd(){
 			let that = this
@@ -371,12 +347,6 @@ export default {
 
 			let that = this
 
-			getStrokeCount().then(res=>{
-				if(res.code == 1){
-					this.countStat = res.data
-				}
-			})
-
 			getStat().then(res=>{
 				if(res.code == 1){
 					that.todayDebt = res.data.todayDebt ? parseFloat(res.data.todayDebt) : 0
@@ -607,7 +577,7 @@ export default {
 .tabs-head_bx {
 	display: flex;
 	align-items: center;
-	padding: 20upx 15upx 10upx 15upx;
+	padding: 0upx 15upx 0upx 15upx;
 }
 // tabs
 .tabs-wrap {