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

src/components/sale/editOrder-form.vue

@@ -25,16 +25,18 @@
         <template v-if="modityOrderType==3">
           <q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price" @blur="countPrice" class="col-12"
             label="成交单价" :rules="[val => !!val || '请填成交单价']" />
-          <q-input filled stack-label v-if="OrderMsg.OrderType==1" :dense="false" maxlength="10" @keyup.native="checkPrice(OrderMsg,'PreferPrice')"
-            v-model="OrderMsg.PreferPrice" class="col-12 q-pb-lg" label="应收" />
+          <q-input filled stack-label v-if="OrderMsg.OrderType==1" :dense="false" maxlength="10"
+            @keyup.native="checkPrice(OrderMsg,'PreferPrice')" v-model="OrderMsg.PreferPrice" class="col-12 q-pb-lg"
+            label="应收" />
         </template>
-        <q-select :disable="modityOrderType==2" standout="bg-primary text-white" option-value="Id" option-label="Name" v-model="OrderMsg.OrderSource"
-          :options="SourceEnumList" emit-value map-options class="q-pb-lg" label="客人来源" />
+        <q-select :disable="modityOrderType==2" standout="bg-primary text-white" option-value="Id" option-label="Name"
+          v-model="OrderMsg.OrderSource" :options="SourceEnumList" emit-value map-options class="q-pb-lg"
+          label="客人来源" />
         <!--课程订单订单-->
         <template v-if="orderType==1||OrderMsg.OrderType==1">
-          <q-select :disable="(modityOrderType==2)" v-model="OrderMsg.HelpEnterId" :options="EmployeeList" filled use-input label="协助人员"
-            option-label="EmployeeName" option-value="Id" ref="EmployeeName" class="col-6 q-pb-lg" emit-value
-            map-options @filter="filterFn">
+          <q-select :disable="(modityOrderType==2)" v-model="OrderMsg.HelpEnterId" :options="EmployeeList" filled
+            use-input label="协助人员" option-label="EmployeeName" option-value="Id" ref="EmployeeName"
+            class="col-6 q-pb-lg" emit-value map-options @filter="filterFn">
             <template v-slot:no-option>
               <q-item>
                 <q-item-section class="text-grey">
@@ -43,17 +45,19 @@
               </q-item>
             </template>
           </q-select>
-          <q-input :disable="(modityOrderType==2)" v-if="OrderMsg.OrderSource==3" filled stack-label :dense="false" maxlength="50"
-            v-model="OrderMsg.GeneralOccupation" class="col-12 q-pb-lg" label="一般同行" />
-          <q-input :disable="(modityOrderType==2)" v-if="OrderMsg.OrderSource==7" filled stack-label :dense="false" maxlength="50"
-            v-model="OrderMsg.EduOccupation" class="col-12 q-pb-lg" label="教育同行" />
-          <q-toggle :disable="(modityOrderType==2)" v-model="OrderMsg.IsLessPrice" :false-value="0" :true-value="1" label="是否少价" class="q-mb-md" />
-          <q-input :disable="(modityOrderType==2)" v-if="OrderMsg.IsLessPrice==1" @keyup.native="checkPrice(OrderMsg,'LessPrice')" maxlength="10" filled
-            stack-label :dense="false" v-model="OrderMsg.LessPrice" class="col-12" label="少价金额" />
+          <q-input :disable="(modityOrderType==2)" v-if="OrderMsg.OrderSource==3" filled stack-label :dense="false"
+            maxlength="50" v-model="OrderMsg.GeneralOccupation" class="col-12 q-pb-lg" label="一般同行" />
+          <q-input :disable="(modityOrderType==2)" v-if="OrderMsg.OrderSource==7" filled stack-label :dense="false"
+            maxlength="50" v-model="OrderMsg.EduOccupation" class="col-12 q-pb-lg" label="教育同行" />
+          <q-toggle :disable="(modityOrderType==2)" v-model="OrderMsg.IsLessPrice" :false-value="0" :true-value="1"
+            label="是否少价" class="q-mb-md" />
+          <q-input :disable="(modityOrderType==2)" v-if="OrderMsg.IsLessPrice==1"
+            @keyup.native="checkPrice(OrderMsg,'LessPrice')" maxlength="10" filled stack-label :dense="false"
+            v-model="OrderMsg.LessPrice" class="col-12" label="少价金额" />
         </template>
         <!--留学就业订单-->
         <template v-if="orderType==2||OrderMsg.OrderType==2">
-          <q-select  standout="bg-primary text-white" option-value="Id" class="q-pb-lg" option-label="Name"
+          <q-select standout="bg-primary text-white" option-value="Id" class="q-pb-lg" option-label="Name"
             v-model="OrderMsg.OrderNature" :options="OrderStatus" emit-value map-options label="订单性质"
             @input="OrderNatureChange" />
           <template v-if="OrderMsg.OrderNature==1">
@@ -301,7 +305,9 @@
       //修改订单
       saveOrderInfo() {
         if (this.OrderMsg.OrderType == 1) {
-          this.OrderMsg.PreferPrice = (this.OrderMsg.GuestNum * this.OrderMsg.Unit_Price) - this.OrderMsg.LessPrice;
+          if (this.modityOrderType == 1 || this.modityOrderType == 2) {
+            this.OrderMsg.PreferPrice = (this.OrderMsg.GuestNum * this.OrderMsg.Unit_Price) - this.OrderMsg.LessPrice;
+          }
         }
         setClassOrder(this.OrderMsg).then(res => {
           if (res.Code == 1) {

src/pages/financial/financalDocument/InAndOutDdetails.vue

@@ -60,7 +60,7 @@
             <p class="f16 c11" style="margin-top: 25px">出库清单</p>
         <div class="page-content" style="margin-top:10px">
             <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat 
-                class="sticky-right-column-table sticky-column-table" separator="none" hide-bottom
+                class="sticky-right-column-table sticky-column-table" separator="cell" hide-bottom
                 :data="GetDetail.DetailList" :columns="columns" row-key="Id">
         
                 <template v-slot:body-cell-WareHouseName="props">

src/pages/financial/financalDocument/PropertyProcurementDetails.vue

@@ -85,7 +85,7 @@
             <p class="f16 c11" style="margin-top: 25px">资产清单</p>
         <div class="page-content" style="margin-top:10px">
             <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat 
-                class="sticky-right-column-table sticky-column-table" separator="none" hide-bottom
+                class="sticky-right-column-table sticky-column-table" separator="cell" hide-bottom
                 :data="GetDetail.DetailList" :columns="columns" row-key="Id">
         
                 <template v-slot:body-cell-EmName="props">

src/pages/financial/financalDocument/SuppliesProcurementDetail.vue

@@ -71,7 +71,7 @@
             <p class="f16 c11" style="margin-top: 25px">资产清单</p>
         <div class="page-content" style="margin-top:10px">
             <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat 
-                class="sticky-right-column-table sticky-column-table" separator="none" hide-bottom
+                class="sticky-right-column-table sticky-column-table" separator="cell" hide-bottom
                 :data="GetDetail.DetailList" :columns="columns" row-key="Id">
         
                 <template v-slot:body-cell-EmName="props">