Skip to content

C
confucius
Commit 3f5481ce authored by zhengke's avatar zhengke
Browse files
Options

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

parents 88501c77 9b61f8da
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 19 deletions
src/components/sale/editOrder-form.vue
View file @ 3f5481ce
...@@ -25,16 +25,18 @@ ...@@ -25,16 +25,18 @@
<template v-if="modityOrderType==3"> <template v-if="modityOrderType==3">
<q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price" @blur="countPrice" class="col-12" <q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price" @blur="countPrice" class="col-12"
label="成交单价" :rules="[val => !!val || '请填成交单价']" /> label="成交单价" :rules="[val => !!val || '请填成交单价']" />
<q-input filled stack-label v-if="OrderMsg.OrderType==1" :dense="false" maxlength="10" @keyup.native="checkPrice(OrderMsg,'PreferPrice')" <q-input filled stack-label v-if="OrderMsg.OrderType==1" :dense="false" maxlength="10"
v-model="OrderMsg.PreferPrice" class="col-12 q-pb-lg" label="应收" /> @keyup.native="checkPrice(OrderMsg,'PreferPrice')" v-model="OrderMsg.PreferPrice" class="col-12 q-pb-lg"
label="应收" />
</template> </template>
<q-select :disable="modityOrderType==2" standout="bg-primary text-white" option-value="Id" option-label="Name" v-model="OrderMsg.OrderSource" <q-select :disable="modityOrderType==2" standout="bg-primary text-white" option-value="Id" option-label="Name"
:options="SourceEnumList" emit-value map-options class="q-pb-lg" label="客人来源" /> v-model="OrderMsg.OrderSource" :options="SourceEnumList" emit-value map-options class="q-pb-lg"
label="客人来源" />
<!--课程订单订单--> <!--课程订单订单-->
<template v-if="orderType==1||OrderMsg.OrderType==1"> <template v-if="orderType==1||OrderMsg.OrderType==1">
<q-select :disable="(modityOrderType==2)" v-model="OrderMsg.HelpEnterId" :options="EmployeeList" filled use-input label="协助人员" <q-select :disable="(modityOrderType==2)" v-model="OrderMsg.HelpEnterId" :options="EmployeeList" filled
option-label="EmployeeName" option-value="Id" ref="EmployeeName" class="col-6 q-pb-lg" emit-value use-input label="协助人员" option-label="EmployeeName" option-value="Id" ref="EmployeeName"
map-options @filter="filterFn"> class="col-6 q-pb-lg" emit-value map-options @filter="filterFn">
<template v-slot:no-option> <template v-slot:no-option>
<q-item> <q-item>
<q-item-section class="text-grey"> <q-item-section class="text-grey">
...@@ -43,13 +45,15 @@ ...@@ -43,13 +45,15 @@
</q-item> </q-item>
</template> </template>
</q-select> </q-select>
<q-input :disable="(modityOrderType==2)" v-if="OrderMsg.OrderSource==3" filled stack-label :dense="false" maxlength="50" <q-input :disable="(modityOrderType==2)" v-if="OrderMsg.OrderSource==3" filled stack-label :dense="false"
v-model="OrderMsg.GeneralOccupation" class="col-12 q-pb-lg" label="一般同行" /> 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" <q-input :disable="(modityOrderType==2)" v-if="OrderMsg.OrderSource==7" filled stack-label :dense="false"
v-model="OrderMsg.EduOccupation" class="col-12 q-pb-lg" label="教育同行" /> 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-toggle :disable="(modityOrderType==2)" v-model="OrderMsg.IsLessPrice" :false-value="0" :true-value="1"
<q-input :disable="(modityOrderType==2)" v-if="OrderMsg.IsLessPrice==1" @keyup.native="checkPrice(OrderMsg,'LessPrice')" maxlength="10" filled label="是否少价" class="q-mb-md" />
stack-label :dense="false" v-model="OrderMsg.LessPrice" class="col-12" label="少价金额" /> <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>
<!--留学就业订单--> <!--留学就业订单-->
<template v-if="orderType==2||OrderMsg.OrderType==2"> <template v-if="orderType==2||OrderMsg.OrderType==2">
...@@ -301,8 +305,10 @@ ...@@ -301,8 +305,10 @@
//修改订单 //修改订单
saveOrderInfo() { saveOrderInfo() {
if (this.OrderMsg.OrderType == 1) { if (this.OrderMsg.OrderType == 1) {
if (this.modityOrderType == 1 || this.modityOrderType == 2) {
this.OrderMsg.PreferPrice = (this.OrderMsg.GuestNum * this.OrderMsg.Unit_Price) - this.OrderMsg.LessPrice; this.OrderMsg.PreferPrice = (this.OrderMsg.GuestNum * this.OrderMsg.Unit_Price) - this.OrderMsg.LessPrice;
} }
}
setClassOrder(this.OrderMsg).then(res => { setClassOrder(this.OrderMsg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.$q.notify({ this.$q.notify({
......
src/pages/financial/financalDocument/InAndOutDdetails.vue
View file @ 3f5481ce
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<p class="f16 c11" style="margin-top: 25px">出库清单</p> <p class="f16 c11" style="margin-top: 25px">出库清单</p>
<div class="page-content" style="margin-top:10px"> <div class="page-content" style="margin-top:10px">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat <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"> :data="GetDetail.DetailList" :columns="columns" row-key="Id">
<template v-slot:body-cell-WareHouseName="props"> <template v-slot:body-cell-WareHouseName="props">
......
src/pages/financial/financalDocument/PropertyProcurementDetails.vue
View file @ 3f5481ce
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<p class="f16 c11" style="margin-top: 25px">资产清单</p> <p class="f16 c11" style="margin-top: 25px">资产清单</p>
<div class="page-content" style="margin-top:10px"> <div class="page-content" style="margin-top:10px">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat <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"> :data="GetDetail.DetailList" :columns="columns" row-key="Id">
<template v-slot:body-cell-EmName="props"> <template v-slot:body-cell-EmName="props">
......
src/pages/financial/financalDocument/SuppliesProcurementDetail.vue
View file @ 3f5481ce
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<p class="f16 c11" style="margin-top: 25px">资产清单</p> <p class="f16 c11" style="margin-top: 25px">资产清单</p>
<div class="page-content" style="margin-top:10px"> <div class="page-content" style="margin-top:10px">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat <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"> :data="GetDetail.DetailList" :columns="columns" row-key="Id">
<template v-slot:body-cell-EmName="props"> <template v-slot:body-cell-EmName="props">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment