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

去除服务指令的（指令类型）周期类型

This commit is contained in:
1378012178@qq.com 2026-01-16 13:18:09 +08:00
parent ee8a1c6a77
commit dc1bb6a2b4
27 changed files with 129 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/centercontrol/camera/index.vue
View File

@ -444,10 +444,10 @@
<span class="info-label">服务时长:</span> <span class="info-label">服务时长:</span>
<span class="info-value">{{ item.serviceDuration || '--' }}分钟</span> <span class="info-value">{{ item.serviceDuration || '--' }}分钟</span>
</div> </div>
<div class="info-line"> <!-- <div class="info-line">
<span class="info-label">指令类型:</span> <span class="info-label">指令类型:</span>
<span class="info-value">{{ item.cycleType || '日常' }}</span> <span class="info-value">{{ item.cycleType || '日常' }}</span>
</div> </div> -->
<div class="info-line"> <div class="info-line">
<span class="info-label">长者:</span> <span class="info-label">长者:</span>
<span class="info-value">{{ item.elderName || '--' }}</span> <span class="info-value">{{ item.elderName || '--' }}</span>

12
src/views/services/canadddirective/CanAddDirective.data.ts
View File

@ -34,12 +34,12 @@ export const columns: BasicColumn[] = [
align: 'center', align: 'center',
dataIndex: 'directiveName', dataIndex: 'directiveName',
}, },
{ // {
title: '指令类型', // title: '指令类型',
align: 'center', // align: 'center',
dataIndex: 'cycleType', // dataIndex: 'cycleType',
width: 120, // width: 120,
}, // },
{ {
title: '收费价格(元)', title: '收费价格(元)',
align: 'center', align: 'center',

13
src/views/services/canadddirective/components/CanAddDirectiveDetail.vue
View File

@ -74,14 +74,14 @@
{{formData.izPreferential=='1'?'参与':'不参与'}} {{formData.izPreferential=='1'?'参与':'不参与'}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <!-- <a-col :span="12">
<a-form-item label="指令类型" v-bind="validateInfos.cycleType" id="ConfigServiceDirectiveForm-cycleType" <a-form-item label="指令类型" v-bind="validateInfos.cycleType" id="ConfigServiceDirectiveForm-cycleType"
name="cycleType"> name="cycleType">
<span v-if="formData.cycleType=='1'">日常护理</span> <span v-if="formData.cycleType=='1'">日常护理</span>
<span v-if="formData.cycleType=='2'">周期护理</span> <span v-if="formData.cycleType=='2'">周期护理</span>
<span v-if="formData.cycleType=='3'">即时护理</span> <span v-if="formData.cycleType=='3'">即时护理</span>
</a-form-item> </a-form-item>
</a-col> </a-col> -->
<a-col :span="12"> <a-col :span="12">
<a-form-item label="服务时长(分钟)" v-bind="validateInfos.serviceDuration" <a-form-item label="服务时长(分钟)" v-bind="validateInfos.serviceDuration"
id="ConfigServiceDirectiveForm-serviceDuration" name="serviceDuration"> id="ConfigServiceDirectiveForm-serviceDuration" name="serviceDuration">
@ -183,8 +183,8 @@ const canUploadPreviewImage = computed(() => {
return formData.instructionTagId && return formData.instructionTagId &&
formData.categoryId && formData.categoryId &&
formData.typeId && formData.typeId &&
formData.directiveName && formData.directiveName
formData.cycleType; // && formData.cycleType;
}); });
//分类标签名称 //分类标签名称
@ -222,10 +222,11 @@ const directiveBizPath = computed(() => {
const instructionTagName_ = instructionComDictCode.value.filter(d => d.value == formData.instructionTagId)?.[0]?.label; 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 categoryName_ = categoryComDictCode.value.filter(d => d.value == formData.categoryId)?.[0]?.label;
const typeName_ = typeComDictCode.value.filter(d => d.value == formData.typeId)?.[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( watch(

6
src/views/services/canadddirective/components/CanAddDirectiveForm.vue
View File

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

20
src/views/services/customercaretemp/NuBizCustomerCareTemp.data.ts
View File

@ -79,16 +79,16 @@ export const tempColumns: BasicColumn[] = [
align: "center", align: "center",
dataIndex: 'immediateFileFocus' dataIndex: 'immediateFileFocus'
}, },
{ // {
title: '指令类型ID', // title: '指令类型ID',
align: "center", // align: "center",
dataIndex: 'cycleTypeId' // dataIndex: 'cycleTypeId'
}, // },
{ // {
title: '指令类型', // title: '指令类型',
align: "center", // align: "center",
dataIndex: 'cycleType' // dataIndex: 'cycleType'
}, // },
{ {
title: '周期值', title: '周期值',
align: "center", align: "center",

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

@ -48,12 +48,12 @@ export const columns: BasicColumn[] = [
// } // }
// }, // },
// }, // },
{ // {
title: '指令类型', // title: '指令类型',
align: 'center', // align: 'center',
dataIndex: 'cycleType_dictText', // dataIndex: 'cycleType_dictText',
width: 90, // width: 90,
}, // },
{ {
title: '服务时长', title: '服务时长',
align: 'center', align: 'center',
@ -117,12 +117,12 @@ export const selectedColumns: BasicColumn[] = [
// } // }
// }, // },
// }, // },
{ // {
title: '指令类型', // title: '指令类型',
align: 'center', // align: 'center',
dataIndex: 'cycleType', // dataIndex: 'cycleType',
width: 90, // width: 90,
}, // },
{ {
title: '服务时长', title: '服务时长',
align: 'center', align: 'center',

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

@ -68,13 +68,13 @@
placeholder="请选择收费频次" allowClear /> placeholder="请选择收费频次" allowClear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <!-- <a-col :span="12">
<a-form-item label="指令类型" v-bind="validateInfos.cycleType" id="ConfigServiceDirectiveForm-cycleType" <a-form-item label="指令类型" v-bind="validateInfos.cycleType" id="ConfigServiceDirectiveForm-cycleType"
name="cycleType"> name="cycleType">
<j-dict-select-tag type="list" v-model:value="formData.cycleType" dictCode="period_type" <j-dict-select-tag type="list" v-model:value="formData.cycleType" dictCode="period_type"
placeholder="请选择指令类型" allowClear /> placeholder="请选择指令类型" allowClear />
</a-form-item> </a-form-item>
</a-col> </a-col> -->
<a-col :span="12"> <a-col :span="12">
<a-form-item label="服务时长（分钟）" v-bind="validateInfos.serviceDuration" <a-form-item label="服务时长（分钟）" v-bind="validateInfos.serviceDuration"
id="ConfigServiceDirectiveForm-serviceDuration" name="serviceDuration"> id="ConfigServiceDirectiveForm-serviceDuration" name="serviceDuration">
@ -208,7 +208,7 @@ const validatorRules = reactive({
izReimbursement: [{ required: true, message: '请选择是否参与医保报销!' },], izReimbursement: [{ required: true, message: '请选择是否参与医保报销!' },],
izPreferential: [{ required: true, message: '请选择是否参与机构优惠!' },], izPreferential: [{ required: true, message: '请选择是否参与机构优惠!' },],
// chargingFrequency: [{ required: true, message: '请选择收费频次!' },], // chargingFrequency: [{ required: true, message: '请选择收费频次!' },],
cycleType: [{ required: true, message: '请选择指令类型!' },], // cycleType: [{ required: true, message: '请选择指令类型!' },],
// sort: [{ required: true, message: '请输入排序!' }, { pattern: /^\d+$/, message: '请输入正整数!' },], // sort: [{ required: true, message: '请输入排序!' }, { pattern: /^\d+$/, message: '请输入正整数!' },],
serviceDuration: [ serviceDuration: [
{ required: true, message: '请输入服务时长（分钟）!' }, { 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.categoryName || derectiveInfo.categoryId_dictText }}</div>
<div class="directiveInfoClass">服务类型：{{ derectiveInfo.typeName || derectiveInfo.typeId_dictText }}</div> <div class="directiveInfoClass">服务类型：{{ derectiveInfo.typeName || derectiveInfo.typeId_dictText }}</div>
<div class="directiveInfoClass">服务指令名称：{{ derectiveInfo.directiveName }}</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.serviceDuration }}</div>
<div class="directiveInfoClass">服务说明：{{ derectiveInfo.serviceContent }}</div> <div class="directiveInfoClass">服务说明：{{ derectiveInfo.serviceContent }}</div>
<div class="directiveInfoClass">体型标签：{{ handleBodyTags('', derectiveInfo, '') }}</div> <div class="directiveInfoClass">体型标签：{{ handleBodyTags('', derectiveInfo, '') }}</div>

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

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

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

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

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

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

10
src/views/services/serviceDirective copy/ConfigServiceDirective.data.ts
View File

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

24
src/views/services/serviceDirective copy/components/ConfigServiceDirective.data.ts
View File

@ -89,11 +89,11 @@ export const columns: BasicColumn[] = [
// dataIndex: 'izPreferential_dictText', // dataIndex: 'izPreferential_dictText',
// width: 100, // width: 100,
// }, // },
{ // {
title: '指令类型', // title: '指令类型',
align: 'center', // align: 'center',
dataIndex: 'cycleType_dictText', // dataIndex: 'cycleType_dictText',
}, // },
{ {
title: '服务时长（分钟）', title: '服务时长（分钟）',
align: 'center', align: 'center',
@ -203,13 +203,13 @@ export const headChildColumns: BasicColumn[] = [
dataIndex: 'directiveName', dataIndex: 'directiveName',
ellipsis: true, ellipsis: true,
}, },
{ // {
title: '指令类型', // title: '指令类型',
align: 'center', // align: 'center',
dataIndex: 'cycleTypeName', // dataIndex: 'cycleTypeName',
ellipsis: true, // ellipsis: true,
width: 100, // width: 100,
}, // },
] ]
}, },
{ {

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

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

6
src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm2.vue
View File

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

6
src/views/services/serviceDirective copy/components/ConfigServiceDirectiveFormOLDBK.vue
View File

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

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

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

24
src/views/services/serviceDirective/components/ConfigServiceDirective.data.ts
View File

@ -89,11 +89,11 @@ export const columns: BasicColumn[] = [
// dataIndex: 'izPreferential_dictText', // dataIndex: 'izPreferential_dictText',
// width: 100, // width: 100,
// }, // },
{ // {
title: '指令类型', // title: '指令类型',
align: 'center', // align: 'center',
dataIndex: 'cycleType_dictText', // dataIndex: 'cycleType_dictText',
}, // },
{ {
title: '服务时长（分钟）', title: '服务时长（分钟）',
align: 'center', align: 'center',
@ -203,13 +203,13 @@ export const headChildColumns: BasicColumn[] = [
dataIndex: 'directiveName', dataIndex: 'directiveName',
ellipsis: true, ellipsis: true,
}, },
{ // {
title: '指令类型', // title: '指令类型',
align: 'center', // align: 'center',
dataIndex: 'cycleTypeName', // dataIndex: 'cycleTypeName',
ellipsis: true, // ellipsis: true,
width: 100, // width: 100,
}, // },
] ]
}, },
{ {

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

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

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

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

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

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

10
src/views/services/serviceDirective/directivesynclog/components/DirectiveSyncLogInfo.data.ts
View File

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

4
src/views/services/serviceDirective/directivesynclog/components/DirectiveSyncLogInfoForm.vue
View File

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

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

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

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

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

4
src/views/services/serviceTag/components/ServiceTagList.vue
View File

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

2
src/views/services/serviceTag/components/ServiceTagModal.vue
View File

@ -53,7 +53,7 @@
</div> </div>
<div class="directiveInfoClass">服务类型：{{ derectiveInfo.typeName || derectiveInfo.typeId_dictText }}</div> <div class="directiveInfoClass">服务类型：{{ derectiveInfo.typeName || derectiveInfo.typeId_dictText }}</div>
<div class="directiveInfoClass">服务指令名称：{{ derectiveInfo.directiveName }}</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.serviceDuration }}</div>
<div class="directiveInfoClass">服务说明：{{ derectiveInfo.serviceContent }}</div> <div class="directiveInfoClass">服务说明：{{ derectiveInfo.serviceContent }}</div>
<!-- <div class="directiveInfoClass">体型标签：{{ handleBodyTags('', derectiveInfo, '') }}</div> <!-- <div class="directiveInfoClass">体型标签：{{ handleBodyTags('', derectiveInfo, '') }}</div>