新增预订

ghsApp/src/admin/billing/index2.vue

@@ -177,12 +177,17 @@ export default {
 			this.globalCustomId = this.option.customId
 		}
 		let book = this.option.book ? this.option.book : 0
+		let getAll = this.option.getAll ? this.option.getAll : 0
 		if(book == 0){
 			this.globalRequestType = 'kd'
 			this.initData()
 		}else{
 			this.globalCheckStock = false
-			this.globalRequestType = 'kd'
+			if(getAll == 1){
+				this.globalRequestType = 'book'
+			}else{
+				this.globalRequestType = 'kd'
+			}
 			this.initData()
 		}
 	},

ghsApp/src/admin/custom/selectCustom.vue

@@ -114,13 +114,15 @@ export default {
     selectCurrent(item,scanEnv=0){
       let style = this.option.style ? this.option.style : 1
       let book = this.option.book ? this.option.book : 0
+      //显示所有花材，包括没库存的花材
+      let getAll = this.option.getAll ? this.option.getAll : 0
       this.selectStyle = style
       if(style == 1){
         //选择客户并开单情况
         if(this.$util.isScanEnv() || scanEnv == 1){
           this.$util.pageTo({url: '/admin/billing/affirm='+item.id+'&customName='+item.name,type:2})
         }else{
-          this.$util.pageTo({url: '/admin/billing/index2?customId='+item.id+'&customName='+item.name+'&book='+book,type:2})
+          this.$util.pageTo({url: '/admin/billing/index2?customId='+item.id+'&customName='+item.name+'&book='+book+'&getAll='+getAll,type:2})
         }
       }else if(style == 2){
         //用于选择客户并且需要返回的情况

ghsApp/src/admin/home/me.vue

@@ -47,8 +47,7 @@
             <view class="info-lf_box">
               <view>
                 账户余额（元）
-                <text style="float:right;font-size:28upx;" @click.stop="suggest()">联系客服</text>
-                <text style="float:right;margin-right:25upx;font-size:28upx;font-weight:bold;" @click.stop="callFast(1)">紧急电话</text>
+                <text style="float:right;margin-right:25upx;font-size:28upx;" @click.stop="callFast(1)">紧急客服电话</text>
               </view>
               <view> <text>¥ </text> {{ myInfo.balance||0 }} </view>
               <view>
@@ -63,7 +62,10 @@
 
         <view class="account-info_box content_box">
           <view class="info-lf_box">
-            <view> 现金（元） </view>
+            <view>
+              现金（元）
+              <text style="float:right;margin-right:25upx;font-size:28upx;" @click.stop="callFast(1)">紧急客服电话</text>
+            </view>
             <view> <text>¥ </text> {{ myInfo.money||0 }} </view>
             <view>
               <text class="to-cash" @click="pageTo({ url: '/admin/shopMoneyChange/list' })" style="margin-left:0upx;">变动明细</text>