Skip to content

S
saas-manage
Commit 17fe7d4f by wusiyi
Options

fix: 操作费相关页面bug修复

parent d7323930
Showing with 70 additions and 20 deletions
src/common/components/base/CustomForm.vue
...@@ -144,6 +144,7 @@ export default { ...@@ -144,6 +144,7 @@ export default {
placeholder={item.placeholder || `请输入${item.name}`} placeholder={item.placeholder || `请输入${item.name}`}
clearable clearable
step={item.step || 1} step={item.step || 1}
min={item.min ?? -Infinity}
controls-position={item.position || 'right'} controls-position={item.position || 'right'}
style="width: 100%;"></el-input-number> style="width: 100%;"></el-input-number>
)} )}
...@@ -180,15 +181,15 @@ export default { ...@@ -180,15 +181,15 @@ export default {
clearable clearable
style="width: 100%;"></el-date-picker> style="width: 100%;"></el-date-picker>
)} )}
{item.type === 'radio' && {item.type === 'radio' && (
item.radioOptions?.map((el, idx) => ( <el-radio-group v-model={this.formData[item.prop]}>
<el-radio {item.radioOptions?.map((el, idx) => (
v-model={this.formData[item.prop]} <el-radio label={el.value} key={idx}>
label={el.value}
key={idx}>
{el.label} {el.label}
</el-radio> </el-radio>
))} ))}
</el-radio-group>
)}
</el-form-item> </el-form-item>
) )
})} })}
......
src/views/saasManage/indexPage.vue
...@@ -584,7 +584,6 @@ export default { ...@@ -584,7 +584,6 @@ export default {
async created() { async created() {
this.cloneEditForm = JSON.parse(JSON.stringify(this.editForm)) this.cloneEditForm = JSON.parse(JSON.stringify(this.editForm))
await this.getList() await this.getList()
await this.getStatusList()
await this.getOperationFee() await this.getOperationFee()
}, },
methods: { methods: {
...@@ -719,6 +718,7 @@ export default { ...@@ -719,6 +718,7 @@ export default {
background: 'rgba(0, 0, 0, 0.3)' background: 'rgba(0, 0, 0, 0.3)'
}) })
try { try {
await this.getStatusList()
const res = await getDataById(row.id) const res = await getDataById(row.id)
const parts = /^(.*)(\.(([^.]+)\.([^.]+)))$/.exec(res.data.domain) const parts = /^(.*)(\.(([^.]+)\.([^.]+)))$/.exec(res.data.domain)
if (parts) { if (parts) {
......
src/views/system/operationFee.vue
...@@ -122,7 +122,7 @@ export default { ...@@ -122,7 +122,7 @@ export default {
{ {
required: true, required: true,
message: '请选择服务类型', message: '请选择服务类型',
trigger: 'blur' trigger: 'change'
} }
] ]
}, },
...@@ -131,11 +131,35 @@ export default { ...@@ -131,11 +131,35 @@ export default {
type: 'inputNumber', type: 'inputNumber',
name: '固定费用', name: '固定费用',
step: 0.01, step: 0.01,
min: 0,
renderRules: (item) => [ renderRules: (item) => [
{ {
required: true, required: true,
message: '请输入固定费用', message: '请输入固定费用',
trigger: 'blur' trigger: 'change'
}
],
isShow: (formData) => formData.type === 1
},
{
prop: 'unitType',
type: 'radio',
name: '计算单位',
radioOptions: [
{
value: 'order',
label: '按单'
},
{
value: 'product',
label: '按数量'
}
],
renderRules: (item) => [
{
required: true,
message: '请选择计算单位',
trigger: 'change'
} }
], ],
isShow: (formData) => formData.type === 1 isShow: (formData) => formData.type === 1
...@@ -145,11 +169,12 @@ export default { ...@@ -145,11 +169,12 @@ export default {
type: 'inputNumber', type: 'inputNumber',
name: '起收费用', name: '起收费用',
step: 0.01, step: 0.01,
min: 0,
renderRules: (item) => [ renderRules: (item) => [
{ {
required: true, required: true,
message: '请输入起收费用', message: '请输入起收费用',
trigger: 'blur' trigger: 'change'
} }
], ],
isShow: (formData) => formData.type === 2 isShow: (formData) => formData.type === 2
...@@ -159,11 +184,12 @@ export default { ...@@ -159,11 +184,12 @@ export default {
type: 'inputNumber', type: 'inputNumber',
name: '每件加收', name: '每件加收',
step: 0.01, step: 0.01,
min: 0,
renderRules: (item) => [ renderRules: (item) => [
{ {
required: true, required: true,
message: '请输入每件加收', message: '请输入每件加收',
trigger: 'blur' trigger: 'change'
} }
], ],
isShow: (formData) => formData.type === 2 isShow: (formData) => formData.type === 2
...@@ -173,11 +199,21 @@ export default { ...@@ -173,11 +199,21 @@ export default {
type: 'inputNumber', type: 'inputNumber',
name: '上限费用 ', name: '上限费用 ',
step: 0.01, step: 0.01,
renderRules: (item) => [ min: 0,
renderRules: (formData) => [
{ {
required: true, required: true,
message: '请输入上限费用', message: '请输入上限费用',
trigger: 'blur' trigger: 'change'
},
{
validator: (rule, value, callback) => {
if (Number(value) <= Number(formData.startFee)) {
callback(new Error('上限费用必须大于起收费用'))
} else {
callback()
}
}
} }
], ],
isShow: (formData) => formData.type === 2 isShow: (formData) => formData.type === 2
...@@ -227,6 +263,20 @@ export default { ...@@ -227,6 +263,20 @@ export default {
width: '150' width: '150'
}, },
{ {
label: '计算单位 ',
key: 'unitType',
width: '100',
render: (item) => (
<span key={item.id}>
{item.unitType === 'order' ? (
<el-tag type="danger">按单</el-tag>
) : item.unitType === 'product' ? (
<el-tag type="primary">按数量</el-tag>
) : null}
</span>
)
},
{
label: '起收费用', label: '起收费用',
key: 'startFee', key: 'startFee',
width: '150' width: '150'
...@@ -337,7 +387,7 @@ export default { ...@@ -337,7 +387,7 @@ export default {
try { try {
if (id) { if (id) {
this.is_title = 2 this.is_title = 2
const url = '/serviceManagement/get' const url = '/operationFeeManagement/get'
const res = await axios.get(url, { params: { id } }) const res = await axios.get(url, { params: { id } })
this.formData = { ...res.data } this.formData = { ...res.data }
...@@ -363,10 +413,11 @@ export default { ...@@ -363,10 +413,11 @@ export default {
name: '', name: '',
id: '', id: '',
type: '', type: '',
fixedFee: '', fixedFee: 0,
startFee: '', startFee: 0,
incrementalFee: '', incrementalFee: 0,
endFee: '' endFee: 0,
unitType: 'order'
} }
for (const key in params) { for (const key in params) {
params[key] = this.formData[key] params[key] = this.formData[key]
...@@ -374,7 +425,6 @@ export default { ...@@ -374,7 +425,6 @@ export default {
resolve(params) resolve(params)
}) })
]) ])
console.log(isValid, postData)
return { isValid, postData } return { isValid, postData }
}, },
...@@ -388,7 +438,6 @@ export default { ...@@ -388,7 +438,6 @@ export default {
try { try {
const { isValid, postData } = await this.checkData() const { isValid, postData } = await this.checkData()
if (isValid) { if (isValid) {
console.log('add', this.formData)
const finalData = isAdd ? { ...postData, id: undefined } : postData const finalData = isAdd ? { ...postData, id: undefined } : postData
const res = await axios.post(url, finalData) const res = await axios.post(url, finalData)
if (res.code !== 200) { if (res.code !== 200) {
......
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