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

+ 4 - 3
hdApp/src/admin/order/workOrder.vue

@@ -32,19 +32,20 @@
         </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 3">
-            <view class="tui-title">付款方式</view>
+            <view class="tui-title">付款类型</view>
             <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">已付款</button>
+            <button @tap="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">欠款</button>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1 && form.fromType == 3">
-            <view class="tui-title">付款选项</view>
+            <view class="tui-title">付款方式</view>
             <picker mode="selector" :value="form.payWay" :range="payWayList" range-key="name" @change="payWayChange" class="tui-input" >
               <input v-model="form.payWay" name="payWay" type="text" hidden />
               <view style="padding:6upx 0 6upx 0;">{{payWayList[payWayindex].name}}</view>
             </picker>
           </tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 3">
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 3 && form.hasPay == 1">
             <view class="tui-title">订金</view>
             <input type="digit" @focus="dj=''" style="width:210upx;" v-model="dj" placeholder-class="tui-placeholder"/>
             <text style="color:red;font-weight:bold;" v-if="Number(debtFinalPrice)>0">尾款 ¥<text>{{debtFinalPrice}}</text></text>

+ 17 - 10
hdApp/src/components/app-delivery.vue

@@ -3,6 +3,19 @@
 
     <view class="module-com">
 
+      <tui-list-cell class="line-cell" :hover="false">
+        <view class="tui-title">订花人姓名</view>
+        <input v-model="form.bookName" placeholder-class="phcolor" placeholder-style="color:#ccc;" style="width:285upx;" class="tui-input" name="bookName" placeholder="请填写姓名" />
+
+        <button class="admin-button-com default mini-btn" @click="changeFillMobile">填手机号</button>
+
+      </tui-list-cell>
+
+      <tui-list-cell class="line-cell" :hover="false" v-if="fillMobile==1">
+        <view class="tui-title">订花人手机号</view>
+        <input v-model="form.bookMobile" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" type="number" name="bookMobile" placeholder="请填写手机号" />
+      </tui-list-cell>
+
       <tui-list-cell class="line-cell" :hover="false">
         <view class="tui-title">配送方式</view>
         <button @tap="form.sendType = 3" class="admin-button-com middle" :class="form.sendType == 3 ? 'blue' : 'default'">骑手送</button>
@@ -34,16 +47,6 @@
         <input v-model="form.cardInfo" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="cardInfo" placeholder="选填项" />
       </tui-list-cell>
 
-      <tui-list-cell class="line-cell" :hover="false">
-        <view class="tui-title">订花人姓名</view>
-        <input v-model="form.bookName" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="bookName" placeholder="请填写" />
-      </tui-list-cell>
-
-      <tui-list-cell class="line-cell" :hover="false">
-        <view class="tui-title">订花人手机号</view>
-        <input v-model="form.bookMobile" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" type="number" name="bookMobile" placeholder="请填写手机号" />
-      </tui-list-cell>
-
       <template v-if="form.sendType != 1">
 
 
@@ -126,6 +129,7 @@ export default {
   props: {},
   data() {
     return {
+      fillMobile:0,
       region: [],
       showRegion: false,
       form: {
@@ -176,6 +180,9 @@ export default {
 
   },
   methods: {
+    changeFillMobile(){
+      this.fillMobile = this.fillMobile == 0 ? 1 : 0
+    },
     bindTimeChange(event){
       let val = event.detail.value
       let before = Number(val[0])

+ 2 - 6
hdApp/src/components/app-form-send.vue

@@ -22,13 +22,9 @@
 				<view v-else class="tui-placeholder">请选择快递公司</view>
 				<input name="sendSide" hidden />
 			</picker>
-			<!-- <view v-if="formData.sendSide" class="tui-input">
-				{{ getCurSideName }}
-			</view>
-			<view v-else class="tui-placeholder" @click="">请选择快递公司</view>
-			<input name="sendSide" hidden /> -->
+
 		</tui-list-cell>
-		<!-- 门店送或快递送需要设置地址 -->
+
 		<appAddressGroup
 			v-if="formData.sendType == 2 || formData.sendType == 3"
 			cityTitle="配送城市"