预订单日期

ghsApp/src/admin/billing/affirm.vue

@@ -171,6 +171,14 @@
             <text v-if="modifyPrice > 0 && modifyPrice < finalPrice" style="font-size:25upx;margin-left:20upx;color:green;">优惠 ¥{{parseFloat((finalPrice-modifyPrice).toFixed(2))}}</text>
           </tui-list-cell>
 
+					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
+						<view class="tui-title">{{ book == 1 ? '发货日期' : '配送日期'}}</view>
+						<picker mode="date" :value="form.sendTimeWant" @change="bindDateChange" style="width:400upx;">
+							<view class="uni-input" v-if="form.sendTimeWant==''" style="color:#CCCCCC;">请选择，默认当天</view>
+							<view class="uni-input">{{form.sendTimeWant}}</view>
+						</picker>
+					</tui-list-cell>
+
           <tui-list-cell class="line-cell" :arrow="true">
             <div class="tui-title">开单人</div>
             <picker mode="selector" :value="form.getStaffId" :range="staffList" range-key="name" @change="kdChange" class="tui-input" >
@@ -307,11 +315,14 @@ export default {
       isScanEnv:false,
       calc:'add',
       diffPriceList:[],
-      currentShop:{default:0}
+      currentShop:{default:0},
+      book:0
     };
   },
   onLoad (option) {
 
+    this.book = this.option.book ? this.option.book : 0
+
     this.kdType = option.kdType
 
     let that = this
@@ -433,6 +444,10 @@ export default {
   },
   methods: {
     ...mapActions(["initMerchantInfo"]),
+		bindDateChange(e){
+			let date = e.detail.value
+			this.form.sendTimeWant = date
+		},
     beginScan(){
       console.log('beginScan')
       let that = this

ghsApp/src/admin/order/statBook.vue

@@ -6,12 +6,10 @@
 			<AppSearchModule placeholder="输入拼音首字母搜索" @input="searchFn"/>
 		</view>
 		</view>
-
 		<view class="top-bar">
 			<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" />
 			<button class="admin-button-com mini-btn blue" style="margin-left:130upx;" @click="printOrder()">打印</button>
 		</view>
-
 		<scroll-view scroll-y scroll-with-animation class="main-view">
 			<view class="space-view ex-table">
 				<t-table :headerBackgroundColor="'#F0F2F6'">
@@ -165,7 +163,7 @@ export default {
 		left: 0;
 		display: flex;
 		width: 100%;
-		top:125upx;
+		top:120upx;
 		z-index: 20;
 		.bar{
 			width: 50%;
@@ -177,7 +175,7 @@ export default {
 		}
 	}
 	.main-view {
-		margin-top: 80upx;
+		margin-top:100upx;
 		flex: 1;
 		background-color: #f9fbfc;
 		.space-view {

hdApp/src/admin/billing/affirmGhs.vue

@@ -185,7 +185,7 @@
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
-						<view class="tui-title ">配送日期</view>
+						<view class="tui-title">配送日期</view>
 						<picker mode="date" :value="sendTimeWant" @change="bindDateChange" style="width:400upx;">
 							<view class="uni-input" v-if="sendTimeWant==''" style="color:#CCCCCC;">请选日期，默认当天</view>
 							<view class="uni-input">{{sendTimeWant}}</view>

hdApp/src/admin/billing/affirmGhsBook.vue

@@ -147,7 +147,7 @@
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
-						<view class="tui-title ">发货时间</view>
+						<view class="tui-title">发货日期</view>
 						<picker mode="date" :value="sendTimeWant" @change="bindDateChange" style="width:400upx;">
 							<view class="uni-input" v-if="sendTimeWant==''" style="color:#CCCCCC;">请选择，默认当天</view>
 							<view class="uni-input">{{sendTimeWant}}</view>