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

src/components/sale/quotation-form.vue

@@ -14,24 +14,24 @@
           <span style="font-size:12px;">报价单价格系统将进行自动计算，如需额外的优惠请创建报价单后进行申请</span>
         </div>
       </q-banner>
-      <div class="row">
+      <div class="row" style="margin-bottom:10px;">
         <div class="col q-mr-md">
-          <q-input standout bottom-slots v-model="model.Name" ref="Name" label="报价单名称" dense />
+          <q-input standout bottom-slots v-model="model.Name" filled ref="Name" label="报价单名称" dense />
         </div>
         <div class="col">
-          <q-select dense standout behavior="menu" v-model="model.CustomerSource" ref="CustomerSource"
+          <q-select dense standout behavior="menu" filled v-model="model.CustomerSource" ref="CustomerSource"
             :options="CustomerSources" option-label="name" option-value="id" label="客户来源" emit-value map-options
             :rules="[val => !!val || '请选择客户来源']" />
         </div>
       </div>
-      <div class="row">
+      <div class="row" style="margin-bottom:10px;">
         <div class="col q-mr-md">
-          <q-select dense standout behavior="menu" v-model="model.CustomerType" ref="CustomerType"
+          <q-select dense standout behavior="menu" filled v-model="model.CustomerType" ref="CustomerType"
             :options="CustomerTypes" option-label="name" option-value="id" label="客户类型" emit-value map-options
             @input="changeDiscountMoney" :rules="[val => !!val || '请选择客户类型']" />
         </div>
         <div class="col">
-          <q-input standout bottom-slots v-model="model.JoinNum" ref="JoinNum" label="报名人数" dense mask="#" fill-mask="0"
+          <q-input standout bottom-slots filled v-model="model.JoinNum" ref="JoinNum" label="报名人数" dense mask="#" fill-mask="0"
             reverse-fill-mask :rules="[val => !!val || '请输入报名人数']" @input="changeDiscountMoney">
             <template v-slot:append>
               <span style="font-size:14px;">人</span>
@@ -39,13 +39,13 @@
           </q-input>
         </div>
       </div>
-      <div class="row">
+      <div class="row" style="margin-bottom:10px;">
         <div class="col q-mr-md">
-          <q-input standout bottom-slots v-model="model.CustomerName" ref="CustomerName" label="客户姓名" dense
+          <q-input standout bottom-slots filled v-model="model.CustomerName" ref="CustomerName" label="客户姓名" dense
             :rules="[val => !!val || '请输入客户姓名']" />
         </div>
         <div class="col">
-          <q-input standout bottom-slots v-model="model.CustomerTel" label="客户电话" dense mask="#" reverse-fill-mask />
+          <q-input standout bottom-slots filled v-model="model.CustomerTel" label="客户电话" dense mask="#" reverse-fill-mask />
         </div>
       </div>
       <div class="text-subtitle2 text-weight-bold q-mb-md">
@@ -72,7 +72,7 @@
           />
         </div> -->
         <div class="col">
-          <q-select dense standout behavior="menu" v-model="chosenCourse" :options="courseOptions"
+          <q-select dense standout behavior="menu" filled v-model="chosenCourse" :options="courseOptions"
             @filter="filterCourseFn" input-debounce="0" use-input option-label="CourseName" option-value="CourseId"
             emit-value map-options :placeholder="!chosenCourse ? '添加客户需要的课程' : ''" clearable />
         </div>
@@ -113,7 +113,7 @@
       <div class="row">
         <div class="col q-mr-md"></div>
         <div class="col">
-          <q-input standout bottom-slots v-model="model.EffectiveEnd" ref="EffectiveEnd" label="报价有效期" dense mask="date"
+          <q-input standout bottom-slots filled v-model="model.EffectiveEnd" ref="EffectiveEnd" label="报价有效期" dense mask="date"
             class="cursor-pointer" readonly :rules="[val => !!val || '请选择有效日期']">
             <template v-slot:append>
               <q-icon name="event" class="cursor-pointer">