diff --git a/.env.production b/.env.production index 4a66108..e4666e7 100644 --- a/.env.production +++ b/.env.production @@ -2,7 +2,7 @@ VITE_USE_MOCK = false # 发布路径 -VITE_PUBLIC_PATH = /biz101 +VITE_PUBLIC_PATH = /biz102 # 是否启用gzip或brotli压缩 # 选项值: gzip | brotli | none @@ -13,10 +13,10 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false #后台接口父地址(必填) -VITE_GLOB_API_URL=/nursingunit101 +VITE_GLOB_API_URL=/nursingunit102 #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit101 +VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit102 # VITE_GLOB_DOMAIN_URL=http://115.175.20.152/nursingunit104 # 接口父路径前缀 diff --git a/src/components/Form/src/jeecg/components/JImageUploadtz.vue b/src/components/Form/src/jeecg/components/JImageUploadtz.vue index 3c4eefc..d87880a 100644 --- a/src/components/Form/src/jeecg/components/JImageUploadtz.vue +++ b/src/components/Form/src/jeecg/components/JImageUploadtz.vue @@ -16,7 +16,7 @@ | diff --git a/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue b/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue index 9f4b04c..38a11f4 100644 --- a/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue +++ b/src/components/Form/src/jeecg/components/JUpload/JUploadMP3.vue @@ -20,7 +20,7 @@ | diff --git a/src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue b/src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue index b71a8e9..0eb1327 100644 --- a/src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue +++ b/src/components/Form/src/jeecg/components/JUpload/JUploadMP4.vue @@ -20,7 +20,7 @@ | diff --git a/src/views/services/serviceDirective copy/ConfigServiceDirective.api.ts b/src/views/services/serviceDirective copy/ConfigServiceDirective.api.ts new file mode 100644 index 0000000..2edfbaf --- /dev/null +++ b/src/views/services/serviceDirective copy/ConfigServiceDirective.api.ts @@ -0,0 +1,160 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from '/@/hooks/web/useMessage'; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/services/serviceDirective/list', + save = '/services/serviceDirective/add', + batchAdd = '/services/serviceDirective/batchAdd', + edit = '/services/serviceDirective/edit', + deleteOne = '/services/serviceDirective/delete', + deleteBatch = '/services/serviceDirective/deleteBatch', + importExcel = '/services/serviceDirective/importExcel', + exportXls = '/services/serviceDirective/exportXls', + async = '/services/serviceDirective/async', + departList = '/sys/sysDepart/list', + tree = '/services/serviceDirective/tree', + queryById = '/services/serviceDirective/queryById', + syncMediaForBiz = '/services/serviceDirective/syncMediaForBiz', + syncMediaForAllBiz = '/services/serviceDirective/syncMediaForAllBiz', + listByDS = '/services/serviceDirective/listByDS', + idListByDS = '/services/serviceDirective/idListByDS', + syncDirective = '/services/serviceDirective/syncDirective', + useOrStopCascade = '/services/serviceDirective/useOrStopCascade', + compareList = '/services/serviceDirective/compareList', +} + +/** + * 列表接口 - 变更数据源 + * @param params + */ +export const listByDS = (params) => defHttp.get({ url: Api.listByDS, params }); + +/** + * + * @param params 获取对应机构已有指令id + * @returns + */ +export const idListByDS = (params) => defHttp.get({ url: Api.idListByDS, params }); + +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; + +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; + +/** + * 列表接口 + * @param params + */ +export const list = (params) => defHttp.get({ url: Api.list, params }); +export const departList = (params) => defHttp.get({ url: Api.departList, params }); +export const queryById = (params) => defHttp.get({ url: Api.queryById, params }); +/** + * 删除单个 + * @param params + * @param handleSuccess + */ +export const deleteOne = (params, handleSuccess) => { + return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => { + handleSuccess(); + }); +}; + +/** + * 批量删除 + * @param params + * @param handleSuccess + */ +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => { + handleSuccess(); + }); + }, + }); +}; + +/** + * 保存或者更新 + * @param params + * @param isUpdate + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +}; +/** + * 批量新增 + * @param params + */ +export const batchAdd = (params) => { + return defHttp.post({ url: Api.batchAdd, params }, { isTransformResponse: false }); +}; + +/** + * 同步数据 + * @param params + */ +export const asyncFunc = (params) => { + return defHttp.post({ url: Api.async, params }, { isTransformResponse: false }); +}; + +/** + * 获取树结构 + * @param params + * @returns + */ +export const tree = (params) => defHttp.post({ url: Api.tree, params }); + +/** + * 审批通过后将指令资源同步给业务平台 + * @param params + */ +export const syncMediaForBiz = (params) => { + return defHttp.post({ url: Api.syncMediaForBiz, params }); +}; + +/** + * 将指令资源同步给所有业务平台 + * @param params + */ +export const syncMediaForAllBiz = (params) => { + return defHttp.post({ url: Api.syncMediaForAllBiz, params }); +}; + +/** + * 同步 + * @param params + * @returns + */ +export const syncDirective = (dataSourceCode: string, params: any) => { + return defHttp.post({ url: `${Api.syncDirective}?sourceOrgCode=${encodeURIComponent(dataSourceCode)}`, params }); +}; + +/** + * 启用/停用分类标签或服务类别或服务类型下所有服务指令 + * @param params + */ +export const useOrStopCascade = (params) => { + return defHttp.post({ url: Api.useOrStopCascade, params }); +}; + +/** + * 差异数据对比 + * @param params compareOrgCode + * @returns + */ +export const compareList = (params) => defHttp.get({ url: Api.compareList, params }); \ No newline at end of file diff --git a/src/views/services/serviceDirective copy/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective copy/ConfigServiceDirective.data.ts new file mode 100644 index 0000000..e8aec35 --- /dev/null +++ b/src/views/services/serviceDirective copy/ConfigServiceDirective.data.ts @@ -0,0 +1,192 @@ +import { BasicColumn } from '/@/components/Table'; +import { render } from '/@/utils/common/renderUtils'; +const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '分类标签', + align: 'center', + dataIndex: 'instructionTagId_dictText', + width: 100, + // customCell: (record, index, column) => { + // if (record.instructionRowSpan != null) { + // return { rowSpan: record.instructionRowSpan }; + // } + // }, + }, + { + title: '服务类别', + align: 'center', + dataIndex: 'categoryId_dictText', + // customCell: (record, index, column) => { + // if (record.categoryRowSpan != null) { + // return { rowSpan: record.categoryRowSpan }; + // } + // }, + }, + { + title: '服务类型', + align: 'center', + dataIndex: 'typeId_dictText', + // customCell: (record, index, column) => { + // if (record.typeRowSpan != null) { + // return { rowSpan: record.typeRowSpan }; + // } + // }, + }, + { + title: '服务指令', + align: 'center', + dataIndex: 'directiveName', + }, + // { + // title: '体型标签', + // align: 'center', + // dataIndex: 'bodyTagList', + // width: 150, + // ellipsis: false, + // // format(text, record, index) { + // // if (!!text) { + // // return text.map((item) => item.tagName).join('、'); + // // } else { + // // return '-'; + // // } + // // }, + // }, + // { + // title: '情绪标签', + // align: 'center', + // dataIndex: 'emotionTagList', + // width: 150, + // ellipsis: false, + // // format(text, record, index) { + // // if (!!text) { + // // return text.map((item) => item.tagName).join('、'); + // // } else { + // // return '-'; + // // } + // // }, + // }, + { + title: '收费价格', + align: 'center', + dataIndex: 'tollPrice', + width: 95, + }, + { + title: '提成价格', + align: 'center', + dataIndex: 'comPrice', + width: 95, + }, + // { + // title: '医保报销', + // align: 'center', + // dataIndex: 'izReimbursement_dictText', + // width: 100, + // }, + // { + // title: '机构优惠', + // align: 'center', + // dataIndex: 'izPreferential_dictText', + // width: 100, + // }, + { + title: '周期类型', + align: 'center', + dataIndex: 'cycleType_dictText', + }, + { + title: '服务时长(分钟)', + align: 'center', + dataIndex: 'serviceDuration', + width: 135, + }, + // { + // title: '指令状态', + // align: 'center', + // dataIndex: 'status_dictText', + // width: 100, + // }, + { + title: '是否启用', + align: 'center', + dataIndex: 'izEnabled_dictText', + width: 100, + }, + { + title: '服务指令图片大图', + align: 'center', + dataIndex: 'previewFile', + customRender: ({ text }) => { + // 如果 text 为空或 null/undefined,使用默认图片 + const imageUrl = text ? opeMediaAddress + text : opeMediaAddress + import.meta.env.VITE_DEFAULT_DIRECTIVE_PRE_PIC; + return render.renderImage({ text: imageUrl }); + }, + // customRender: render.renderImage, + }, + { + title: '服务指令图片小图', + align: 'center', + dataIndex: 'previewFileSmall', + customRender: ({ text }) => { + // 如果 text 为空或 null/undefined,使用默认图片 + const imageUrl = text ? opeMediaAddress + text : opeMediaAddress + import.meta.env.VITE_DEFAULT_DIRECTIVE_PRESMALL_PIC; + return render.renderImage({ text: imageUrl }); + }, + // customRender: render.renderImage, + }, + { + title: '服务指令描述', + align: 'center', + dataIndex: 'serviceContent', + width: 200, + }, + { + title: '指令音频文件', + align: 'center', + dataIndex: 'mp3File', + width: 120, + }, + { + title: '指令视频文件', + align: 'center', + dataIndex: 'mp4File', + width: 120, + }, + { + title: '即时指令图标', + align: 'center', + dataIndex: 'immediateFile', + customRender: ({ text }) => { + // 如果 text 为空或 null/undefined,使用默认图片 + const imageUrl = text ? opeMediaAddress + text : opeMediaAddress + import.meta.env.VITE_DEFAULT_DIRECTIVE_IM_PIC; + return render.renderImage({ text: imageUrl }); + }, + // customRender: render.renderImage, + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + categoryId: { title: '服务类别', order: 0, view: 'list', type: 'string', dictCode: '' }, + typeId: { title: '服务类型', order: 1, view: 'list', type: 'string', dictCode: '' }, + instructionTagId: { title: '分类标签', order: 2, view: 'list', type: 'string', dictCode: 'instruction_tag' }, + directiveName: { title: '服务指令', order: 3, view: 'text', type: 'string' }, + tollPrice: { title: '收费价格', order: 4, view: 'number', type: 'number' }, + comPrice: { title: '提成价格', order: 5, view: 'number', type: 'number' }, + 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: '' }, + sort: { title: '排序', order: 10, view: 'number', type: 'number' }, + serviceContent: { title: '服务说明', order: 11, view: 'textarea', type: 'string' }, + serviceDuration: { title: '服务时长(分钟)', order: 12, view: 'text', type: 'string' }, + izEnabled: { title: '是否启用', order: 13, view: 'radio', type: 'string', dictCode: '' }, + createBy: { title: '创建人', order: 14, view: 'text', type: 'string' }, + createTime: { title: '创建日期', order: 15, view: 'datetime', type: 'string' }, + updateBy: { title: '更新人', order: 16, view: 'text', type: 'string' }, + updateTime: { title: '更新日期', order: 17, view: 'datetime', type: 'string' }, + mp3File: { title: '语音文件', order: 18, view: 'file', type: 'string' }, + mp4File: { title: '视频文件', order: 19, view: 'file', type: 'string' }, +}; diff --git a/src/views/services/serviceDirective copy/ConfigServiceDirectiveList copy.vue b/src/views/services/serviceDirective copy/ConfigServiceDirectiveList copy.vue new file mode 100644 index 0000000..5f347db --- /dev/null +++ b/src/views/services/serviceDirective copy/ConfigServiceDirectiveList copy.vue @@ -0,0 +1,1562 @@ + + + + + diff --git a/src/views/services/serviceDirective copy/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective copy/ConfigServiceDirectiveList.vue new file mode 100644 index 0000000..f2bc170 --- /dev/null +++ b/src/views/services/serviceDirective copy/ConfigServiceDirectiveList.vue @@ -0,0 +1,1566 @@ + + + + + diff --git a/src/views/services/serviceDirective copy/components/AbnormalDirectiveList.vue b/src/views/services/serviceDirective copy/components/AbnormalDirectiveList.vue new file mode 100644 index 0000000..06eb327 --- /dev/null +++ b/src/views/services/serviceDirective copy/components/AbnormalDirectiveList.vue @@ -0,0 +1,320 @@ + + + + + diff --git a/src/views/services/serviceDirective copy/components/CompareDirectiveList.vue b/src/views/services/serviceDirective copy/components/CompareDirectiveList.vue new file mode 100644 index 0000000..9317a29 --- /dev/null +++ b/src/views/services/serviceDirective copy/components/CompareDirectiveList.vue @@ -0,0 +1,319 @@ + + + + + diff --git a/src/views/services/serviceDirective copy/components/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective copy/components/ConfigServiceDirective.data.ts new file mode 100644 index 0000000..d705928 --- /dev/null +++ b/src/views/services/serviceDirective copy/components/ConfigServiceDirective.data.ts @@ -0,0 +1,254 @@ +import { BasicColumn } from '/@/components/Table'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '分类标签', + align: 'center', + dataIndex: 'instructionTagId_dictText', + width: 100, + // customCell: (record, index, column) => { + // if (record.instructionRowSpan != null) { + // return { rowSpan: record.instructionRowSpan }; + // } + // }, + }, + { + title: '服务类别', + align: 'center', + dataIndex: 'categoryId_dictText', + // customCell: (record, index, column) => { + // if (record.categoryRowSpan != null) { + // return { rowSpan: record.categoryRowSpan }; + // } + // }, + }, + { + title: '服务类型', + align: 'center', + dataIndex: 'typeId_dictText', + // customCell: (record, index, column) => { + // if (record.typeRowSpan != null) { + // return { rowSpan: record.typeRowSpan }; + // } + // }, + }, + { + title: '服务指令', + align: 'center', + dataIndex: 'directiveName', + }, + // { + // title: '体型标签', + // align: 'center', + // dataIndex: 'bodyTagList', + // width: 150, + // ellipsis: false, + // format(text, record, index) { + // if (!!text) { + // return text.map((item) => item.tagName).join('、'); + // } else { + // return '-'; + // } + // }, + // }, + // { + // title: '情绪标签', + // align: 'center', + // dataIndex: 'emotionTagList', + // width: 150, + // ellipsis: false, + // format(text, record, index) { + // if (!!text) { + // return text.map((item) => item.tagName).join('、'); + // } else { + // return '-'; + // } + // }, + // }, + { + title: '收费价格', + align: 'center', + dataIndex: 'tollPrice', + width: 100, + }, + { + title: '提成价格', + align: 'center', + dataIndex: 'comPrice', + }, + // { + // title: '医保报销', + // align: 'center', + // dataIndex: 'izReimbursement_dictText', + // width: 100, + // }, + // { + // title: '机构优惠', + // align: 'center', + // dataIndex: 'izPreferential_dictText', + // width: 100, + // }, + { + title: '周期类型', + align: 'center', + dataIndex: 'cycleType_dictText', + }, + { + title: '服务时长(分钟)', + align: 'center', + dataIndex: 'serviceDuration', + width: 135, + }, + // { + // title: '指令状态', + // align: 'center', + // dataIndex: 'status_dictText', + // width: 100, + // }, + { + title: '是否启用', + align: 'center', + dataIndex: 'izEnabled_dictText', + width: 100, + }, + // { + // title: '服务指令图片', + // align: 'center', + // dataIndex: 'previewFile', + // customRender: render.renderImage, + // }, + { + title: '服务指令描述', + align: 'center', + dataIndex: 'serviceContent', + width: 200, + }, + // { + // title: '指令音频文件', + // align: 'center', + // dataIndex: 'mp3File', + // width: 120, + // }, + // { + // title: '指令视频文件', + // align: 'center', + // dataIndex: 'mp4File', + // width: 120, + // }, + // { + // title: '即时指令图标', + // align: 'center', + // dataIndex: 'immediateFile', + // customRender: render.renderImage, + // }, +]; + +// 高级查询数据 +export const superQuerySchema = { + categoryId: { title: '服务类别', order: 0, view: 'list', type: 'string', dictCode: '' }, + typeId: { title: '服务类型', order: 1, view: 'list', type: 'string', dictCode: '' }, + instructionTagId: { title: '分类标签', order: 2, view: 'list', type: 'string', dictCode: 'instruction_tag' }, + directiveName: { title: '服务指令', order: 3, view: 'text', type: 'string' }, + tollPrice: { title: '收费价格', order: 4, view: 'number', type: 'number' }, + comPrice: { title: '提成价格', order: 5, view: 'number', type: 'number' }, + 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: '' }, + sort: { title: '排序', order: 10, view: 'number', type: 'number' }, + serviceContent: { title: '服务说明', order: 11, view: 'textarea', type: 'string' }, + serviceDuration: { title: '服务时长(分钟)', order: 12, view: 'text', type: 'string' }, + izEnabled: { title: '是否启用', order: 13, view: 'radio', type: 'string', dictCode: '' }, + createBy: { title: '创建人', order: 14, view: 'text', type: 'string' }, + createTime: { title: '创建日期', order: 15, view: 'datetime', type: 'string' }, + updateBy: { title: '更新人', order: 16, view: 'text', type: 'string' }, + updateTime: { title: '更新日期', order: 17, view: 'datetime', type: 'string' }, + mp3File: { title: '语音文件', order: 18, view: 'file', type: 'string' }, + mp4File: { title: '视频文件', order: 19, view: 'file', type: 'string' }, +}; + + + + +//列表数据 +export const headChildColumns: BasicColumn[] = [ + { + title: '基础信息', + children: [ + { + title: '分类标签', + align: 'center', + dataIndex: 'instructionName', + ellipsis: true, + width: 100, + }, + { + title: '服务类别', + align: 'center', + dataIndex: 'categoryName', + ellipsis: true, + width: 100, + }, + { + title: '服务类型', + align: 'center', + dataIndex: 'typeName', + ellipsis: true, + width: 100, + }, + { + title: '服务指令', + align: 'center', + dataIndex: 'directiveName', + ellipsis: true, + }, + { + title: '周期类型', + align: 'center', + dataIndex: 'cycleTypeName', + ellipsis: true, + width: 100, + }, + ] + }, + { + title: '源机构', + children: [ + { + title: '名称', + align: 'center', + dataIndex: 'ownOrgName', + ellipsis: true, + width: 200, + }, + { + title: '是否存在', + align: 'center', + dataIndex: 'ownExist', + ellipsis: true, + width: 100, + }, + ] + }, + { + title: '目标机构', + children: [ + { + title: '名称', + align: 'center', + dataIndex: 'own2OrgName', + ellipsis: true, + width: 200, + }, + { + title: '是否存在', + align: 'center', + dataIndex: 'targetExist', + ellipsis: true, + width: 100, + }, + ] + }, + +]; \ No newline at end of file diff --git a/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm.vue new file mode 100644 index 0000000..33399fd --- /dev/null +++ b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm.vue @@ -0,0 +1,805 @@ + + + + + diff --git a/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm2.vue b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm2.vue new file mode 100644 index 0000000..6291905 --- /dev/null +++ b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveForm2.vue @@ -0,0 +1,734 @@ + + + + + \ No newline at end of file diff --git a/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveFormOLDBK.vue b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveFormOLDBK.vue new file mode 100644 index 0000000..d40fcd4 --- /dev/null +++ b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveFormOLDBK.vue @@ -0,0 +1,888 @@ + + + + + \ No newline at end of file diff --git a/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveModal.vue b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveModal.vue new file mode 100644 index 0000000..2c53829 --- /dev/null +++ b/src/views/services/serviceDirective copy/components/ConfigServiceDirectiveModal.vue @@ -0,0 +1,279 @@ + + + + + + diff --git a/src/views/services/serviceDirective copy/components/DirectiveRadioCom.vue b/src/views/services/serviceDirective copy/components/DirectiveRadioCom.vue new file mode 100644 index 0000000..6819805 --- /dev/null +++ b/src/views/services/serviceDirective copy/components/DirectiveRadioCom.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/views/services/serviceDirective copy/components/DirectiveRespositoryList.vue b/src/views/services/serviceDirective copy/components/DirectiveRespositoryList.vue new file mode 100644 index 0000000..576ca51 --- /dev/null +++ b/src/views/services/serviceDirective copy/components/DirectiveRespositoryList.vue @@ -0,0 +1,411 @@ + + + + + diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveFormOLDBK.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveFormOLDBK.vue index 177db9d..d40fcd4 100644 --- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveFormOLDBK.vue +++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveFormOLDBK.vue @@ -124,7 +124,7 @@ | @@ -148,7 +148,7 @@ | @@ -172,7 +172,7 @@ | @@ -196,7 +196,7 @@ | diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue index 18d4306..38fae31 100644 --- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue +++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveModal.vue @@ -14,7 +14,7 @@ - @@ -48,10 +48,10 @@ const disableSubmit = ref(false); const registerForm = ref(); const emit = defineEmits(['register', 'success']); const opeType = ref('')//操作类型 add新增 edit编辑 editMedia主列表-指令资源 look详情 dmlook指令库查看指令详情 audit审核 auditMedia审核列表-指令资源 -const dmVisible = ref(false) +const sdVisible = ref(false) function handleCancelDM() { - dmVisible.value = false + sdVisible.value = false clearCache() emit('success') } @@ -157,7 +157,10 @@ function queryByIdFunc(id) { } function openDM() { - dmVisible.value = true + sdVisible.value = true + nextTick(() => { + dmRef.value.resetChoose(); + }); } function handlePullDM() { @@ -180,7 +183,7 @@ function handlePullDM() { okText: '确认', cancelText: '取消', onOk: () => { - syncDirective(dmRef.value.targetOrgCode, { syncIds: selectedData.ids, }) + syncDirective(dmRef.value.targetOrgCode, { syncIds: selectedData.ids, syncCode: dmRef.value.targetOrgCodeSV }) createMessage.success('指令拉取中,请1分钟后重新查看') // dmRef.value?.init() handleCancelDM() diff --git a/src/views/services/serviceDirective/components/DirectiveRespositoryList.vue b/src/views/services/serviceDirective/components/DirectiveRespositoryList.vue index e21d58b..65c77d7 100644 --- a/src/views/services/serviceDirective/components/DirectiveRespositoryList.vue +++ b/src/views/services/serviceDirective/components/DirectiveRespositoryList.vue @@ -337,6 +337,10 @@ async function searchOrgCode() { } } +function resetChoose(){ + +} + // 添加音频结束监听 onMounted(() => { getOrgInfo().then(res => { @@ -351,6 +355,8 @@ defineExpose({ getSelectedIds, init, targetOrgCode, + targetOrgCodeSV, + resetChoose, });