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

1、调整镜像管理-服务指令-操作日志：去除周期类型、增加超时时长回显，调整字段展示顺序 

2、调整镜像管理-服务指令-机构卡片了解更多：去除周期类型、增加超时时长回显
3、调整镜像管理-服务指令-指令备份：增加超时时长保存与回显及导出增加超时时长回显
This commit is contained in:
1378012178@qq.com 2026-01-19 16:48:39 +08:00
parent 7b8984bb7d
commit 73da2ab255
19 changed files with 116 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/admin/directivemedia/DirectiveMedia.data.ts
View File

@ -25,11 +25,11 @@ export const columns: BasicColumn[] = [
align: "center",
dataIndex: 'typeId_dictText'
},
{
title: '周期类型',
align: "center",
dataIndex: 'cycleType_dictText'
},
// {
// title: '周期类型',
// align: "center",
// dataIndex: 'cycleType_dictText'
// },
{
title: '服务指令图片大图',
align: "center",

4
src/views/admin/directivemedia/DirectiveMediaList.vue
View File

@ -33,13 +33,13 @@
:orgCode="sjjdbm" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6">
<!-- <a-col :lg="6">
<a-form-item name="cycleType">
<template #label><span title="周期类型">周期类型</span></template>
<j-dict-select-tag v-model:value="queryParam.cycleType" dictCode="period_type" placeholder="请选择周期类型"
:orgCode="sjjdbm" allow-clear />
</a-form-item>
</a-col>
</a-col> -->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">

6
src/views/admin/directivemedia/components/DirectiveMediaForm.vue
View File

@ -34,13 +34,13 @@
:maxlength="20" :showCount="true" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<!-- <a-col :span="24">
<a-form-item label="周期类型" v-bind="validateInfos.cycleType" id="DirectiveMediaForm-cycleType"
name="cycleType">
<j-dict-select-tag v-model:value="formData.cycleType" :disabled="!!formData.id" dictCode="period_type"
@upDictCode="upCycleTypeDictCode" placeholder="请选择周期类型" :orgCode="sjjdbm" allow-clear />
</a-form-item>
</a-col>
</a-col> -->
<a-col :span="24">
<a-form-item label="服务指令图片大图" v-bind="validateInfos.previewFile" id="DirectiveMediaForm-previewFile"
name="previewFile">
@ -134,7 +134,7 @@ const validatorRules = reactive({
instructionTagId: [{ required: true, message: '请输入分类标签id!' },],
categoryId: [{ required: true, message: '请输入服务类别id!' },],
typeId: [{ required: true, message: '请输入服务类型id!' },],
cycleType: [{ required: true, message: '请输入周期类型!' },],
// cycleType: [{ required: true, message: '请输入周期类型!' },],
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });

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

@ -69,11 +69,11 @@
<a-input v-model:value="formData.typeName" placeholder="请输入服务类型中文名称" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<!-- <a-col :span="24">
<a-form-item label="周期类型中文名称" v-bind="validateInfos.cycleTypeName" id="DirectiveBkItemForm-cycleTypeName" name="cycleTypeName">
<a-input v-model:value="formData.cycleTypeName" placeholder="请输入周期类型中文名称" allow-clear ></a-input>
</a-form-item>
</a-col>
</a-col> -->
</a-row>
</a-form>
</template>

20
src/views/services/directivePackage/components/ConfigServiceDirective.data.ts
View File

@ -47,11 +47,11 @@ export const columns: BasicColumn[] = [
}
},
},
{
title: '周期类型',
align: 'center',
dataIndex: 'cycleType_dictText',
},
// {
// title: '周期类型',
// align: 'center',
// dataIndex: 'cycleType_dictText',
// },
];
export const selectedColumns: BasicColumn[] = [
@ -108,11 +108,11 @@ export const selectedColumns: BasicColumn[] = [
}
},
},
{
title: '周期类型',
align: 'center',
dataIndex: 'cycleType',
},
// {
// title: '周期类型',
// align: 'center',
// dataIndex: 'cycleType',
// },
{
title: '操作',
key: 'action',

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

@ -68,13 +68,13 @@
placeholder="请选择收费频次" allowClear />
</a-form-item>
</a-col>
<a-col :span="12">
<!-- <a-col :span="12">
<a-form-item label="周期类型" v-bind="validateInfos.cycleType" id="ConfigServiceDirectiveForm-cycleType"
name="cycleType">
<j-dict-select-tag type="list" v-model:value="formData.cycleType" dictCode="period_type"
placeholder="请选择周期类型" allowClear />
</a-form-item>
</a-col>
</a-col> -->
<a-col :span="12">
<a-form-item label="服务时长（分钟）" v-bind="validateInfos.serviceDuration"
id="ConfigServiceDirectiveForm-serviceDuration" name="serviceDuration">
@ -208,7 +208,7 @@ const validatorRules = reactive({
izReimbursement: [{ required: true, message: '请选择是否参与医保报销!' },],
izPreferential: [{ required: true, message: '请选择是否参与机构优惠!' },],
// chargingFrequency: [{ required: true, message: '请选择收费频次!' },],
cycleType: [{ required: true, message: '请选择周期类型!' },],
// cycleType: [{ required: true, message: '请选择周期类型!' },],
// sort: [{ required: true, message: '请输入排序!' }, { pattern: /^\d+$/, message: '请输入正整数!' },],
serviceDuration: [
{ required: true, message: '请输入服务时长（分钟）!' },

2
src/views/services/directivePackage/components/DirectivePackageModal copy.vue
View File

@ -81,7 +81,7 @@
<div class="directiveInfoClass">服务类别：{{ derectiveInfo.categoryName || derectiveInfo.categoryId_dictText }}</div>
<div class="directiveInfoClass">服务类型：{{ derectiveInfo.typeName || derectiveInfo.typeId_dictText }}</div>
<div class="directiveInfoClass">服务指令名称：{{ derectiveInfo.directiveName }}</div>
<div class="directiveInfoClass">周期类型：{{ filterDictTextByCache('period_type', derectiveInfo.cycleType) }}</div>
<!-- <div class="directiveInfoClass">周期类型：{{ filterDictTextByCache('period_type', derectiveInfo.cycleType) }}</div> -->
<div class="directiveInfoClass">服务时长(分钟)：{{ derectiveInfo.serviceDuration }}</div>
<div class="directiveInfoClass">服务说明：{{ derectiveInfo.serviceContent }}</div>
<div class="directiveInfoClass">体型标签：{{ handleBodyTags('', derectiveInfo, '') }}</div>

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

@ -20,11 +20,11 @@ export const columns: BasicColumn[] = [
align: 'center',
dataIndex: 'typeName',
},
{
title: '周期类型',
align: 'center',
dataIndex: 'cycleTypeName',
},
// {
// title: '周期类型',
// align: 'center',
// dataIndex: 'cycleTypeName',
// },
{
title: '服务指令',
align: 'center',
@ -50,6 +50,11 @@ export const columns: BasicColumn[] = [
align: 'center',
dataIndex: 'serviceDuration',
},
{
title: '超时时长（分钟）',
align: 'center',
dataIndex: 'timeoutDuration',
},
];
// 高级查询数据

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

@ -69,11 +69,11 @@
<a-input v-model:value="formData.typeName" placeholder="请输入服务类型中文名称" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<!-- <a-col :span="24">
<a-form-item label="周期类型中文名称" v-bind="validateInfos.cycleTypeName" id="DirectiveBkItemForm-cycleTypeName" name="cycleTypeName">
<a-input v-model:value="formData.cycleTypeName" placeholder="请输入周期类型中文名称" allow-clear ></a-input>
</a-form-item>
</a-col>
</a-col> -->
</a-row>
</a-form>
</template>

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

@ -89,11 +89,11 @@ export const columns: BasicColumn[] = [
dataIndex: 'izPreferential_dictText',
width: 100,
},
{
title: '周期类型',
align: 'center',
dataIndex: 'cycleType_dictText',
},
// {
// title: '周期类型',
// align: 'center',
// dataIndex: 'cycleType_dictText',
// },
{
title: '服务时长（分钟）',
align: 'center',
@ -241,11 +241,11 @@ export const auditColumns: BasicColumn[] = [
dataIndex: 'izPreferential_dictText',
width: 100,
},
{
title: '周期类型',
align: 'center',
dataIndex: 'cycleType_dictText',
},
// {
// title: '周期类型',
// align: 'center',
// dataIndex: 'cycleType_dictText',
// },
{
title: '服务时长（分钟）',
align: 'center',

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

@ -83,13 +83,13 @@
dictCode="institutional_discount" allowClear />
</a-form-item>
</a-col>
<a-col :span="12">
<!-- <a-col :span="12">
<a-form-item label="周期类型" v-bind="validateInfos.cycleType" id="ConfigServiceDirectiveForm-cycleType"
name="cycleType">
<j-dict-select-tag type="list" v-model:value="formData.cycleType" dictCode="period_type"
placeholder="请选择周期类型" allowClear @upDictCode="upCycleTypeDictCode" />
</a-form-item>
</a-col>
</a-col> -->
<a-col :span="12">
<a-form-item label="服务时长（分钟）" v-bind="validateInfos.serviceDuration"
id="ConfigServiceDirectiveForm-serviceDuration" name="serviceDuration">
@ -268,7 +268,7 @@ const validatorRules = reactive({
izReimbursement: [{ required: true, message: '请选择是否参与医保报销!' },],
izPreferential: [{ required: true, message: '请选择是否参与机构优惠!' },],
// chargingFrequency: [{ required: true, message: '请选择收费频次!' },],
cycleType: [{ required: true, message: '请选择周期类型!' },],
// cycleType: [{ required: true, message: '请选择周期类型!' },],
// sort: [{ required: true, message: '请输入排序!' }, { pattern: /^\d+$/, message: '请输入正整数!' },],
serviceDuration: [
{ required: true, message: '请输入服务时长（分钟）!' },

12
src/views/synchronization/directive/directive.data.ts
View File

@ -37,12 +37,12 @@ export const selectedColumns = [
width: 150,
ellipsis: true, // 确保内容过长时显示省略号
},
{
title: '周期类型',
align: 'center',
dataIndex: 'cycleType_dictText',
width: 100, // 添加固定宽度
},
// {
// title: '周期类型',
// align: 'center',
// dataIndex: 'cycleType_dictText',
// width: 100, // 添加固定宽度
// },
{
title: '服务时长（分钟）',
align: 'center',

12
src/views/synchronization/directive/directiveopelog/DirectiveOpeLogMain.data.ts
View File

@ -50,12 +50,12 @@ export const columns: BasicColumn[] = [
align: 'center',
dataIndex: 'directiveName',
},
{
title: '周期类型',
align: 'center',
dataIndex: 'cycleTypeName',
width: 80,
},
// {
// title: '周期类型',
// align: 'center',
// dataIndex: 'cycleTypeName',
// width: 80,
// },
];
// 高级查询数据

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

@ -42,6 +42,18 @@
<a-input v-model:value="formData.directiveName" placeholder="服务指令名称" disabled></a-input>
</a-form-item>
</a-col>
<!-- <a-col :span="12">
<a-form-item label="周期类型" v-bind="validateInfos.cycleType" id="ConfigServiceDirectiveForm-cycleType"
name="cycleType">
<a-input v-model:value="formData.cycleTypeName" placeholder="周期类型" disabled></a-input>
</a-form-item>
</a-col> -->
<a-col :span="12">
<a-form-item label="服务时长（分钟）" v-bind="validateInfos.serviceDuration"
id="ConfigServiceDirectiveForm-serviceDuration" name="serviceDuration">
<a-input v-model:value="formData.serviceDuration" placeholder="服务时长（分钟）" disabled></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="收费价格(元)" v-bind="validateInfos.tollPrice" id="ConfigServiceDirectiveForm-tollPrice"
name="tollPrice">
@ -49,9 +61,9 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="周期类型" v-bind="validateInfos.cycleType" id="ConfigServiceDirectiveForm-cycleType"
name="cycleType">
<a-input v-model:value="formData.cycleTypeName" placeholder="周期类型" disabled></a-input>
<a-form-item label="超时时长（分钟）" v-bind="validateInfos.timeoutDuration"
id="ConfigServiceDirectiveForm-timeoutDuration" name="timeoutDuration">
<a-input v-model:value="formData.timeoutDuration" placeholder="超时时长（分钟）" disabled></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
@ -60,12 +72,6 @@
<a-input v-model:value="formData.comPrice" placeholder="提成价格" disabled></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="服务时长" v-bind="validateInfos.serviceDuration"
id="ConfigServiceDirectiveForm-serviceDuration" name="serviceDuration">
<a-input v-model:value="formData.serviceDuration" placeholder="服务时长（分钟）" disabled></a-input>
</a-form-item>
</a-col>
</a-row>
</a-form>
</template>
@ -118,8 +124,8 @@
</span>
</div>
<div>
<a-textarea style="color: #606266;" v-model:value="formData.serviceContent" placeholder="服务指令描述" :maxlength="200"
:rows="3" :autoSize="{ minRows: 3 }" :showCount="true" disabled />
<a-textarea style="color: #606266;" v-model:value="formData.serviceContent" placeholder="服务指令描述"
:maxlength="200" :rows="3" :autoSize="{ minRows: 3 }" :showCount="true" disabled />
</div>
</div>
</div>
@ -176,6 +182,7 @@ const formData = reactive<Record<string, any>>({
tollPrice: 0,
comPrice: 0,
serviceDuration: '',
timeoutDuration: '',
serviceContent: '',
immediateFile: '',
immediateFileFocus: '',

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

@ -71,7 +71,7 @@ const fieldLabels: Record<string, string> = {
directiveName: '服务指令',
tollPrice: '收费价格(元)',
comPrice: '提成价格(元)',
cycleType_dictText: '周期类型',
cycleType_dictText: '',
serviceContent: '服务说明',
serviceDuration: '服务时长(分钟)',
mp3File: '语音文件',

10
src/views/synchronization/directive/directivesynclog/components/DirectiveSyncLogInfo.data.ts
View File

@ -25,11 +25,11 @@ export const columns: BasicColumn[] = [
align: "center",
dataIndex: 'directiveName'
},
{
title: '周期类型',
align: "center",
dataIndex: 'cycleType_dictText'
},
// {
// title: '周期类型',
// align: "center",
// dataIndex: 'cycleType_dictText'
// },
];
// 高级查询数据

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

@ -41,13 +41,13 @@
<a-input-number v-model:value="formData.comPrice" placeholder="请输入提成价格" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="24">
<!-- <a-col :span="24">
<a-form-item label="周期类型 1日常护理 2周期护理 3即时护理" v-bind="validateInfos.cycleType"
id="DirectiveSyncLogInfoForm-cycleType" name="cycleType">
<a-input v-model:value="formData.cycleType" placeholder="请输入周期类型 1日常护理 2周期护理 3即时护理"
allow-clear></a-input>
</a-form-item>
</a-col>
</a-col> -->
<a-col :span="24">
<a-form-item label="服务说明" v-bind="validateInfos.serviceContent"
id="DirectiveSyncLogInfoForm-serviceContent" name="serviceContent">

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

@ -88,16 +88,21 @@ export const columns: BasicColumn[] = [
dataIndex: 'izPreferential_dictText',
defaultHidden: true,
},
{
title: '周期类型',
align: 'center',
dataIndex: 'cycleType_dictText',
},
// {
// title: '周期类型',
// align: 'center',
// dataIndex: 'cycleType_dictText',
// },
{
title: '服务时长（分钟）',
align: 'center',
dataIndex: 'serviceDuration',
},
{
title: '超时时长（分钟）',
align: 'center',
dataIndex: 'timeoutDuration',
},
{
title: '是否启用',
align: 'center',
@ -200,11 +205,11 @@ export const sourceColumns: BasicColumn[] = [
dataIndex: 'izPreferential_dictText',
defaultHidden: true,
},
{
title: '周期类型',
align: 'center',
dataIndex: 'cycleType_dictText',
},
// {
// title: '周期类型',
// align: 'center',
// dataIndex: 'cycleType_dictText',
// },
{
title: '服务时长（分钟）',
align: 'center',
@ -300,11 +305,11 @@ export const targetSourceColumns: BasicColumn[] = [
dataIndex: 'izPreferential_dictText',
defaultHidden: true,
},
{
title: '周期类型',
align: 'center',
dataIndex: 'cycleType_dictText',
},
// {
// title: '周期类型',
// align: 'center',
// dataIndex: 'cycleType_dictText',
// },
{
title: '服务时长（分钟）',
align: 'center',
@ -400,11 +405,11 @@ export const targetColumns: BasicColumn[] = [
dataIndex: 'izPreferential_dictText',
defaultHidden: true,
},
{
title: '周期类型',
align: 'center',
dataIndex: 'cycleType_dictText',
},
// {
// title: '周期类型',
// align: 'center',
// dataIndex: 'cycleType_dictText',
// },
{
title: '服务时长（分钟）',
align: 'center',

4
src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveList.vue
View File

@ -35,13 +35,13 @@
<JInput v-model:value="queryParam.directiveName" placeholder="请输入服务指令名称" allowClear />
</a-form-item>
</a-col>
<a-col :lg="6">
<!-- <a-col :lg="6">
<a-form-item name="cycleType">
<template #label><span title="周期类型">周期类型</span></template>
<j-dict-select-tag type="list" v-model:value="queryParam.cycleType" :orgCode="queryParam.dataSourceCode"
dictCode="period_type" placeholder="请选择周期类型" :ignoreDisabled="true" allowClear />
</a-form-item>
</a-col>
</a-col> -->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">