Browse Source

修改

master
yangpeilai 6 days ago
parent
commit
8c37159b61

+ 3
- 3
src/views/onlineBusinessHall/productManagement/promoteAnd/components/afterSaleFees.vue View File

@@ -2,7 +2,7 @@
<div>
<el-form :model="dataForms" ref="ruleFormRef2">
<el-table :data="dataForms" :border="true">
<el-table-column label="售后类型">
<el-table-column label="售后类型" width="140">
<template #header>
<span class="red">*</span>
售后类型
@@ -30,7 +30,7 @@
</template>
</el-table-column>

<el-table-column label="费用">
<el-table-column label="费用" width="140">
<template #header>
<span class="red">*</span>
费用
@@ -52,7 +52,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="扣款机构">
<el-table-column label="扣款机构" width="140">
<template #header>
<span class="red">*</span>
扣款机构

+ 37
- 29
src/views/onlineBusinessHall/productManagement/promoteAnd/components/feeList.vue View File

@@ -3,7 +3,7 @@
<el-form :model="dataForm" ref="ruleFormRef">
<el-table :data="dataForm" :border="true">
<template v-if="isType == 1">
<el-table-column label="办理费类型">
<el-table-column label="办理费类型" width="120">
<template #header>
<span class="red">*</span>
办理费类型
@@ -19,14 +19,14 @@
</div>
</template>
</el-table-column>
<el-table-column label="办理费金额">
<el-table-column label="办理费金额" width="120">
<template #header>
<span class="red">*</span>
办理费金额
</template>
<template v-slot="scope">
<div class="input-wrap">
<el-form-item :prop="`dataForm.${scope.$index}.fee`">
<el-form-item :prop="`dataForm.${scope.$index}.fee`" :disabled="true">
<el-input maxlength="60" :disabled="true" :model-value="scope.row.fee / 100" placeholder="办理费金额">
<template #append>元</template>
</el-input>
@@ -36,7 +36,8 @@
</el-table-column>
</template>
<template v-else>
<el-table-column label="使用费类型">

<el-table-column label="使用费类型" width="150">
<template #header>
<span class="red">*</span>
使用费类型
@@ -44,13 +45,14 @@
<template v-slot="scope">
<div class="input-wrap">
<el-form-item :prop="`dataForm.${scope.$index}.feeType`" :disabled="true">
<el-select :disabled="true" v-model="scope.row.feeType" placeholder="请选择使用费类型">
<el-option v-for="item in USE_FEE_TYPE" :key="item.value" :label="item.label" :value="item.value" />
<el-select :disabled="true" v-model="scope.row.feeType" placeholder="使用费类型">
<el-option v-for="item in USEFEE_TYPE" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</div>
</template>
</el-table-column>

<el-table-column label="使用费计费方式">
<template #header>
<span class="red">*</span>
@@ -58,45 +60,44 @@
</template>
<template v-slot="scope">
<div class="input-wrap">
<el-form-item :prop="`dataForm.${scope.$index}.billingMode`">
<el-select :disabled="true" v-model="scope.row.billingMode" style="width: 200px"
placeholder="请选择使用费计费方式">
<el-option v-for="item in BILLING_MODE" :key="item.value" :label="item.label" :value="item.value" />
<el-form-item :prop="`dataForm.${scope.$index}.billingMode`" :disabled="true">
<el-select :disabled="true" v-model="scope.row.billingMode" style="width: 100%" placeholder="计费方式">
<el-option v-for="item in USEFEE_JF" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</div>
</template>
</el-table-column>
<el-table-column label="收费基数">

<el-table-column label="百分比" width="100">
<template #header>
<span class="red">*</span>
收费基数
百分比
</template>
<template v-slot="scope">
<div class="input-wrap" v-if="scope.row.billingMode === 'TIMES'">
<el-form-item :prop="`dataForm.${scope.$index}.useAmount`" :rules="[
<div class="input-wrap" v-if="scope.row.billingMode === 'PERCENTAGE'">
<el-form-item :prop="`dataForm.${scope.$index}.percentage`" :rules="[
{ required: true, message: '请输入', trigger: 'bulr' },
]">
<el-input maxlength="60" :disabled="true" v-model="scope.row.feeBase" placeholder="收费基数">
<template #append></template>
<el-input maxlength="60" :disabled="true" v-model="scope.row.percentage" placeholder="百分比">
<template #append>%</template>
</el-input>
</el-form-item>
</div>
</template>
</el-table-column>
<el-table-column label="使用费金额">

