美团2

hdApp/src/admin/goods/list.vue

@@ -27,7 +27,7 @@
                   </view>
                   <view class="goods-det">
                     <view class="goods-det-top" style="margin-bottom:4upx;">
-                      <view class="goods-name" style="font-size:29upx;font-weight:bold;">{{ goodsItem.name||'' }}</view>
+                      <view class="goods-name" style="font-size:29upx;font-weight:bold;	overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:350upx;">{{ goodsItem.name||'' }}</view>
                     </view>
                     <view class="operate-wrap" style="margin-bottom:15upx;">
                       <view class="goods-price" style="font-size:23upx;">￥{{ goodsItem.price?parseFloat(goodsItem.price):0 }}</view>
@@ -35,7 +35,7 @@
                     <view class="operate-wrap">
                       <view style="font-size:23upx;">
                         <text>库存</text> <text style="font-weight:bold;margin-left:8upx;">{{goodsItem.stock}}</text>
-                        <text style="margin-left:12upx;color:#CCCCCC;">已售 {{ goodsItem.actualSold }}</text>
+                        <text style="margin-left:18upx;color:#CCCCCC;">已售 {{ goodsItem.actualSold }}</text>
                       </view>
                     </view>
                   </view>
@@ -112,12 +112,16 @@ export default {
   methods: {
 		moreToDo(item){
 			let that=this;
-			let doList = ['打1个标签', '打2个标签','打5个标签', '打10个标签','打20个标签']
+			let doList = ['打1个标签', '打2个标签','打5个标签', '打10个标签','设置为散花']
 			let doNum = [1,2,5,10,20]
 			uni.showActionSheet({
 				itemList: doList,
 				success: function (respond) {
 					let index = respond.tapIndex
+          if(index == 4){
+            that.$msg('开发中')
+            return
+          }
           let currentNum = Number(doNum[index])
           print({id:item.id,num:currentNum}).then(res=>{
             if(res.code == 1){

hdPad/src/manifest.json

@@ -2,9 +2,7 @@
     "name" : "花掌柜收银",
     "appid" : "__UNI__F6E7EA0",
     "description" : "花店管家婆",
-    "versionName" : "1.2.1",
-    "versionCode" : 121,
-    "transformPx" : true,
+    "versionCode" : 120,    "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {
         "usingComponents" : true,

hdPad/src/pages.json

@@ -3,6 +3,7 @@
 		{"path": "pages/home/cash","style": {"navigationBarTitleText": "收银"}},
 		{"path": "pages/home/order","style": {"navigationBarTitleText": "订单"}},
 		{"path": "pages/home/mt","style": {"navigationBarTitleText": "美团单"}},
+		{"path": "pages/home/sh","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

@@ -29,6 +29,7 @@ export default {
       nav: [
         { name: "开单", page: "/pages/home/cash",flag:'casher' },
         { name: "订单", page: "/pages/home/order",flag:'order' },
+        { name: "散花", page: "/pages/home/sh",flag:'sh' },
         { name: "美团单", page: "/pages/home/mt",flag:'mt' },
         { name: "门店单", page: "/pages/home/work",flag:'work' },
         { name: "预制作", page: "/pages/home/make",flag:'selItem' },

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

@@ -55,7 +55,11 @@ export default {
         mt: {
 			type: String,
 			default: 'no'
-		}
+		},
+        sh:{
+            type:Number,
+            default:0
+        }
     },
     data(){
         return {
@@ -163,7 +167,7 @@ export default {
             }
         },
         getWorkInfoList(type=0){
-            let params = {page: 1,pageSize:50,status:this.status,sn:this.sn,thirdSn:this.thirdSn,isCashier:1}
+            let params = {page: 1,pageSize:50,status:this.status,sn:this.sn,thirdSn:this.thirdSn,isCashier:1,sh:this.sh}
             if(this.mt == 'yes'){
                 params = {...params,fromType:4}
             }

hdPad/src/pages/home/sh.vue

@@ -0,0 +1,89 @@
+<template>
+<view>
+    <view>
+        <view class="app-casher-area">
+            <view class="nav-left">
+                <casherNav navType="sh"></casherNav>
+            </view>
+            <view class="work-list">
+                <workList ref="workListRef" @getOrderInfo="getOrderInfo" sh="1"></workList>
+            </view>
+            <view class="work-info">
+                <workInfo ref="workInfoRef" :selectOrderId="selectOrderId" @calcFn="calcFn" @finishNotice="finishNotice"></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: {
+		finishNotice(){
+			this.$refs.workListRef.refreshList()
+		},
+		calcFn(val){
+			this.calc = val
+		},
+		getOrderInfo(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>