数量

hdApp/src/admin/order/workOrder.vue

@@ -16,11 +16,11 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :arrow="true">
-          <view class="tui-title">单份支数</view>
+          <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>
+            <view class="tui-placeholder" style="height:45upx;" v-else>请选择支数</view>
           </picker>
         </tui-list-cell>
 
@@ -118,7 +118,7 @@ export default {
       currentImgData:[],
       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}]
+      flowerNumList:[{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) {
@@ -227,14 +227,19 @@ export default {
           return false
         }
       }
+      if(this.$util.isEmpty(this.form.flowerNum) || Number(this.form.flowerNum)<=0){
+          this.$msg('请选择每份用材数量')
+          return false
+      }
+      if(this.$util.isEmpty(this.$refs.appDelivery.form.bookName)){
+          this.$msg('请填写订花人姓名')
+          return false
+      }
       let modifyPrice = Number(this.goodsPrice)*Number(this.form.num)
       modifyPrice = modifyPrice.toFixed(2)
-      //这里前后顺序有影响哦
+      //这里前后顺序有影响哦，不要随意调动
       that.form = {...that.form,...that.$refs.appDelivery.form}
-      // if(this.$util.isEmpty(that.form.bookName)){
-      //   this.$msg('请填写订花人姓名')
-      //   return false       
-      // }
+
       that.$util.confirmModal({content:'确认提交？'},() => {
           uni.showLoading({mask:true})
           let name = that.kindSelectedData.name ? that.kindSelectedData.name : ''