diff --git a/src/views/config/serviceDirective/ConfigServiceDirective.data.ts b/src/views/config/serviceDirective/ConfigServiceDirective.data.ts index 18d8702..bdb217a 100644 --- a/src/views/config/serviceDirective/ConfigServiceDirective.data.ts +++ b/src/views/config/serviceDirective/ConfigServiceDirective.data.ts @@ -48,8 +48,8 @@ export const columns: BasicColumn[] = [ width:150, ellipsis: false, format(text, record, index) { - if(!!text){ - return text.map(item => item.tagName).join(','); + if(!!text && text.length>0){ + return text.map(item => item.tagName).join('、'); }else{ return '暂未设置' } diff --git a/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue index f4b0389..c5ec554 100644 --- a/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue +++ b/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue @@ -350,7 +350,7 @@ async function submitForm() { } //提成价格不能高于收费价格 - if (model.tollPrice <= model.comPrice) { + if (!!model.comPrice && model.tollPrice <= model.comPrice) { createMessage.warning('提成价格不能高于收费价格!'); confirmLoading.value = false; retrun;