<el-table-column label="使用费金额" width="110">
<template #header>
<span class="red">*</span>
使用费金额
</template>
<template v-slot="scope">
<div class="input-wrap">
<div class="input-wrap" v-if="scope.row.billingMode !== 'PERCENTAGE'">
<el-form-item :prop="`dataForm.${scope.$index}.fee`">
<el-input maxlength="60" :disabled="true" v-trim clearable v-model="scope.row.fee"
placeholder="使用费金额">
<template #append>
{{ scope.row.billingMode === 'TIMES' ? '%' : '元' }}
</template>
<template #append>元</template>
</el-input>
</el-form-item>
</div>
@@ -104,7 +105,7 @@
</el-table-column>
</template>

<el-table-column label="扣款机构">
<el-table-column label="扣款机构" width="130">
<template #header>
<span class="red">*</span>
扣款机构
@@ -112,7 +113,7 @@
<template v-slot="scope">
<div class="input-wrap">
<el-form-item :prop="`dataForm.${scope.$index}.chargeMethod`">
<el-select :disabled="isInfo" v-model="scope.row.chargeMethod" :placeholder="`请选择扣款渠道`"
<el-select :disabled="isInfo" v-model="scope.row.chargeMethod" :placeholder="`扣款渠道`"
@change="handleSelectChange(scope.row, $event)" collapse-tags-tooltip filterable>
<el-option v-for="eles in agencyqueryallList" :label="eles.label" :value="eles.value" />
</el-select>
@@ -142,6 +143,7 @@
</div>
</template>
</el-table-column>

<el-table-column label="收款商户号">
<template #header>
<span class="red">*</span>
@@ -156,7 +158,7 @@
trigger: 'blur',
},
]">
<el-select :disabled="isInfo" v-model="scope.row.payConfigId" :placeholder="`请选择商户号`"
<el-select :disabled="isInfo" v-model="scope.row.payConfigId" :placeholder="`商户号`"
@change="onChange(scope.row, $event, scope.$index)" collapse-tags-tooltip filterable>
<el-option v-for="eles in scope.row.merchantList" :label="eles.label" :value="eles.value">
<div style="display: flex;justify-content: space-between;align-items: center;">
@@ -190,12 +192,12 @@ const PROCESSING_FEE_TYPE = computed(() => {
return $storeinitData.state.dictData['PROCESSING_FEE_TYPE'] || []
})
// 使用费类型
const USE_FEE_TYPE = computed(() => {
return $storeinitData.state.dictData['USE_FEE_TYPE'] || []
const USEFEE_TYPE = computed(() => {
return $storeinitData.state.dictData['USEFEE_TYPE'] || []
})
// 计费方式
const BILLING_MODE = computed(() => {
return $storeinitData.state.dictData['BILLING_MODE'] || []
const USEFEE_JF = computed(() => {
return $storeinitData.state.dictData['USEFEE_JF'] || []
})
// 收费方式
const CHARGE_METHOD = computed(() => {
@@ -307,4 +309,10 @@ defineExpose({
ruleFormRef,
})
</script>
<style scoped></style>
<style scoped>

::v-deep .input-wrap .el-input-group__append{
padding: 0 8px;
}

</style>

+ 2
- 2
src/views/onlineBusinessHall/productManagement/promoteAnd/index.vue View File

@@ -1190,7 +1190,7 @@ let field = ref({
span: 3,
hide: true,
form: {
width: '90%',
width: '97%',
slotSetEdit: true,
slotSetNameEdit: 'feeListSlot',
slotSetInfo: true,
@@ -1211,7 +1211,7 @@ let field = ref({
span: 3,
hide: true,
form: {
width: '90%',
width: '97%',
slotSetEdit: true,
slotSetNameEdit: 'afterSaleFeesSlot',
slotSetInfo: true,

Loading…
Cancel
Save