开单优化

hdApp/src/admin/billing/affirm.vue

@@ -149,6 +149,12 @@
             <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="setSendType(3)" class="admin-button-com mini-btn" :class="form.sendType == 3 ? 'blue' : 'default'">物流</button>
           </tui-list-cell>
 
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.sendType == 1">
+            <view class="tui-title">取货状态</view>
+            <button @tap="form.getGoods = 1" class="admin-button-com middle" style="width:140upx;" :class="form.getGoods == 1? 'blue' : 'default'">已取货</button>
+            <button @click="form.getGoods = 0" class="admin-button-com middle" style="width:140upx;" :class="form.getGoods == 0 ? 'blue' : 'default'">未取货</button>
+          </tui-list-cell>
+
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.sendType == 2">
             <view class="tui-title">运费</view>
             <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder"/>
@@ -450,7 +456,7 @@ export default {
         sendSide: "2",
         sendDate: "",
         reachDate: "",
-		reachPeriod: "12:00",
+		    reachPeriod: "12:00",
         historyDate:"",
         sendCost: "",
         customId: "",
@@ -459,6 +465,7 @@ export default {
         remark:"",
         payWay:0,
         needPrint:2,
+        getGoods:1,
         hasPay:0,
         getStaffName:'',
         dealPrice:0,

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

@@ -8,8 +8,9 @@
                 </view>
                 <view v-if="Number(balance)>Number(form.modifyPrice)" style="color:blue;font-size:13upx;font-weight:bold;margin-bottom:7upx;">客户余额 ￥{{balance?parseFloat(balance):0}}，使用余额支付</view>
             </view>
-            <view class="select-item_box" v-if="form.hasPay == 1">
-                <view class="title">请选择</view>
+
+            <view class="select-item_box" v-if="form.hasPay == 1" style="border:1upx solid #CCCCCC;margin-bottom:15upx;">
+                <view class="title" style="margin-top:8upx;">请选择线下收款方式</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>
@@ -19,10 +20,33 @@
                 <view class="title" style="padding-left:60upx;" @click.stop="changeCheck(3)">
                     金额：<text :class="{selected:checkType == 3}">{{form.cash}}</text> 
                     <text style="margin-left:20upx;color:green;" v-if="Number(zl)>0">找零 {{zl}}</text>
-                    <text style="margin-left:20upx;color:red;" v-if="Number(zl)<0">还差 {{-zl}}</text>
+                    <text style="margin-left:20upx;color:red;" v-if="Number(zl)<0">还差 {{-zl}}，可以使用微信支付宝付款</text>
+                </view>
+            </view>
+            <view class="select-item_box">
+                <view class="title">打印小票</view>
+                <view class="item-list_box">
+                    <view :key="item.id" @tap="changeNeedPrint(item.id)" v-for="item in needPrintList" :class="[form.needPrint===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="changeSendType(item.id)" v-for="item in sendTypeList" :class="[form.sendType===item.id?'active':'']"> {{item.name}} </view>     
+                </view>
+            </view>
+            <view class="select-item_box" v-if="form.sendType == 1" style="border:1upx solid #CCCCCC;">
+                <view class="title" style="margin-top:8upx;">取货状态</view>
+                <view class="item-list_box">
+                    <view :key="item.id" @tap="changeGetGoods(item.id)" v-for="item in getGoodsList" :class="[form.getGoods===item.id?'active':'']"> {{item.name}} </view>     
+                </view>
+            </view>
+            <view class="select-item_box">
+                <view class="title">备注：</view>
+                <view class="inpup_box">
+                    <view><input type="text" v-model="form.remark" name="remark" /></view>
                 </view>
             </view>
-
             <view class="select-item_box">
                 <view class="title">开单人</view>
                 <view class="item-list_box">
@@ -37,13 +61,6 @@
                 </view>
             </view>
 
-            <view class="select-item_box">
-                <view class="title">打印小票</view>
-                <view class="item-list_box">
-                    <view :key="item.id" @tap="changeNeedPrint(item.id)" v-for="item in needPrintList" :class="[form.needPrint===item.id?'active':'']"> {{item.name}} </view>     
-                </view>
-            </view>
-
             <!--
             <view class="select-item_box" v-if="$util.isEmpty(groupInfo)">
                 <view class="title">如需保存此组合，请输入名称：</view>
@@ -53,13 +70,6 @@
             </view>
             -->
 
-            <view class="select-item_box">
-                <view class="title">备注：</view>
-                <view class="inpup_box">
-                    <view><input type="text" v-model="form.remark" name="remark" /></view>
-                </view>
-            </view>
-
         </view>
         <view class="line"></view>
         <view class="select-right">
@@ -138,6 +148,8 @@ export default {
                 hasPay: 0,
                 payWay:0,
                 needPrint:2,
+                sendType:1,
+                getGoods:1,
                 freight: '',
                 groupName:'',
                 remark:'',
@@ -149,7 +161,9 @@ export default {
                 shopAdminId:0,
                 shopAdminName:'',
                 cash:0,
-                dealPrice:0
+                dealPrice:0,
+                reachDate: "",
+		        reachPeriod: "12:00"
             },
             proceeds: '0',
             hasPayList:[ { name:'扫码', id:0, },{name:'余额',id:4},{ name:'赊账', id:2, },{ name:'线下', id:1, }],
@@ -157,6 +171,8 @@ export default {
             currentInputType:'proceeds',
             totalMoney: 0,
             needPrintList:[ { name:'不需要', id:2 },{ name:'需要', id:1 } ],
+            sendTypeList:[ { name:'自取', id:1 },{ name:'配送', id:0 },{ name:'跑腿', id:2},{ name:'物流', id:3}],
+            getGoodsList:[{name:'已取货',id:1},{name:'未取货',id:0}],
             getStaffList:[],
             shopAdminIdList:[],
             diffData:[],
@@ -225,6 +241,8 @@ export default {
                     this.form.sendCost = 0
                     this.form.labourCost = 0
                     this.form.dealPrice = 0
+                    this.form.sendType = 1
+                    this.form.getGoods = 1
 
                     //如果余额够使用余额支付
                     if(Number(this.balance)>Number(this.form.modifyPrice)){
@@ -301,6 +319,14 @@ export default {
             this.form.getStaffId = item.id
             this.form.getStaffName = item.name
         },
+        changeGetGoods(val){
+            this.$util.hitVoice()
+            this.form.getGoods = val
+        },
+        changeSendType(val){
+            this.$util.hitVoice()
+            this.form.sendType = val
+        },
         changeNeedPrint(val){
             this.$util.hitVoice()
             this.form.needPrint = val
@@ -421,10 +447,10 @@ export default {
 .app-select_customer {
     background-color: #ffffff;
     display: flex;
-    width:80vw;
+    width:90vw;
     height: 99vh;
     .select-left {
-        flex: 1;
+        flex: 4;
         padding: 10upx;
         overflow-y: auto;
         & .select-item_box {
@@ -489,7 +515,7 @@ export default {
         background-color: #eee;
     }
     .select-right {
-        flex: 1;
+        flex: 3;
         padding: 5upx 10upx 10upx 10upx;
         display: flex;
         flex-direction: column;