diff --git a/src/views/admin/directivemedia/DirectiveMedia.data.ts b/src/views/admin/directivemedia/DirectiveMedia.data.ts index 5c8c8a8..1ecdfdc 100644 --- a/src/views/admin/directivemedia/DirectiveMedia.data.ts +++ b/src/views/admin/directivemedia/DirectiveMedia.data.ts @@ -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", diff --git a/src/views/admin/directivemedia/DirectiveMediaList.vue b/src/views/admin/directivemedia/DirectiveMediaList.vue index 791be21..ed67690 100644 --- a/src/views/admin/directivemedia/DirectiveMediaList.vue +++ b/src/views/admin/directivemedia/DirectiveMediaList.vue @@ -33,13 +33,13 @@ :orgCode="sjjdbm" allow-clear /> - + diff --git a/src/views/admin/directivemedia/components/DirectiveMediaForm.vue b/src/views/admin/directivemedia/components/DirectiveMediaForm.vue index 11db597..beae0ad 100644 --- a/src/views/admin/directivemedia/components/DirectiveMediaForm.vue +++ b/src/views/admin/directivemedia/components/DirectiveMediaForm.vue @@ -34,13 +34,13 @@ :maxlength="20" :showCount="true" allow-clear> - + @@ -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 }); diff --git a/src/views/elder/elderbk/components/ElderBkItemForm.vue b/src/views/elder/elderbk/components/ElderBkItemForm.vue index 8f71532..d3014cc 100644 --- a/src/views/elder/elderbk/components/ElderBkItemForm.vue +++ b/src/views/elder/elderbk/components/ElderBkItemForm.vue @@ -69,11 +69,11 @@ - + diff --git a/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts b/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts index 2f47a8e..8ba9b12 100644 --- a/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts +++ b/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts @@ -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', diff --git a/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue b/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue index 1e59e17..4719312 100644 --- a/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue +++ b/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue @@ -68,13 +68,13 @@ placeholder="请选择收费频次" allowClear /> - + @@ -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: '请输入服务时长（分钟）!' }, diff --git a/src/views/services/directivePackage/components/DirectivePackageModal copy.vue b/src/views/services/directivePackage/components/DirectivePackageModal copy.vue index 30233ac..6a98423 100644 --- a/src/views/services/directivePackage/components/DirectivePackageModal copy.vue +++ b/src/views/services/directivePackage/components/DirectivePackageModal copy.vue @@ -81,7 +81,7 @@
服务类别：{{ derectiveInfo.categoryName || derectiveInfo.categoryId_dictText }}
服务类型：{{ derectiveInfo.typeName || derectiveInfo.typeId_dictText }}
服务指令名称：{{ derectiveInfo.directiveName }}
-
周期类型：{{ filterDictTextByCache('period_type', derectiveInfo.cycleType) }}
+
服务时长(分钟)：{{ derectiveInfo.serviceDuration }}
服务说明：{{ derectiveInfo.serviceContent }}
体型标签：{{ handleBodyTags('', derectiveInfo, '') }}
diff --git a/src/views/services/directivebk/DirectiveBkItem.data.ts b/src/views/services/directivebk/DirectiveBkItem.data.ts index 729f75d..eb29b1d 100644 --- a/src/views/services/directivebk/DirectiveBkItem.data.ts +++ b/src/views/services/directivebk/DirectiveBkItem.data.ts @@ -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', + }, ]; // 高级查询数据 diff --git a/src/views/services/directivebk/components/DirectiveBkItemForm.vue b/src/views/services/directivebk/components/DirectiveBkItemForm.vue index 4b40e13..dbedb54 100644 --- a/src/views/services/directivebk/components/DirectiveBkItemForm.vue +++ b/src/views/services/directivebk/components/DirectiveBkItemForm.vue @@ -69,11 +69,11 @@ - + diff --git a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts index 9ed44ab..459dab8 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts +++ b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts @@ -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', diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue index 993fedc..fa6d3ca 100644 --- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue +++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue @@ -83,13 +83,13 @@ dictCode="institutional_discount" allowClear /> - + @@ -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: '请输入服务时长（分钟）!' }, diff --git a/src/views/synchronization/directive/directive.data.ts b/src/views/synchronization/directive/directive.data.ts index 5c6a709..8172e47 100644 --- a/src/views/synchronization/directive/directive.data.ts +++ b/src/views/synchronization/directive/directive.data.ts @@ -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', diff --git a/src/views/synchronization/directive/directiveopelog/DirectiveOpeLogMain.data.ts b/src/views/synchronization/directive/directiveopelog/DirectiveOpeLogMain.data.ts index 6faeda6..1d6442e 100644 --- a/src/views/synchronization/directive/directiveopelog/DirectiveOpeLogMain.data.ts +++ b/src/views/synchronization/directive/directiveopelog/DirectiveOpeLogMain.data.ts @@ -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, + // }, ]; // 高级查询数据 diff --git a/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue b/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue index 3b0a630..fe9255d 100644 --- a/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue +++ b/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoAdd.vue @@ -42,6 +42,18 @@ + + + + + + @@ -49,9 +61,9 @@ - - + + @@ -60,12 +72,6 @@ - - - - - @@ -118,8 +124,8 @@
- +
@@ -176,6 +182,7 @@ const formData = reactive>({ tollPrice: 0, comPrice: 0, serviceDuration: '', + timeoutDuration: '', serviceContent: '', immediateFile: '', immediateFileFocus: '', diff --git a/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoCompare.vue b/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoCompare.vue index 481263f..53062a3 100644 --- a/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoCompare.vue +++ b/src/views/synchronization/directive/directiveopelog/components/DirectiveOpeLogInfoCompare.vue @@ -71,7 +71,7 @@ const fieldLabels: Record = { directiveName: '服务指令', tollPrice: '收费价格(元)', comPrice: '提成价格(元)', - cycleType_dictText: '周期类型', + cycleType_dictText: '', serviceContent: '服务说明', serviceDuration: '服务时长(分钟)', mp3File: '语音文件', diff --git a/src/views/synchronization/directive/directivesynclog/components/DirectiveSyncLogInfo.data.ts b/src/views/synchronization/directive/directivesynclog/components/DirectiveSyncLogInfo.data.ts index 2fa9ec9..9769e70 100644 --- a/src/views/synchronization/directive/directivesynclog/components/DirectiveSyncLogInfo.data.ts +++ b/src/views/synchronization/directive/directivesynclog/components/DirectiveSyncLogInfo.data.ts @@ -25,11 +25,11 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'directiveName' }, - { - title: '周期类型', - align: "center", - dataIndex: 'cycleType_dictText' - }, + // { + // title: '周期类型', + // align: "center", + // dataIndex: 'cycleType_dictText' + // }, ]; // 高级查询数据 diff --git a/src/views/synchronization/directive/directivesynclog/components/DirectiveSyncLogInfoForm.vue b/src/views/synchronization/directive/directivesynclog/components/DirectiveSyncLogInfoForm.vue index 25b24dc..c6df8c0 100644 --- a/src/views/synchronization/directive/directivesynclog/components/DirectiveSyncLogInfoForm.vue +++ b/src/views/synchronization/directive/directivesynclog/components/DirectiveSyncLogInfoForm.vue @@ -41,13 +41,13 @@ - + diff --git a/src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.data.ts b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.data.ts index f182905..7bb614b 100644 --- a/src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.data.ts +++ b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirective.data.ts @@ -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', diff --git a/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveList.vue index 6c0e0ee..d524110 100644 --- a/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveList.vue +++ b/src/views/synchronization/directive/serviceDirective/ConfigServiceDirectiveList.vue @@ -35,13 +35,13 @@ - +