Skip to content

E
ElectricitySheep
Commit b53f0116 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

1

parent 0e61ae37
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 14 deletions
src/components/UserMan/tinyMerchant/tinyMerchantSet.vue
View file @ b53f0116
......@@ -12,12 +12,12 @@
<div>
<el-form-item label="是否开开启">
<el-radio v-model="addMsg.IsOpen" :label="1">开启</el-radio>
<el-radio v-model="addMsg.IsOpen" :label="2" @change="addMsg.CustomMinPriceRate = 0 ,addMsg.CustomMaxPriceRate = 0,addMsg.FixedPrice = 0">不开启</el-radio>
<el-radio v-model="addMsg.IsOpen" :label="2">开启</el-radio>
<el-radio v-model="addMsg.IsOpen" :label="1" @change="addMsg.CustomMinPriceRate = 0 ,addMsg.CustomMaxPriceRate = 0,addMsg.CustomMinFixedPrice = 0,addMsg.CustomMaxFixedPrice = 0">不开启</el-radio>
</el-form-item>
<el-form-item label="是否需要审核" >
<el-radio v-model="addMsg.IsExamine" :label="1">开启</el-radio>
<el-radio v-model="addMsg.IsExamine" :label="2">不开启</el-radio>
<el-radio v-model="addMsg.IsExamine" :label="2">开启</el-radio>
<el-radio v-model="addMsg.IsExamine" :label="1">不开启</el-radio>
</el-form-item>
<el-form-item label="申请条件" >
<el-radio v-model="addMsg.ApplyCondition" :label="0" @change="getGradeByTypeList = [],addMsg.ApplyMemberLevel=0">不限</el-radio>
......@@ -37,7 +37,7 @@
</el-form-item>
</div>
</el-card>
<el-card class="box-card" style="margin-top:10px" v-if="addMsg.IsOpen==1">
<el-card class="box-card" style="margin-top:10px" v-if="addMsg.IsOpen==2">
<div slot="header" class="clearfix">
<span>微店佣金设置</span>
<el-tooltip class="item" effect="dark" content="需要开启微店，才能设置对应的微店佣金" placement="top">
......@@ -47,8 +47,8 @@
<div>
<el-form-item
label="微店佣金类型" prop="PriceType">
<el-radio v-model="addMsg.PriceType" :label="1" @change="addMsg.CustomMinPriceRate = 0 ,addMsg.CustomMaxPriceRate = 0,addMsg.FixedPrice = 0">区间价格百分比</el-radio>
<el-radio v-model="addMsg.PriceType" :label="2" @change="addMsg.CustomMinPriceRate = 0 ,addMsg.CustomMaxPriceRate = 0,addMsg.FixedPrice = 0">固定价格</el-radio>
<el-radio v-model="addMsg.PriceType" :label="1" @change="addMsg.CustomMinPriceRate = 0 ,addMsg.CustomMaxPriceRate = 0,addMsg.CustomMinFixedPrice = 0,addMsg.CustomMaxFixedPrice = 0">区间价格百分比</el-radio>
<el-radio v-model="addMsg.PriceType" :label="2" @change="addMsg.CustomMinPriceRate = 0 ,addMsg.CustomMaxPriceRate = 0,addMsg.CustomMinFixedPrice = 0,addMsg.CustomMaxFixedPrice = 0">固定价格</el-radio>
</el-form-item>
<el-form-item v-if="addMsg.PriceType == 1"
class="commonLabel" label="区间价格">
......@@ -58,7 +58,7 @@
<span>%</span>
</el-button>
</el-input>
<span style="margin:0 15px">-</span>
<span style="margin:0 15px">~</span>
<el-input style="width:200px;" type="number" min="1" size="small" placeholder="请输入"
v-model="addMsg.CustomMaxPriceRate" class="input-with-select">
<el-button slot="append">
......@@ -68,8 +68,16 @@
</el-form-item>
<el-form-item v-if="addMsg.PriceType==2" class="commonLabel"
label="固定价格">
<el-input style="width:293px;" type="number" min="1" size="small" placeholder="请输入"
v-model="addMsg.FixedPrice" class="input-with-select">
<el-input style="width:200px;" type="number" min="0" size="small" placeholder="请输入"
v-model="addMsg.CustomMinFixedPrice" class="input-with-select">
<el-button slot="append">
<span>元</span>
</el-button>
</el-input>
<span style="margin:0 15px">~</span>
<el-input style="width:200px;" type="number" min="1" size="small" placeholder="请输入"
v-model="addMsg.CustomMaxFixedPrice" class="input-with-select">
<el-button slot="append">
<span>元</span>
</el-button>
......@@ -100,11 +108,9 @@
<el-tooltip class="item" effect="dark" content="自动打款支付，需要申请相应小程序的相应功能，例如：微信需要申请企业付款到零钱功能" placement="top">
<i class="topelzk elzk el-tooltip el-icon-info"></i>
</el-tooltip>
<el-radio v-model="addMsg.SettlementType" :label="1">用户自提</el-radio>
<el-radio v-model="addMsg.SettlementType" :label="2">系统自动现结（微信）</el-radio>
<el-radio v-model="addMsg.SettlementType" :label="3">转入余额</el-radio>
</el-form-item>
<el-form-item class="commonLabel" label="最少提现额度" prop="MinWithdrawal">
<el-input v-model="addMsg.MinWithdrawal" style="width:293px;" type="number" min="1" size="small"
......@@ -180,6 +186,8 @@
CustomMinPriceRate:0,
CustomMaxPriceRate:0,
FixedPrice:0,
CustomMinFixedPrice : 0,
CustomMaxFixedPrice : 0,
SettlementType:1,
MinWithdrawal:0,
MaxWithdrawal:0,
......@@ -241,7 +249,11 @@
Save(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if(this.addMsg.CustomMinPriceRate>=this.addMsg.CustomMaxPriceRate){
if(this.addMsg.PriceType==1 && this.addMsg.CustomMinPriceRate>=this.addMsg.CustomMaxPriceRate){
this.Error('区间比例从低到高')
return
}
if(this.addMsg.PriceType==2 && this.addMsg.CustomMinFixedPrice>=this.addMsg.CustomMaxFixedPrice){
this.Error('区间价格从低到高')
return
}
......
src/components/orderMan/CostManagement.vue
View file @ b53f0116
......@@ -46,7 +46,7 @@
</el-table-column>
<el-table-column prop="FreightCostMoney" label="快递成本" width="80">
</el-table-column>
<el-table-column prop="FreightFinanceId" label="运费成本" width="80">
<el-table-column prop="FreightFinanceId" label="运费成本单据" width="120">
</el-table-column>
<el-table-column prop="CostFinanceId" label="成本单据" width="100">
</el-table-column>
......
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