diff --git a/src/views/centercontrol/camera/index.vue b/src/views/centercontrol/camera/index.vue index a9dcb48..66a2cb6 100644 --- a/src/views/centercontrol/camera/index.vue +++ b/src/views/centercontrol/camera/index.vue @@ -444,10 +444,10 @@ 服务时长: {{ item.serviceDuration || '--' }}分钟 -
+
长者: {{ item.elderName || '--' }} diff --git a/src/views/services/canadddirective/CanAddDirective.data.ts b/src/views/services/canadddirective/CanAddDirective.data.ts index 338a0cc..33d8d4f 100644 --- a/src/views/services/canadddirective/CanAddDirective.data.ts +++ b/src/views/services/canadddirective/CanAddDirective.data.ts @@ -34,12 +34,12 @@ export const columns: BasicColumn[] = [ align: 'center', dataIndex: 'directiveName', }, - { - title: '指令类型', - align: 'center', - dataIndex: 'cycleType', - width: 120, - }, + // { + // title: '指令类型', + // align: 'center', + // dataIndex: 'cycleType', + // width: 120, + // }, { title: '收费价格(元)', align: 'center', diff --git a/src/views/services/canadddirective/components/CanAddDirectiveDetail.vue b/src/views/services/canadddirective/components/CanAddDirectiveDetail.vue index 72cfdca..58d5f90 100644 --- a/src/views/services/canadddirective/components/CanAddDirectiveDetail.vue +++ b/src/views/services/canadddirective/components/CanAddDirectiveDetail.vue @@ -74,14 +74,14 @@ {{formData.izPreferential=='1'?'参与':'不参与'}} - + @@ -183,8 +183,8 @@ const canUploadPreviewImage = computed(() => { return formData.instructionTagId && formData.categoryId && formData.typeId && - formData.directiveName && - formData.cycleType; + formData.directiveName + // && formData.cycleType; }); //分类标签名称 @@ -222,10 +222,11 @@ const directiveBizPath = computed(() => { const instructionTagName_ = instructionComDictCode.value.filter(d => d.value == formData.instructionTagId)?.[0]?.label; const categoryName_ = categoryComDictCode.value.filter(d => d.value == formData.categoryId)?.[0]?.label; const typeName_ = typeComDictCode.value.filter(d => d.value == formData.typeId)?.[0]?.label; - const cycleTypeName_ = cycleTypeComDictCode.value.filter(d => d.value == formData.cycleType)?.[0]?.label; + // const cycleTypeName_ = cycleTypeComDictCode.value.filter(d => d.value == formData.cycleType)?.[0]?.label; // 构建路径 - return 'directive/' + `${instructionTagName_}/${categoryName_}/${typeName_}/${formData.directiveName}/${cycleTypeName_}`; + // return 'directive/' + `${instructionTagName_}/${categoryName_}/${typeName_}/${formData.directiveName}/${cycleTypeName_}`; + return 'directive/' + `${instructionTagName_}/${categoryName_}/${typeName_}/${formData.directiveName}`; }); watch( diff --git a/src/views/services/canadddirective/components/CanAddDirectiveForm.vue b/src/views/services/canadddirective/components/CanAddDirectiveForm.vue index 05ee071..b2fd00e 100644 --- a/src/views/services/canadddirective/components/CanAddDirectiveForm.vue +++ b/src/views/services/canadddirective/components/CanAddDirectiveForm.vue @@ -84,13 +84,13 @@ dictCode="institutional_discount" allowClear /> - + @@ -270,7 +270,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/customercaretemp/NuBizCustomerCareTemp.data.ts b/src/views/services/customercaretemp/NuBizCustomerCareTemp.data.ts index 1f3e7a0..266ea51 100644 --- a/src/views/services/customercaretemp/NuBizCustomerCareTemp.data.ts +++ b/src/views/services/customercaretemp/NuBizCustomerCareTemp.data.ts @@ -79,16 +79,16 @@ export const tempColumns: BasicColumn[] = [ align: "center", dataIndex: 'immediateFileFocus' }, - { - title: '指令类型ID', - align: "center", - dataIndex: 'cycleTypeId' - }, - { - title: '指令类型', - align: "center", - dataIndex: 'cycleType' - }, + // { + // title: '指令类型ID', + // align: "center", + // dataIndex: 'cycleTypeId' + // }, + // { + // title: '指令类型', + // align: "center", + // dataIndex: 'cycleType' + // }, { title: '周期值', align: "center", diff --git a/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts b/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts index baaaec9..5f91918 100644 --- a/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts +++ b/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts @@ -48,12 +48,12 @@ export const columns: BasicColumn[] = [ // } // }, // }, - { - title: '指令类型', - align: 'center', - dataIndex: 'cycleType_dictText', - width: 90, - }, + // { + // title: '指令类型', + // align: 'center', + // dataIndex: 'cycleType_dictText', + // width: 90, + // }, { title: '服务时长', align: 'center', @@ -117,12 +117,12 @@ export const selectedColumns: BasicColumn[] = [ // } // }, // }, - { - title: '指令类型', - align: 'center', - dataIndex: 'cycleType', - width: 90, - }, + // { + // title: '指令类型', + // align: 'center', + // dataIndex: 'cycleType', + // width: 90, + // }, { title: '服务时长', align: 'center', diff --git a/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue b/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue index d13f908..b21d262 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 9bbd203..85e983c 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/directivemedia/DirectiveMedia.data.ts b/src/views/services/directivemedia/DirectiveMedia.data.ts index 56b2e90..ccdbd99 100644 --- a/src/views/services/directivemedia/DirectiveMedia.data.ts +++ b/src/views/services/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/services/directivemedia/DirectiveMediaList.vue b/src/views/services/directivemedia/DirectiveMediaList.vue index 34c6842..c4b3d2b 100644 --- a/src/views/services/directivemedia/DirectiveMediaList.vue +++ b/src/views/services/directivemedia/DirectiveMediaList.vue @@ -33,13 +33,13 @@ allow-clear /> - + diff --git a/src/views/services/directivemedia/components/DirectiveMediaForm.vue b/src/views/services/directivemedia/components/DirectiveMediaForm.vue index 6c2c06e..5351d69 100644 --- a/src/views/services/directivemedia/components/DirectiveMediaForm.vue +++ b/src/views/services/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/services/serviceDirective copy/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective copy/ConfigServiceDirective.data.ts index 914c33c..f0ea646 100644 --- a/src/views/services/serviceDirective copy/ConfigServiceDirective.data.ts +++ b/src/views/services/serviceDirective copy/ConfigServiceDirective.data.ts @@ -91,11 +91,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', diff --git a/src/views/services/serviceDirective copy/components/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective copy/components/ConfigServiceDirective.data.ts index 1de7e27..fc4fad5 100644 --- a/src/views/services/serviceDirective copy/components/ConfigServiceDirective.data.ts +++ b/src/views/services/serviceDirective copy/components/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', @@ -203,13 +203,13 @@ export const headChildColumns: BasicColumn[] = [ dataIndex: 'directiveName', ellipsis: true, }, - { - title: '指令类型', - align: 'center', - dataIndex: 'cycleTypeName', - ellipsis: true, - width: 100, - }, + // { + // title: '指令类型', + // align: 'center', + // dataIndex: 'cycleTypeName', + // ellipsis: true, + // width: 100, + // }, ] }, { diff --git a/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm.vue index 0d7a8cc..44ef378 100644 --- a/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm.vue +++ b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm.vue @@ -78,13 +78,13 @@ :max="99999.99" :precision="2" @keydown="onPriceKeydown" :disabled="disabled" /> - + @@ -332,7 +332,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/serviceDirective copy/components/ConfigServiceDirectiveForm2.vue b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm2.vue index b11b3a9..6d8e5b4 100644 --- a/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm2.vue +++ b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm2.vue @@ -44,13 +44,13 @@ :max="99999.99" :precision="2" @keydown="onPriceKeydown" /> - + @@ -295,7 +295,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/serviceDirective copy/components/ConfigServiceDirectiveFormOLDBK.vue b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveFormOLDBK.vue index d15e6be..e831fab 100644 --- a/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveFormOLDBK.vue +++ b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveFormOLDBK.vue @@ -51,13 +51,13 @@ :max="99999.99" :precision="2" @keydown="onPriceKeydown" /> - + @@ -326,7 +326,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/serviceDirective/components/ConfigServiceDirectiveForm2.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm2.vue index b11b3a9..6d8e5b4 100644 --- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm2.vue +++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm2.vue @@ -44,13 +44,13 @@ :max="99999.99" :precision="2" @keydown="onPriceKeydown" /> - + @@ -295,7 +295,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/serviceDirective/components/ConfigServiceDirectiveFormOLDBK.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveFormOLDBK.vue index d15e6be..e831fab 100644 --- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveFormOLDBK.vue +++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveFormOLDBK.vue @@ -51,13 +51,13 @@ :max="99999.99" :precision="2" @keydown="onPriceKeydown" /> - + diff --git a/src/views/services/serviceTag/components/ConfigServiceDirective.data.ts b/src/views/services/serviceTag/components/ConfigServiceDirective.data.ts index 6e2f5d9..a79ff75 100644 --- a/src/views/services/serviceTag/components/ConfigServiceDirective.data.ts +++ b/src/views/services/serviceTag/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[] = [ @@ -101,11 +101,11 @@ export const selectedColumns: BasicColumn[] = [ // } // }, // }, - { - title: '指令类型', - align: 'center', - dataIndex: 'cycleType', - }, + // { + // title: '指令类型', + // align: 'center', + // dataIndex: 'cycleType', + // }, { title: '操作', key: 'action', diff --git a/src/views/services/serviceTag/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceTag/components/ConfigServiceDirectiveForm.vue index 10bb9a0..57ebc96 100644 --- a/src/views/services/serviceTag/components/ConfigServiceDirectiveForm.vue +++ b/src/views/services/serviceTag/components/ConfigServiceDirectiveForm.vue @@ -68,13 +68,13 @@ placeholder="请选择收费频次" allowClear /> - + @@ -215,7 +215,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/serviceTag/components/ServiceTagList.vue b/src/views/services/serviceTag/components/ServiceTagList.vue index c5f7f5c..a62f1c8 100644 --- a/src/views/services/serviceTag/components/ServiceTagList.vue +++ b/src/views/services/serviceTag/components/ServiceTagList.vue @@ -81,8 +81,8 @@
服务类别：{{ derectiveInfo.categoryName }}
服务类型：{{ derectiveInfo.typeName }}
服务指令名称：{{ derectiveInfo.directiveName }}
-
指令类型：{{ filterDictTextByCache('period_type', derectiveInfo.cycleType) }} -
+
服务时长(分钟)：{{ derectiveInfo.serviceDuration }}
服务说明：{{ derectiveInfo.serviceContent }}
服务时长(分钟)：{{ derectiveInfo.serviceDuration }}
服务说明：{{ derectiveInfo.serviceContent }}