From b7edcb4044f6da42dcd68185ffbf10b042f3015d Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Mon, 16 Mar 2026 10:44:43 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E4=BF=A1=E6=81=AF-=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=EF=BC=9A=E5=AE=9E=E7=8E=B0=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=87=B3=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E9=80=89=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=97=B6=E7=9A=84=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=88=E5=8F=AF=E6=A0=B9=E6=8D=AE=E5=88=86=E7=B1=BB=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E3=80=81=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=88=AB=E3=80=81?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=9E=8B=E3=80=81=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=89=8D=E4=B8=89=E7=BA=A7=E7=9A=84=E8=81=94?= =?UTF-8?q?=E5=8A=A8=E5=A4=84=E7=90=86=EF=BC=89=202=E3=80=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86-=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E4=BF=A1=E6=81=AF-=E9=87=8D=E7=BD=AE=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD=203=E3=80=81?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9C=BA=E6=9E=84=E5=8A=A0=E7=9B=9F=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=9C=BA=E6=9E=84=E8=B4=9F=E8=B4=A3=E4=BA=BA=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=90=8E=E7=9A=84=E2=80=9C=E5=B0=9A=E6=9C=AA=E5=BD=92?= =?UTF-8?q?=E5=B1=9E=E9=83=A8=E9=97=A8=E2=80=9D=E6=8F=90=E7=A4=BA=204?= =?UTF-8?q?=E3=80=81=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86-=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E6=A0=87=E7=AD=BE=E5=8E=BB=E6=8E=89=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=90=AF=E7=94=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BD=9C=E5=BA=9F?= =?UTF-8?q?=EF=BC=9A=E4=BD=9C=E5=BA=9F=E5=90=8E=E7=A7=BB=E9=99=A4=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E5=B7=B2=E5=88=86=E9=85=8D=E7=9A=84=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=205=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=E5=92=8C=E9=95=BF=E8=80=85=E6=A0=87=E7=AD=BE=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E8=B4=B9=E4=BB=B7=E6=A0=BC=E6=94=B9=E4=B8=BA=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/elder/elderbk/components/ElderBkItemForm.vue | 4 ++-- .../components/ConfigServiceDirectiveForm.vue | 10 +++++----- src/views/services/directivebk/DirectiveBkItem.data.ts | 4 ++-- .../directivebk/components/DirectiveBkItemForm.vue | 4 ++-- .../serviceDirective/ConfigServiceDirective.data.ts | 6 +++--- .../components/ConfigServiceDirectiveForm.vue | 10 +++++----- .../components/DirectiveOpeLogInfoAdd.vue | 4 ++-- .../components/DirectiveOpeLogInfoCompare.vue | 2 +- .../components/DirectiveSyncLogInfoForm.vue | 4 ++-- .../serviceDirective/ConfigServiceDirective.data.ts | 10 +++++----- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/views/elder/elderbk/components/ElderBkItemForm.vue b/src/views/elder/elderbk/components/ElderBkItemForm.vue index d3014cc..1f3340e 100644 --- a/src/views/elder/elderbk/components/ElderBkItemForm.vue +++ b/src/views/elder/elderbk/components/ElderBkItemForm.vue @@ -10,8 +10,8 @@ - - + + diff --git a/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue b/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue index 4719312..147c2e6 100644 --- a/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue +++ b/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue @@ -34,9 +34,9 @@ - - @@ -203,7 +203,7 @@ const validatorRules = reactive({ typeId: [{ required: true, message: '请选择服务类型!' },], instructionTagId: [{ required: true, message: '请选择分类标签!' },], directiveName: [{ required: true, message: '请输入服务指令名称!' },], - tollPrice: [{ required: true, message: '请输入收费价格!' }, { pattern: /^(([0-9]*)|([0]\.\d{0,4}|[1-9][0-9]*\.\d{0,4}))$/, message: '请输入正确的金额!' },], + tollPrice: [{ required: true, message: '请输入基础价格!' }, { pattern: /^(([0-9]*)|([0]\.\d{0,4}|[1-9][0-9]*\.\d{0,4}))$/, message: '请输入正确的金额!' },], comPrice: [{ required: false }, { pattern: /^(([0-9]*)|([0]\.\d{0,4}|[1-9][0-9]*\.\d{0,4}))$/, message: '请输入正确的金额!' },], izReimbursement: [{ required: true, message: '请选择是否参与医保报销!' },], izPreferential: [{ required: true, message: '请选择是否参与机构优惠!' },], @@ -318,9 +318,9 @@ async function submitForm() { } } - //提成价格不能高于收费价格 + //提成价格不能高于基础价格 if (model.tollPrice < model.comPrice) { - createMessage.warning('提成价格不能高于收费价格！'); + createMessage.warning('提成价格不能高于基础价格！'); confirmLoading.value = false; retrun; } diff --git a/src/views/services/directivebk/DirectiveBkItem.data.ts b/src/views/services/directivebk/DirectiveBkItem.data.ts index c24109b..5e043d3 100644 --- a/src/views/services/directivebk/DirectiveBkItem.data.ts +++ b/src/views/services/directivebk/DirectiveBkItem.data.ts @@ -36,7 +36,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'serviceAttribute_dictText', }, { - title: '收费价格(元)', + title: '基础价格(元)', align: 'center', dataIndex: 'tollPrice', }, @@ -65,7 +65,7 @@ export const columns: BasicColumn[] = [ // 高级查询数据 export const superQuerySchema = { directiveName: { title: '服务指令名称', order: 0, view: 'text', type: 'string' }, - tollPrice: { title: '收费价格', order: 1, view: 'number', type: 'number' }, + tollPrice: { title: '基础价格', order: 1, view: 'number', type: 'number' }, comPrice: { title: '提成价格', order: 2, view: 'number', type: 'number' }, serviceContent: { title: '服务说明', order: 3, view: 'text', type: 'string' }, serviceDuration: { title: '服务时长（分钟）', order: 4, view: 'text', type: 'string' }, diff --git a/src/views/services/directivebk/components/DirectiveBkItemForm.vue b/src/views/services/directivebk/components/DirectiveBkItemForm.vue index dbedb54..55dfe14 100644 --- a/src/views/services/directivebk/components/DirectiveBkItemForm.vue +++ b/src/views/services/directivebk/components/DirectiveBkItemForm.vue @@ -10,8 +10,8 @@ - - + + diff --git a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts index 459dab8..e6c5e3b 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts +++ b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts @@ -67,7 +67,7 @@ export const columns: BasicColumn[] = [ // }, }, { - title: '收费价格', + title: '基础价格', align: 'center', dataIndex: 'tollPrice', width: 100, @@ -219,7 +219,7 @@ export const auditColumns: BasicColumn[] = [ // }, }, { - title: '收费价格', + title: '基础价格', align: 'center', dataIndex: 'tollPrice', width: 100, @@ -302,7 +302,7 @@ export const superQuerySchema = { typeId: { title: '服务类型', order: 1, view: 'list', type: 'string', dictCode: '' }, instructionTagId: { title: '分类标签', order: 2, view: 'list', type: 'string', dictCode: 'instruction_tag' }, directiveName: { title: '服务指令', order: 3, view: 'text', type: 'string' }, - tollPrice: { title: '收费价格', order: 4, view: 'number', type: 'number' }, + tollPrice: { title: '基础价格', order: 4, view: 'number', type: 'number' }, comPrice: { title: '提成价格', order: 5, view: 'number', type: 'number' }, izReimbursement: { title: '医保报销', order: 6, view: 'radio', type: 'string', dictCode: '' }, izPreferential: { title: '机构优惠', order: 7, view: 'radio', type: 'string', dictCode: '' }, diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue index fa6d3ca..50359fb 100644 --- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue +++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue @@ -56,9 +56,9 @@ - - @@ -263,7 +263,7 @@ const validatorRules = reactive({ typeId: [{ required: true, message: '请选择服务类型!' },], instructionTagId: [{ required: true, message: '请选择分类标签!' },], directiveName: [{ required: true, message: '请输入服务指令名称!' },], - tollPrice: [{ required: true, message: '请输入收费价格!' }, { pattern: /^(([0-9]*)|([0]\.\d{0,4}|[1-9][0-9]*\.\d{0,4}))$/, message: '请输入正确的金额!' },], + tollPrice: [{ required: true, message: '请输入基础价格!' }, { pattern: /^(([0-9]*)|([0]\.\d{0,4}|[1-9][0-9]*\.\d{0,4}))$/, message: '请输入正确的金额!' },], comPrice: [{ required: false }, { pattern: /^(([0-9]*)|([0]\.\d{0,4}|[1-9][0-9]*\.\d{0,4}))$/, message: '请输入正确的金额!' },], izReimbursement: [{ required: true, message: '请选择是否参与医保报销!' },], izPreferential: [{ required: true, message: '请选择是否参与机构优惠!' },], @@ -444,9 +444,9 @@ async function submitForm() { } } - //提成价格不能高于收费价格 + //提成价格不能高于基础价格 if (model.comPrice != 0 && model.tollPrice < model.comPrice) { - createMessage.warning('提成价格不能高于收费价格！'); + createMessage.warning('提成价格不能高于基础价格！'); confirmLoading.value = false; retrun; } diff --git a/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue b/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue index 38edd7f..895ccc8 100644 --- a/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue +++ b/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue @@ -50,9 +50,9 @@ - - +