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 @@
-
-
+