yangjun
/
hldy_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、员工管理-员工信息-服务指令：实现切换至服务指令选列表时的筛选功能（可根据分类标签、服务类别、服务类型、服务指令名称查询，以及前三级的联动处理） 

2、调整员工管理-员工信息-重置密码的提示语
3、去掉机构加盟后，机构负责人登录后的“尚未归属部门”提示
4、员工管理-员工标签去掉是否启用，增加作废：作废后移除员工已分配的员工标签
5、服务指令和长者标签的收费价格改为基础价格
This commit is contained in:
1378012178@qq.com 2026-03-16 10:44:43 +08:00
parent a6d94a53f2
commit b7edcb4044
10 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/elder/elderbk/components/ElderBkItemForm.vue
View File

@ -10,8 +10,8 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="收费价格" v-bind="validateInfos.tollPrice" id="DirectiveBkItemForm-tollPrice" name="tollPrice">
<a-input-number v-model:value="formData.tollPrice" placeholder="请输入收费价格" style="width: 100%" />
<a-form-item label="基础价格" v-bind="validateInfos.tollPrice" id="DirectiveBkItemForm-tollPrice" name="tollPrice">
<a-input-number v-model:value="formData.tollPrice" placeholder="请输入基础价格" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="24">

10
src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue
View File

@ -34,9 +34,9 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="收费价格(元)" v-bind="validateInfos.tollPrice" id="ConfigServiceDirectiveForm-tollPrice"
<a-form-item label="基础价格(元)" v-bind="validateInfos.tollPrice" id="ConfigServiceDirectiveForm-tollPrice"
name="tollPrice">
<a-input-number v-model:value="formData.tollPrice" placeholder="请输入收费价格" style="width: 100%"
<a-input-number v-model:value="formData.tollPrice" placeholder="请输入基础价格" style="width: 100%"
precision="2" />
</a-form-item>
</a-col>
@ -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;
}

4
src/views/services/directivebk/DirectiveBkItem.data.ts
View File

@ -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' },

4
src/views/services/directivebk/components/DirectiveBkItemForm.vue
View File

@ -10,8 +10,8 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="收费价格" v-bind="validateInfos.tollPrice" id="DirectiveBkItemForm-tollPrice" name="tollPrice">
<a-input-number v-model:value="formData.tollPrice" placeholder="请输入收费价格" style="width: 100%" />
<a-form-item label="基础价格" v-bind="validateInfos.tollPrice" id="DirectiveBkItemForm-tollPrice" name="tollPrice">
<a-input-number v-model:value="formData.tollPrice" placeholder="请输入基础价格" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="24">

6
src/views/services/serviceDirective/ConfigServiceDirective.data.ts
View File

@ -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: '' },

10
src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue
View File

@ -56,9 +56,9 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="收费价格(元)" v-bind="validateInfos.tollPrice" id="ConfigServiceDirectiveForm-tollPrice"
<a-form-item label="基础价格(元)" v-bind="validateInfos.tollPrice" id="ConfigServiceDirectiveForm-tollPrice"
name="tollPrice">
<a-input-number v-model:value="formData.tollPrice" placeholder="请输入收费价格" style="width: 100%"
<a-input-number v-model:value="formData.tollPrice" placeholder="请输入基础价格" style="width: 100%"
precision="2" />
</a-form-item>
</a-col>
@ -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;
}

4
src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue
View File

@ -50,9 +50,9 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="收费价格 (元)" v-bind="validateInfos.tollPrice" id="ConfigServiceDirectiveForm-tollPrice"
<a-form-item label="基础价格 (元)" v-bind="validateInfos.tollPrice" id="ConfigServiceDirectiveForm-tollPrice"
name="tollPrice">
<a-input v-model:value="formData.tollPrice" placeholder="收费价格" disabled></a-input>
<a-input v-model:value="formData.tollPrice" placeholder="基础价格" disabled></a-input>
</a-form-item>
</a-col>
<!-- <a-col :span="12">

2
src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoCompare.vue
View File

@ -72,7 +72,7 @@ const fieldLabels: Record<string, string> = {
typeName: '服务类型',
directiveName: '服务指令',
serviceAttribute: '服务属性',
tollPrice: '收费价格(元)',
tollPrice: '基础价格(元)',
comPrice: '提成价格(元)',
serviceContent: '服务指令描述',
serviceDuration: '服务时长(分钟)',

4
src/views/synchronization/directive/directivesynclog/components/DirectiveSyncLogInfoForm.vue
View File

@ -30,9 +30,9 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="收费价格" v-bind="validateInfos.tollPrice" id="DirectiveSyncLogInfoForm-tollPrice"
<a-form-item label="基础价格" v-bind="validateInfos.tollPrice" id="DirectiveSyncLogInfoForm-tollPrice"
name="tollPrice">
<a-input-number v-model:value="formData.tollPrice" placeholder="请输入收费价格" style="width: 100%" />
<a-input-number v-model:value="formData.tollPrice" placeholder="请输入基础价格" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="24">

10
src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.data.ts
View File

@ -70,7 +70,7 @@ export const columns: BasicColumn[] = [
// },
// },
{
title: '收费价格',
title: '基础价格',
align: 'center',
dataIndex: 'tollPrice',
defaultHidden: true,
@ -187,7 +187,7 @@ export const sourceColumns: BasicColumn[] = [
// },
// },
{
title: '收费价格',
title: '基础价格',
align: 'center',
dataIndex: 'tollPrice',
defaultHidden: true,
@ -287,7 +287,7 @@ export const targetSourceColumns: BasicColumn[] = [
// },
// },
{
title: '收费价格',
title: '基础价格',
align: 'center',
dataIndex: 'tollPrice',
defaultHidden: true,
@ -387,7 +387,7 @@ export const targetColumns: BasicColumn[] = [
// },
// },
{
title: '收费价格',
title: '基础价格',
align: 'center',
dataIndex: 'tollPrice',
defaultHidden: true,
@ -435,7 +435,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: '' },