Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/sale/editOrder-form.vue

@@ -10,7 +10,7 @@
       <div style="padding:20px 15px;">
         <q-input filled stack-label maxlength="100" :dense="false" v-model="OrderMsg.GuestNum" type="number"
           @input="countPrice" class="col-12" label="人数" :rules="[val => !!val || '请填写人数']"
-          :disable="modityOrderType!=1 " />
+          :disable="modityOrderType==2" />
 
         <template v-if="modityOrderType==1">
           <q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price"