任务优化

hdApp/src/admin/order/workOrder.vue

@@ -15,6 +15,15 @@
           </picker>
         </tui-list-cell>
 
+        <tui-list-cell class="line-cell" :arrow="true">
+          <view class="tui-title">支数</view>
+          <picker mode="selector" :value="form.flowerNum" :range="flowerNumList" range-key="num" @change="changeNumFn" class="tui-input" >
+            <input v-model="form.flowerNum" name="flowerNum" type="text" hidden />
+            <view v-if="form.flowerNum" style="height:45upx;" >{{ numSelectedData.name }}</view>
+            <view class="tui-placeholder" style="height:45upx;" v-else>请选择</view>
+          </picker>
+        </tui-list-cell>
+
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
             <view class="tui-title">单价</view>
             <input type="digit" @focus="goodsPrice=''" :focus="true" v-model="goodsPrice" placeholder-class="tui-placeholder"/>
@@ -22,10 +31,16 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">数量</view>
-          <input v-model="form.num" placeholder-class="phcolor" style="width:210upx;" class="tui-input" name="num" @focus="form.num=''" placeholder="请填写数量" maxlength="50" type="number" />
+          <input v-model="form.num" placeholder-class="phcolor" style="width:260upx;" class="tui-input" name="num" @focus="form.num=''" placeholder="请填写数量" maxlength="50" type="number" />
           <text style="color:#3385FF;font-weight:bold;">合计 ¥<text>{{orderTotalPrice}}</text></text>
         </tui-list-cell>
 
+          <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>
+          </tui-list-cell>
+
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 3">
             <view class="tui-title">收款方式</view>
             <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">已收款</button>
@@ -40,12 +55,6 @@
             </picker>
           </tui-list-cell>
 
-          <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>
-          </tui-list-cell>
-
         </view>
 
         <view class="module-com input-line-wrap goods-wrap">
@@ -99,7 +108,7 @@ export default {
         kindId:'',
         cover:[],
         num:1,
-        flowerNum:''
+        flowerNum:0
       },
       goodsPrice:'',
 			payWayindex:0,
@@ -107,7 +116,9 @@ export default {
       kindListData:[],
       kindSelectedData:{},
       currentImgData:[],
-      dj:''
+      dj:'',
+      numSelectedData:{num:0,name:0},
+      flowerNumList:[{num:0,name:'支数'},{num:6,name:6},{num:9,name:9},{num:11,name:11},{num:19,name:19},{num:33,name:33},{num:52,name:52},{num:66,name:66},{num:99,name:99}]
     };
   },
   onLoad (option) {
@@ -166,6 +177,10 @@ export default {
         }
       });
     },
+    changeNumFn(e){
+        this.numSelectedData = this.flowerNumList[e.detail.value]
+        this.form.flowerNum = this.numSelectedData.num
+    },
     changeKindFn(e) {
         this.kindSelectedData = this.kindListData[e.detail.value];
         this.form.kindId = this.kindSelectedData.id;
@@ -223,7 +238,7 @@ export default {
       that.$util.confirmModal({content:'确认提交？'},() => {
           uni.showLoading({mask:true})
           let name = that.kindSelectedData.name ? that.kindSelectedData.name : ''
-          createOrder({...that.form,unitGoodsPrice:this.goodsPrice,modifyPrice:modifyPrice,dj:this.dj,name:name}).then((res) => {
+          createOrder({...that.form,unitGoodsPrice:this.goodsPrice,modifyPrice:modifyPrice,dj:this.dj,name:name,kindName:name}).then((res) => {
             uni.hideLoading()
             that.pageTo({url: '/admin/order/workOrderResult',type:2,query:{id:res.data.id}})
           })

hdApp/src/components/app-delivery.vue

@@ -3,19 +3,6 @@
 
     <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:160upx;" class="tui-input" name="bookName" placeholder="请填写姓名" />
-        <button class="admin-button-com default mini-btn" @click="form.bookName='无'" style="margin-right:10upx;">填"无"</button>
-        <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>
@@ -42,9 +29,20 @@
           </tui-list-cell>
       </template>
 
+      <tui-list-cell class="line-cell" :hover="false">
+        <view class="tui-title red">订花人姓名</view>
+        <input v-model="form.bookName" placeholder-class="phcolor" placeholder-style="color:#ccc;" style="width:282upx;" class="tui-input" name="bookName" placeholder="请填写姓名" />
+        <button class="admin-button-com default mini-btn" @click="form.bookName='游客'" style="margin-right:10upx;">填"游客"</button>
+      </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>
+
       <tui-list-cell class="line-cell" :hover="false">
         <view class="tui-title">贺卡内容</view>
-        <input v-model="form.cardInfo" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="cardInfo" placeholder="选填项" />
+        <input v-model="form.cardInfo" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="cardInfo" placeholder="选填" />
       </tui-list-cell>
 
       <template v-if="form.sendType != 1">
@@ -56,7 +54,7 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">收花人手机号</view>
+          <view class="tui-title">收花人手机</view>
           <input v-model="form.receiveMobile" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" type="number" name="receiveMobile" placeholder="请填写手机号" />
         </tui-list-cell>
 
@@ -72,8 +70,8 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">门牌号</view>
-          <input v-model="form.floor" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="floor" placeholder="楼号门牌号（选填）" />
+          <view class="tui-title">楼号门牌号</view>
+          <input v-model="form.floor" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="floor" placeholder="选填" />
         </tui-list-cell>
 
       </template>
@@ -127,7 +125,6 @@ export default {
   props: {},
   data() {
     return {
-      fillMobile:0,
       region: [],
       showRegion: false,
       form: {
@@ -178,9 +175,6 @@ export default {
 
   },
   methods: {
-    changeFillMobile(){
-      this.fillMobile = this.fillMobile == 0 ? 1 : 0
-    },
     bindTimeChange(event){
       let val = event.detail.value
       let before = Number(val[0])