From ee8a1c6a7768b240d3978c5837fb04012aa53fd8 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Thu, 15 Jan 2026 11:13:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=91=A8?=
=?UTF-8?q?=E6=9C=9F=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BA=E6=8C=87=E4=BB=A4?=
=?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/centercontrol/camera/index.vue | 2 +-
.../services/canadddirective/CanAddDirective.data.ts | 4 ++--
.../canadddirective/components/CanAddDirectiveDetail.vue | 4 ++--
.../canadddirective/components/CanAddDirectiveForm.vue | 8 ++++----
.../customercaretemp/NuBizCustomerCareTemp.data.ts | 4 ++--
.../components/NuBizCustomerCareTempForm.vue | 6 +++---
.../components/ConfigServiceDirective.data.ts | 4 ++--
.../components/ConfigServiceDirectiveForm.vue | 6 +++---
.../components/ConfigServiceDirectiveList.vue | 2 +-
.../components/DirectivePackageModal copy.vue | 2 +-
src/views/services/directivemedia/DirectiveMedia.data.ts | 4 ++--
src/views/services/directivemedia/DirectiveMediaList.vue | 4 ++--
.../directivemedia/components/DirectiveMediaForm.vue | 8 ++++----
.../serviceDirective copy/ConfigServiceDirective.data.ts | 4 ++--
.../components/ConfigServiceDirective.data.ts | 6 +++---
.../components/ConfigServiceDirectiveForm.vue | 8 ++++----
.../components/ConfigServiceDirectiveForm2.vue | 8 ++++----
.../components/ConfigServiceDirectiveFormOLDBK.vue | 8 ++++----
.../serviceDirective/ConfigServiceDirective.data.ts | 4 ++--
.../components/ConfigServiceDirective.data.ts | 6 +++---
.../components/ConfigServiceDirectiveForm.vue | 8 ++++----
.../components/ConfigServiceDirectiveForm2.vue | 8 ++++----
.../components/ConfigServiceDirectiveFormOLDBK.vue | 8 ++++----
.../components/DirectiveSyncLogInfo.data.ts | 4 ++--
.../components/DirectiveSyncLogInfoForm.vue | 4 ++--
.../serviceTag/components/ConfigServiceDirective.data.ts | 4 ++--
.../serviceTag/components/ConfigServiceDirectiveForm.vue | 6 +++---
.../services/serviceTag/components/ServiceTagList.vue | 2 +-
.../services/serviceTag/components/ServiceTagModal.vue | 2 +-
29 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/src/views/centercontrol/camera/index.vue b/src/views/centercontrol/camera/index.vue
index 090a28a..a9dcb48 100644
--- a/src/views/centercontrol/camera/index.vue
+++ b/src/views/centercontrol/camera/index.vue
@@ -445,7 +445,7 @@
{{ item.serviceDuration || '--' }}分钟
diff --git a/src/views/services/canadddirective/CanAddDirective.data.ts b/src/views/services/canadddirective/CanAddDirective.data.ts
index ab9f0bd..338a0cc 100644
--- a/src/views/services/canadddirective/CanAddDirective.data.ts
+++ b/src/views/services/canadddirective/CanAddDirective.data.ts
@@ -35,7 +35,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'directiveName',
},
{
- title: '周期类型',
+ title: '指令类型',
align: 'center',
dataIndex: 'cycleType',
width: 120,
@@ -77,7 +77,7 @@ export const superQuerySchema = {
category: { title: '服务类别', order: 1, view: 'text', type: 'string' },
type: { title: '服务类型', order: 2, view: 'text', type: 'string' },
directiveName: { title: '服务指令', order: 3, view: 'text', type: 'string' },
- cycleType: { title: '周期类型', order: 4, view: 'text', type: 'string' },
+ cycleType: { title: '指令类型', order: 4, view: 'text', type: 'string' },
createTime: { title: '创建日期', order: 5, view: 'datetime', type: 'string' },
orgCode: { title: '所属部门', order: 6, view: 'list', type: 'string', dictTable: 'sys_depart', dictCode: 'org_code', dictText: 'depart_name' },
};
diff --git a/src/views/services/canadddirective/components/CanAddDirectiveDetail.vue b/src/views/services/canadddirective/components/CanAddDirectiveDetail.vue
index 8430579..72cfdca 100644
--- a/src/views/services/canadddirective/components/CanAddDirectiveDetail.vue
+++ b/src/views/services/canadddirective/components/CanAddDirectiveDetail.vue
@@ -75,7 +75,7 @@
-
日常护理
周期护理
@@ -204,7 +204,7 @@ function upTypeDictCode(v_) {
typeComDictCode.value = v_
}
-//周期类型名称
+//指令类型名称
const cycleTypeComDictCode = ref([])
function upCycleTypeDictCode(v_) {
cycleTypeComDictCode.value = v_
diff --git a/src/views/services/canadddirective/components/CanAddDirectiveForm.vue b/src/views/services/canadddirective/components/CanAddDirectiveForm.vue
index a41bc2e..05ee071 100644
--- a/src/views/services/canadddirective/components/CanAddDirectiveForm.vue
+++ b/src/views/services/canadddirective/components/CanAddDirectiveForm.vue
@@ -85,10 +85,10 @@
-
+ :orgCode="formData?.sysOrgCode" placeholder="请选择指令类型" allowClear @upDictCode="upCycleTypeDictCode" />
@@ -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: '请输入服务时长(分钟)!' },
@@ -334,7 +334,7 @@ function upTypeDictCode(v_) {
typeComDictCode.value = v_
}
-//周期类型名称
+//指令类型名称
const cycleTypeComDictCode = ref([])
function upCycleTypeDictCode(v_) {
cycleTypeComDictCode.value = v_
diff --git a/src/views/services/customercaretemp/NuBizCustomerCareTemp.data.ts b/src/views/services/customercaretemp/NuBizCustomerCareTemp.data.ts
index bfaafba..1f3e7a0 100644
--- a/src/views/services/customercaretemp/NuBizCustomerCareTemp.data.ts
+++ b/src/views/services/customercaretemp/NuBizCustomerCareTemp.data.ts
@@ -80,12 +80,12 @@ export const tempColumns: BasicColumn[] = [
dataIndex: 'immediateFileFocus'
},
{
- title: '周期类型ID',
+ title: '指令类型ID',
align: "center",
dataIndex: 'cycleTypeId'
},
{
- title: '周期类型',
+ title: '指令类型',
align: "center",
dataIndex: 'cycleType'
},
diff --git a/src/views/services/customercaretemp/components/NuBizCustomerCareTempForm.vue b/src/views/services/customercaretemp/components/NuBizCustomerCareTempForm.vue
index 6aa4d83..be528bb 100644
--- a/src/views/services/customercaretemp/components/NuBizCustomerCareTempForm.vue
+++ b/src/views/services/customercaretemp/components/NuBizCustomerCareTempForm.vue
@@ -318,7 +318,7 @@ const props = defineProps({
});
const isModalVisible = ref(false); // 控制弹窗的显示与否
-const cycleType = ref('week'); // 周期类型:week 或 month
+const cycleType = ref('week'); // 指令类型:week 或 month
const selectedDays = ref([]); // 存储选择的周几
const selectedDaysInMonth = ref(null); // 选择的日期(每月)
@@ -363,9 +363,9 @@ const pkId = ref('')
// 被选中已加入计划指令/包坐标
const usedCoordinates = ref([]);
-//已选择的周期类型选择结果-中文名称
+//已选择的指令类型选择结果-中文名称
const cycleTypeShow = ref('')
-//已选择的周期类型选择结果-数字
+//已选择的指令类型选择结果-数字
const cycleTypeValue = ref()
// 是否正在进行移动操作
diff --git a/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts b/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts
index 78ed39b..baaaec9 100644
--- a/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts
+++ b/src/views/services/directivePackage/components/ConfigServiceDirective.data.ts
@@ -49,7 +49,7 @@ export const columns: BasicColumn[] = [
// },
// },
{
- title: '周期类型',
+ title: '指令类型',
align: 'center',
dataIndex: 'cycleType_dictText',
width: 90,
@@ -118,7 +118,7 @@ export const selectedColumns: BasicColumn[] = [
// },
// },
{
- title: '周期类型',
+ title: '指令类型',
align: 'center',
dataIndex: 'cycleType',
width: 90,
diff --git a/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue b/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue
index 1e59e17..d13f908 100644
--- a/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue
+++ b/src/views/services/directivePackage/components/ConfigServiceDirectiveForm.vue
@@ -69,10 +69,10 @@
-
+ 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/ConfigServiceDirectiveList.vue b/src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue
index 42247df..0690a63 100644
--- a/src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue
+++ b/src/views/services/directivePackage/components/ConfigServiceDirectiveList.vue
@@ -188,7 +188,7 @@ const registerModal = ref();
const directiveInfo = ref({});
const checkListData = ref([]);
const isModalVisible = ref(false); // 控制弹窗的显示与否
-const cycleType = ref('week'); // 周期类型:week 或 month
+const cycleType = ref('week'); // 指令类型:week 或 month
const selectedDays = ref([]); // 存储选择的周几
const selectedDaysInMonth = ref(null); // 选择的日期(每月)
diff --git a/src/views/services/directivePackage/components/DirectivePackageModal copy.vue b/src/views/services/directivePackage/components/DirectivePackageModal copy.vue
index 30233ac..9bbd203 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) }}
+ 指令类型:{{ 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 5c8c8a8..56b2e90 100644
--- a/src/views/services/directivemedia/DirectiveMedia.data.ts
+++ b/src/views/services/directivemedia/DirectiveMedia.data.ts
@@ -26,7 +26,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'typeId_dictText'
},
{
- title: '周期类型',
+ title: '指令类型',
align: "center",
dataIndex: 'cycleType_dictText'
},
@@ -56,7 +56,7 @@ export const superQuerySchema = {
instructionTagId: {title: '分类标签id',order: 1,view: 'list', type: 'string',dictCode: '',},
categoryId: {title: '服务类别id',order: 2,view: 'list', type: 'string',dictCode: '',},
typeId: {title: '服务类型id',order: 3,view: 'list', type: 'string',dictCode: '',},
- cycleType: {title: '周期类型',order: 4,view: 'list', type: 'string',dictCode: '',},
+ cycleType: {title: '指令类型',order: 4,view: 'list', type: 'string',dictCode: '',},
previewFile: {title: '服务指令图片大图',order: 5,view: 'image', type: 'string',},
previewFileSmall: {title: '服务指令图片小图',order: 6,view: 'image', type: 'string',},
immediateFile: {title: '即时指令图标',order: 7,view: 'image', type: 'string',},
diff --git a/src/views/services/directivemedia/DirectiveMediaList.vue b/src/views/services/directivemedia/DirectiveMediaList.vue
index 4eaf4fa..34c6842 100644
--- a/src/views/services/directivemedia/DirectiveMediaList.vue
+++ b/src/views/services/directivemedia/DirectiveMediaList.vue
@@ -35,8 +35,8 @@
- 周期类型
- 指令类型
+
diff --git a/src/views/services/directivemedia/components/DirectiveMediaForm.vue b/src/views/services/directivemedia/components/DirectiveMediaForm.vue
index 11db597..6c2c06e 100644
--- a/src/views/services/directivemedia/components/DirectiveMediaForm.vue
+++ b/src/views/services/directivemedia/components/DirectiveMediaForm.vue
@@ -35,10 +35,10 @@
-
+ @upDictCode="upCycleTypeDictCode" placeholder="请选择指令类型" :orgCode="sjjdbm" 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 });
@@ -153,7 +153,7 @@ const typeComDictCode = ref([])
function upTypeDictCode(v_) {
typeComDictCode.value = v_
}
-//周期类型名称
+//指令类型名称
const cycleTypeComDictCode = ref([])
function upCycleTypeDictCode(v_) {
cycleTypeComDictCode.value = v_
diff --git a/src/views/services/serviceDirective copy/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective copy/ConfigServiceDirective.data.ts
index e8aec35..914c33c 100644
--- a/src/views/services/serviceDirective copy/ConfigServiceDirective.data.ts
+++ b/src/views/services/serviceDirective copy/ConfigServiceDirective.data.ts
@@ -92,7 +92,7 @@ export const columns: BasicColumn[] = [
// width: 100,
// },
{
- title: '周期类型',
+ title: '指令类型',
align: 'center',
dataIndex: 'cycleType_dictText',
},
@@ -178,7 +178,7 @@ export const superQuerySchema = {
izReimbursement: { title: '医保报销', order: 6, view: 'radio', type: 'string', dictCode: '' },
izPreferential: { title: '机构优惠', order: 7, view: 'radio', type: 'string', dictCode: '' },
chargingFrequency: { title: '收费频次', order: 8, view: 'list', type: 'string', dictCode: '' },
- cycleType: { title: '周期类型', order: 9, view: 'list', type: 'string', dictCode: '' },
+ cycleType: { title: '指令类型', order: 9, view: 'list', type: 'string', dictCode: '' },
sort: { title: '排序', order: 10, view: 'number', type: 'number' },
serviceContent: { title: '服务说明', order: 11, view: 'textarea', type: 'string' },
serviceDuration: { title: '服务时长(分钟)', order: 12, view: 'text', type: 'string' },
diff --git a/src/views/services/serviceDirective copy/components/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective copy/components/ConfigServiceDirective.data.ts
index d705928..1de7e27 100644
--- a/src/views/services/serviceDirective copy/components/ConfigServiceDirective.data.ts
+++ b/src/views/services/serviceDirective copy/components/ConfigServiceDirective.data.ts
@@ -90,7 +90,7 @@ export const columns: BasicColumn[] = [
// width: 100,
// },
{
- title: '周期类型',
+ title: '指令类型',
align: 'center',
dataIndex: 'cycleType_dictText',
},
@@ -155,7 +155,7 @@ export const superQuerySchema = {
izReimbursement: { title: '医保报销', order: 6, view: 'radio', type: 'string', dictCode: '' },
izPreferential: { title: '机构优惠', order: 7, view: 'radio', type: 'string', dictCode: '' },
chargingFrequency: { title: '收费频次', order: 8, view: 'list', type: 'string', dictCode: '' },
- cycleType: { title: '周期类型', order: 9, view: 'list', type: 'string', dictCode: '' },
+ cycleType: { title: '指令类型', order: 9, view: 'list', type: 'string', dictCode: '' },
sort: { title: '排序', order: 10, view: 'number', type: 'number' },
serviceContent: { title: '服务说明', order: 11, view: 'textarea', type: 'string' },
serviceDuration: { title: '服务时长(分钟)', order: 12, view: 'text', type: 'string' },
@@ -204,7 +204,7 @@ export const headChildColumns: BasicColumn[] = [
ellipsis: true,
},
{
- title: '周期类型',
+ title: '指令类型',
align: 'center',
dataIndex: 'cycleTypeName',
ellipsis: true,
diff --git a/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm.vue
index 33399fd..0d7a8cc 100644
--- a/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm.vue
+++ b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm.vue
@@ -79,10 +79,10 @@
-
+ placeholder="请选择指令类型" allowClear @upDictCode="upCycleTypeDictCode" :disabled="!!formData.id" />
@@ -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: '请输入服务时长(分钟)!' },
@@ -396,7 +396,7 @@ const typeComDictCode = ref([])
function upTypeDictCode(v_) {
typeComDictCode.value = v_
}
-//周期类型名称
+//指令类型名称
const cycleTypeComDictCode = ref([])
function upCycleTypeDictCode(v_) {
cycleTypeComDictCode.value = v_
diff --git a/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm2.vue b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm2.vue
index 6291905..b11b3a9 100644
--- a/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm2.vue
+++ b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm2.vue
@@ -45,10 +45,10 @@
-
+ placeholder="请选择指令类型" allowClear @upDictCode="upCycleTypeDictCode" :disabled="!!formData.id" />
@@ -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: '请输入服务时长(分钟)!' },
@@ -358,7 +358,7 @@ const typeComDictCode = ref([])
function upTypeDictCode(v_) {
typeComDictCode.value = v_
}
-//周期类型名称
+//指令类型名称
const cycleTypeComDictCode = ref([])
function upCycleTypeDictCode(v_) {
cycleTypeComDictCode.value = v_
diff --git a/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveFormOLDBK.vue b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveFormOLDBK.vue
index d40fcd4..d15e6be 100644
--- a/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveFormOLDBK.vue
+++ b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveFormOLDBK.vue
@@ -52,10 +52,10 @@
-
+ placeholder="请选择指令类型" allowClear @upDictCode="upCycleTypeDictCode" :disabled="!!formData.id" />