shish 3 лет назад
Родитель
Сommit
38300f7c7b

+ 4 - 4
hdPad/src/pages/home/components/nav.vue

@@ -30,10 +30,10 @@ export default {
       nav: [
       nav: [
         { name: "开单", page: "/pages/home/cash",flag:'casher' },
         { name: "开单", page: "/pages/home/cash",flag:'casher' },
         { name: "订单", page: "/pages/home/order",flag:'order' },
         { name: "订单", page: "/pages/home/order",flag:'order' },
-        { name: "制作", page: "/pages/home/make",flag:'selItem' },
-        { 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' },
+        { name: "现做", page: "/pages/home/work",flag:'work' },
+        { name: "美团", page: "/pages/home/mt",flag:'mt' },
+        { name: "散花", page: "/pages/home/sh",flag:'sh' }
         //{ name: "选品建单", page: "/pages/home/selectMake",flag:'selGoods' }
         //{ name: "选品建单", page: "/pages/home/selectMake",flag:'selGoods' }
       ],
       ],
       device:''
       device:''

+ 0 - 2
hdPad/src/pages/home/components/workInfo.vue

@@ -129,8 +129,6 @@
 
 
     <view class="button-area">
     <view class="button-area">
       <!-- <view :class="[orderInfo.status != 2 && orderInfo.stockLock==0 ? 'active' : '']" @click="lockFn(orderInfo)">锁定</view> -->
       <!-- <view :class="[orderInfo.status != 2 && orderInfo.stockLock==0 ? 'active' : '']" @click="lockFn(orderInfo)">锁定</view> -->
-      	<view class="active" @click="calcFn">{{calc == 'add' ? '+' : '-'}}</view>
-      <view :class="[orderInfo.status != 2 && orderInfo.stockLock==0 ? 'active' : '']" @click="modifyItem(orderInfo)">修改</view>
       <view :class="[orderInfo.status==0 ? 'active' : '']" @tap="finishFn(orderInfo)">完成</view>
       <view :class="[orderInfo.status==0 ? 'active' : '']" @tap="finishFn(orderInfo)">完成</view>
       <view :class="[orderInfo.status==1 ? 'active' : '']" @click="printFn(orderInfo)">打印</view>
       <view :class="[orderInfo.status==1 ? 'active' : '']" @click="printFn(orderInfo)">打印</view>
       <view :class="[orderInfo.status==0 ? 'active' : '']" @click="cancelFn(orderInfo)">取消</view>
       <view :class="[orderInfo.status==0 ? 'active' : '']" @click="cancelFn(orderInfo)">取消</view>

+ 1 - 2
hdPad/src/pages/home/make.vue

@@ -15,8 +15,7 @@
             <!-- 按钮操作 -->
             <!-- 按钮操作 -->
             <view class="open-box">
             <view class="open-box">
 				<view class="button-area">
 				<view class="button-area">
-					<view class="active" style="background-color:orange;color:white;border-color:orange;position:fixed;left:135upx;bottom:13upx;width:84upx;height:50upx;line-height:30upx;font-size:16upx;" 
-					@click="commit()">提交</view>
+					<view class="active" @click="commit()">打样</view>
 					<view class="active" @click="breakFn">拆散</view>
 					<view class="active" @click="breakFn">拆散</view>
 					<view class="active" @click="clearItemFn">清空</view>
 					<view class="active" @click="clearItemFn">清空</view>
 				</view>
 				</view>