Merge branch 'master' of git.huaml.com:zhh/front-end

ghsApp/src/admin/clear/customInfo.vue

@@ -9,6 +9,10 @@
 					<view>订单日期：</view>
 					<view>{{ detailInfo.addTime ? detailInfo.addTime.substr(5,11) : '' }}</view>
 				</view>
+				<view class="order-info_box">
+					<view>过期时间：</view>
+					<view>{{ detailInfo.addTime ? detailInfo.deadline.substr(5,11) : '' }}</view>
+				</view>
 				<view class="order-info_box">
 					<view>订单编码：</view>
 					<view>{{ detailInfo.orderSn }}</view>

hdPad/src/pages.json

@@ -1,6 +1,7 @@
 {
 	"pages": [
 		{"path": "pages/home/cash","style": {"navigationBarTitleText": "收银"}},
+		{"path": "pages/home/mt","style": {"navigationBarTitleText": "美团单"}},
 		{"path": "pages/home/work","style": {"navigationBarTitleText": "制作单"}},
 		{"path": "pages/home/modify","style": {"navigationBarTitleText": "修改"}},
 		{"path": "pages/home/make","style": {"navigationBarTitleText": "制作"}},

hdPad/src/pages/home/components/nav.vue

@@ -28,6 +28,7 @@ export default {
     return {
       nav: [
         { name: "开单", page: "/pages/home/cash",flag:'casher' },
+        { name: "美团单", page: "/pages/home/mt",flag:'mt' },
         { name: "制作单", page: "/pages/home/work",flag:'work' },
         { name: "选材制作", page: "/pages/home/make",flag:'selItem' },
         //{ name: "选品建单", page: "/pages/home/selectMake",flag:'selGoods' }

hdPad/src/pages/home/components/settlePop.vue

@@ -1,15 +1,23 @@
 <template>
     <view class="app-select_customer">
         <view class="select-left">
+
             <view class="select-item_box">
-                <view class="title">结账方式</view>
+                <view class="title">来源</view>
+                <view class="item-list_box">
+                    <view :key="item.id" @tap="changeFromType(item.id)" v-for="item in fromTypeList" :class="[form.fromType===item.id?'active':'']"> {{item.name}} </view>     
+                </view>
+            </view>
+
+            <view class="select-item_box">
+                <view class="title">付款类型</view>
                 <view class="item-list_box">
                     <view :key="item.id" @tap="changeHasPay(item.id)" v-for="item in hasPayList" :class="[form.hasPay===item.id?'active':'']"> {{item.name}} </view>    
                 </view>
             </view>
             
             <view class="select-item_box" v-if="form.hasPay == 1">
-                <view class="title">收款方式</view>
+                <view class="title">付款方式</view>
                 <view class="item-list_box">
                     <view :key="item.id" @tap="changePayWay(item.id)" v-for="item in payWayList" :class="[form.payWay===item.id?'active':'']"> {{item.name}} </view>  
                 </view>
@@ -86,14 +94,16 @@ export default {
                 remark:'',
                 sendCost:0,
                 modifyPrice:0,
-                getStaffName:''
+                getStaffName:'',
+                fromType:1
             },
             proceeds: '0',
-            hasPayList:[ { name:'待付款', id:0, }, { name:'已付款', id:1, }],
+            hasPayList:[ { name:'扫码', id:0, }, { name:'其它', id:1, }],
             payWayList:[ { name:'微信', id:0 }, { name:'支付宝', id:1 }, { name:'现金', id:4 }, { name:'银行卡', id:5 },{name:'其它',id:9} ],
             currentInputType:'proceeds',
             totalMoney: 0,
             needPrintList:[ { name:'不需要', id:2 },{ name:'需要', id:1 } ],
+            fromTypeList:[{name:'门店',id:1},{name:'美团',id:4}],
             getStaffList:[]
         };
     },
@@ -159,6 +169,9 @@ export default {
         changeHasPay(val){
             this.form.hasPay = val
         },
+        changeFromType(val){
+            this.form.fromType = val
+        },
         changeCheck(val){
             this.checkType = val
             this.fillType = val

hdPad/src/pages/home/components/workList.vue

@@ -38,6 +38,10 @@ export default {
 		customId: {
 			type: Number,
 			default: 0
+		},
+        mt: {
+			type: Number,
+			default: 0
 		}
     },
     data(){
@@ -108,7 +112,11 @@ export default {
             }
         },
         getWorkInfo(){
-            return getWorkList({page: this.list.page,status:this.status}).then(res=>{
+            let params = {page: this.list.page,status:this.status}
+            if(this.mt == 1){
+                params = {...params,fromType:4}
+            }
+            return getWorkList(params).then(res=>{
                 if(res.code == 1){
                     this.completes(res)
                     if(this.list.data && this.list.data[0]){

hdPad/src/pages/home/mt.vue

@@ -0,0 +1,86 @@
+<template>
+<view>
+    <view>
+        <view class="app-casher-area">
+            <view class="nav-left">
+                <casherNav navType="mt"></casherNav>
+            </view>
+            <view class="work-list">
+                <workList @getOrder="getOrder" mt="1"></workList>
+            </view>
+            <view class="work-info">
+                <workInfo ref="workInfoRef" :selectOrderId="selectOrderId" @calcFn="calcFn"></workInfo>
+            </view>
+        </view>
+    </view>
+</view>
+</template>
+<script>
+import { mapGetters } from "vuex";
+import productMins from "@/mixins/product";
+import casherNav from './components/nav.vue'
+import workList from './components/workList.vue'
+import workInfo from './components/workInfo.vue'
+export default {
+	name: "work",
+	components: {casherNav,workList,workInfo},
+	mixins: [productMins],
+	data() {
+		return {
+			currentJobType:'modify',
+			currentJobId:0,
+			selectOrderId:0,
+			modifyInfo:{hasModify:0}
+		}
+	},
+	computed: {
+		...mapGetters(["getLoginInfo"])
+	},
+	onShow() {
+		if(this.modifyInfo.hasModify && this.modifyInfo.hasModify == 1){
+			this.$refs.workInfoRef.getOrderDetail(this.selectOrderId)
+		}
+		// #ifdef APP-PLUS
+		this.listenScanItem()
+		// #endif
+	},
+	onHide(){
+		// #ifdef APP-PLUS
+		//避免重复，每次进来先移除全局自定义事件监听器
+		uni.$off('listenGetScanCode')
+		// #endif
+	},
+	onUnload() {
+		// #ifdef APP-PLUS
+		//避免重复，每次进来先移除全局自定义事件监听器
+		uni.$off('listenGetScanCode')
+		// #endif
+	},
+	methods: {
+		calcFn(val){
+			this.calc = val
+		},
+		getOrder(item){
+			this.selectOrderId = Number(item.id)
+			this.currentJobId = Number(item.id)
+			this.$refs.workInfoRef.getOrderDetail(this.selectOrderId)
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.app-casher-area {
+	display: flex;
+	height: 100vh;
+	& .nav-left {
+		flex: 5;
+		background-color: rgba(72, 91, 107, 1);
+	}
+	& .work-list {
+		flex: 32;
+	}
+    & .work-info{
+        flex: 89;
+    }
+}
+</style>