diff --git a/.env.production b/.env.production index cb59464..04195f8 100644 --- a/.env.production +++ b/.env.production @@ -2,7 +2,7 @@ VITE_USE_MOCK = false # 发布路径 -VITE_PUBLIC_PATH = /biz103 +VITE_PUBLIC_PATH = /biz101 # 是否启用gzip或brotli压缩 # 选项值: gzip | brotli | none @@ -13,10 +13,10 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false #后台接口父地址(必填) -VITE_GLOB_API_URL=/nursingunit103 +VITE_GLOB_API_URL=/nursingunit101 #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit103 +VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit101 # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/src/views/elder/canaddet/CanAddElderTag.api.ts b/src/views/elder/canaddet/CanAddElderTag.api.ts new file mode 100644 index 0000000..dfb22da --- /dev/null +++ b/src/views/elder/canaddet/CanAddElderTag.api.ts @@ -0,0 +1,21 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from '/@/hooks/web/useMessage'; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/eldertag/canAddElderTag/list', + exportXls = '/eldertag/canAddElderTag/exportXls', +} + +/** + * 列表接口 + * @param params + */ +export const list = (params) => defHttp.get({ url: Api.list, params }); + +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; diff --git a/src/views/elder/canaddet/CanAddElderTag.data.ts b/src/views/elder/canaddet/CanAddElderTag.data.ts new file mode 100644 index 0000000..6a4d999 --- /dev/null +++ b/src/views/elder/canaddet/CanAddElderTag.data.ts @@ -0,0 +1,31 @@ +import { BasicColumn } from '/@/components/Table'; +import { FormSchema } from '/@/components/Table'; +import { rules } from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '所属机构', + align: 'center', + dataIndex: 'sysOrgCode_dictText', + }, + { + title: '标签类型', + align: 'center', + dataIndex: 'type_dictText', + }, + { + title: '标签名称', + align: 'center', + dataIndex: 'tagName', + }, + { + title: '价格(元)', + align: 'center', + dataIndex: 'price', + }, +]; + +// 高级查询数据 +export const superQuerySchema = {}; diff --git a/src/views/elder/canaddet/CanAddElderTagList.vue b/src/views/elder/canaddet/CanAddElderTagList.vue new file mode 100644 index 0000000..c08ecef --- /dev/null +++ b/src/views/elder/canaddet/CanAddElderTagList.vue @@ -0,0 +1,248 @@ + + + + + diff --git a/src/views/elder/canaddet/components/CanAddElderTagForm.vue b/src/views/elder/canaddet/components/CanAddElderTagForm.vue new file mode 100644 index 0000000..e582962 --- /dev/null +++ b/src/views/elder/canaddet/components/CanAddElderTagForm.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/src/views/elder/canaddet/components/CanAddElderTagModal.vue b/src/views/elder/canaddet/components/CanAddElderTagModal.vue new file mode 100644 index 0000000..6a8c0b6 --- /dev/null +++ b/src/views/elder/canaddet/components/CanAddElderTagModal.vue @@ -0,0 +1,81 @@ + + + + + + diff --git a/src/views/elder/eldertag/ElderTag.api.ts b/src/views/elder/eldertag/ElderTag.api.ts index 8b461fc..27c6fbe 100644 --- a/src/views/elder/eldertag/ElderTag.api.ts +++ b/src/views/elder/eldertag/ElderTag.api.ts @@ -14,6 +14,7 @@ enum Api { listByDS = '/elder/elderTag/listByDS', idListByDS = '/elder/elderTag/idListByDS', syncElderTag = '/elder/elderTag/syncElderTag', + compareList = '/elder/elderTag/compareList', } /** @@ -94,4 +95,11 @@ export const idListByDS = (params) => defHttp.get({ url: Api.idListByDS, params */ export const syncElderTag = (dataSourceCode: string, params: any) => { return defHttp.post({ url: `${Api.syncElderTag}?sourceOrgCode=${encodeURIComponent(dataSourceCode)}`, params }); -}; \ No newline at end of file +}; + +/** + * 差异数据对比 + * @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/elder/eldertag/ElderTag.data.ts b/src/views/elder/eldertag/ElderTag.data.ts index 5d681eb..32ff1a8 100644 --- a/src/views/elder/eldertag/ElderTag.data.ts +++ b/src/views/elder/eldertag/ElderTag.data.ts @@ -26,11 +26,11 @@ export const columns: BasicColumn[] = [ dataIndex: 'pic', customRender: render.renderImage, }, - { - title: '排序', - align: 'center', - dataIndex: 'sort', - }, + // { + // title: '排序', + // align: 'center', + // dataIndex: 'sort', + // }, { title: '是否启用', align: 'center', diff --git a/src/views/elder/eldertag/ElderTagList.vue b/src/views/elder/eldertag/ElderTagList.vue index a6ddff7..b79c76f 100644 --- a/src/views/elder/eldertag/ElderTagList.vue +++ b/src/views/elder/eldertag/ElderTagList.vue @@ -45,6 +45,10 @@ preIcon="ant-design:plus-outlined"> 新增 标准标签库 + 差异比对 + 差异标签 @@ -63,7 +91,7 @@ import { ref, reactive, onMounted } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { useListPage } from '/@/hooks/system/useListPage'; import { columns, superQuerySchema } from './ElderTag.data'; -import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ElderTag.api'; +import { list, idListByDS, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ElderTag.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import ElderTagModal from './components/ElderTagModal.vue' import { useUserStore } from '/@/store/modules/user'; @@ -72,6 +100,8 @@ import JInput from "/@/components/Form/src/jeecg/components/JInput.vue"; import { queryByKey } from '/@/views/admin/sysconfig/SysConfig.api' import { getOrgInfo } from '@/api/common/api' import { useMessage } from '/@/hooks/web/useMessage'; +import CanAddElderTagList from '/@/views/elder/canaddet/CanAddElderTagList.vue' +import CompareElderTagList from './components/CompareElderTagList.vue' const formRef = ref(); const queryParam = reactive({}); @@ -80,6 +110,14 @@ const registerModal = ref(); const userStore = useUserStore(); const isShowETM = ref(false)//是否展示标签库功能 const mainOrgCode = ref()//标准标签库编码 +const canAddElderTagRef = ref() +const newElderTagVisible = ref(false) +const existETIds = ref([])//指令库已存在指令id +const ownOrgCode = ref('') //本机构编码 +const ownOrgName = ref('') //本机构名称 +const elderTagMainOrgInfo = ref() +const compareListRef = ref() +const compareListOpen = ref(false) //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { @@ -92,16 +130,16 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ width: 120, fixed: 'right', }, - defSort: { - column: 'sort', - order: 'asc', - }, + // defSort: { + // column: 'sort', + // order: 'asc', + // }, beforeFetch: async (params) => { return Object.assign(params, queryParam); }, }, exportConfig: { - name: "长者标签", + name: "差异标签", url: getExportUrl, params: queryParam, }, @@ -225,12 +263,50 @@ function handleDirectiveMainOpen() { } async function getElderTagMainOrgCode() { - let { orgCode } = await getOrgInfo() + let { orgCode, orgName } = await getOrgInfo() + ownOrgCode.value = orgCode + ownOrgName.value = orgName let { configValue } = await queryByKey({ key: 'elder_tag_main_org_code' }) mainOrgCode.value = configValue if (orgCode != configValue) isShowETM.value = true } +//刷新已有指令库 +async function refreshDMExistedIds(dmOrgInfo, izReset = false, izQuery = true) { + await idListByDS({ dataSourceCode: 'master' }).then(res => { + existETIds.value = res.records + if (izReset) { + canAddElderTagRef.value?.searchReset() + } else { + canAddElderTagRef.value?.reload() + } + }) +} + +async function handleLookNewDirectives() { + await refreshDMExistedIds(elderTagMainOrgInfo.value, true) + newElderTagVisible.value = true +} + +/** + * 关闭新增指令 + */ +function handleCancelNewElderTag() { + newElderTagVisible.value = false +} + + +/** + * 差异比对 + */ +function handleCompare() { + compareListOpen.value = true +} + +function onCompareListClose() { + compareListOpen.value = false +} + // 添加音频结束监听 onMounted(() => { getElderTagMainOrgCode() diff --git a/src/views/elder/eldertag/components/CompareElderTagList.vue b/src/views/elder/eldertag/components/CompareElderTagList.vue new file mode 100644 index 0000000..ef1631d --- /dev/null +++ b/src/views/elder/eldertag/components/CompareElderTagList.vue @@ -0,0 +1,353 @@ + + + + + diff --git a/src/views/elder/eldertag/components/ElderTag.data.ts b/src/views/elder/eldertag/components/ElderTag.data.ts index 30e954d..a237b16 100644 --- a/src/views/elder/eldertag/components/ElderTag.data.ts +++ b/src/views/elder/eldertag/components/ElderTag.data.ts @@ -20,11 +20,11 @@ export const columns: BasicColumn[] = [ align: 'center', dataIndex: 'price', }, - { - title: '排序', - align: 'center', - dataIndex: 'sort', - }, + // { + // title: '排序', + // align: 'center', + // dataIndex: 'sort', + // }, { title: '是否启用', align: 'center', diff --git a/src/views/elder/eldertag/components/ElderTagForm.vue b/src/views/elder/eldertag/components/ElderTagForm.vue index 93195ea..8f24dd6 100644 --- a/src/views/elder/eldertag/components/ElderTagForm.vue +++ b/src/views/elder/eldertag/components/ElderTagForm.vue @@ -30,11 +30,11 @@ - + defHttp.get({ url: Api.list, params }); + +/** + * 获取机构详细信息(包含sys_depart信息) + * @param params orgCode部门编码 不传查所有 + * @returns + */ +export const getOrgInfo = (params) => defHttp.get({ url: Api.getOrgInfo, 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 }); +} + + +export const editCg = (params, isUpdate) => { + return defHttp.post({ url: Api.editCg, params }, { isTransformResponse: false }); +} + +/** + * 保存并提交 + * @param params + * @param isUpdate + */ +export const submitContract = (params) => { + return defHttp.post({ url: Api.submitContract, params }); +} diff --git a/src/views/orgcom/OrgCardCom.vue b/src/views/orgcom/OrgCardCom.vue new file mode 100644 index 0000000..eecbd80 --- /dev/null +++ b/src/views/orgcom/OrgCardCom.vue @@ -0,0 +1,153 @@ + + + + + \ No newline at end of file diff --git a/src/views/orgcom/OrgListCom.vue b/src/views/orgcom/OrgListCom.vue new file mode 100644 index 0000000..8cf5087 --- /dev/null +++ b/src/views/orgcom/OrgListCom.vue @@ -0,0 +1,146 @@ + + + \ No newline at end of file diff --git a/src/views/orgcom/orgaddressbk.png b/src/views/orgcom/orgaddressbk.png new file mode 100644 index 0000000..e8fd3dd Binary files /dev/null and b/src/views/orgcom/orgaddressbk.png differ diff --git a/src/views/services/canadddirective/CanAddDirective.api.ts b/src/views/services/canadddirective/CanAddDirective.api.ts new file mode 100644 index 0000000..1837053 --- /dev/null +++ b/src/views/services/canadddirective/CanAddDirective.api.ts @@ -0,0 +1,72 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/canadddirective/canAddDirective/list', + save='/canadddirective/canAddDirective/add', + edit='/canadddirective/canAddDirective/edit', + deleteOne = '/canadddirective/canAddDirective/delete', + deleteBatch = '/canadddirective/canAddDirective/deleteBatch', + importExcel = '/canadddirective/canAddDirective/importExcel', + exportXls = '/canadddirective/canAddDirective/exportXls', +} + +/** + * 导出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 }); + +/** + * 删除单个 + * @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 }); +} diff --git a/src/views/services/canadddirective/CanAddDirective.data.ts b/src/views/services/canadddirective/CanAddDirective.data.ts new file mode 100644 index 0000000..ab9f0bd --- /dev/null +++ b/src/views/services/canadddirective/CanAddDirective.data.ts @@ -0,0 +1,83 @@ +import { BasicColumn } from '/@/components/Table'; +import { FormSchema } from '/@/components/Table'; +import { rules } from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '所属机构', + align: 'center', + dataIndex: 'orgCode_dictText', + width:200, + }, + { + title: '分类标签', + align: 'center', + dataIndex: 'instructionTag', + width: 170, + }, + { + title: '服务类别', + align: 'center', + dataIndex: 'category', + width: 170, + }, + { + title: '服务类型', + align: 'center', + dataIndex: 'type', + width: 170, + }, + { + title: '服务指令', + align: 'center', + dataIndex: 'directiveName', + }, + { + title: '周期类型', + align: 'center', + dataIndex: 'cycleType', + width: 120, + }, + { + title: '收费价格(元)', + align: 'center', + dataIndex: 'tollPrice', + width: 100, + }, + { + title: '提成价格(元)', + align: 'center', + dataIndex: 'comPrice', + }, + { + title: '服务时长(分钟)', + align: 'center', + dataIndex: 'serviceDuration', + width: 135, + }, + { + title: '服务指令描述', + align: 'center', + dataIndex: 'serviceContent', + width: 200, + }, + { + title: '创建日期', + align: 'center', + dataIndex: 'createTime', + width: 160, + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + instructionTag: { title: '分类标签', order: 0, view: 'text', type: 'string' }, + 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' }, + 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/CanAddDirectiveList.vue b/src/views/services/canadddirective/CanAddDirectiveList.vue new file mode 100644 index 0000000..0673171 --- /dev/null +++ b/src/views/services/canadddirective/CanAddDirectiveList.vue @@ -0,0 +1,228 @@ + + + + + diff --git a/src/views/services/canadddirective/components/CanAddDirectiveDetail.vue b/src/views/services/canadddirective/components/CanAddDirectiveDetail.vue new file mode 100644 index 0000000..8430579 --- /dev/null +++ b/src/views/services/canadddirective/components/CanAddDirectiveDetail.vue @@ -0,0 +1,315 @@ + + + + + diff --git a/src/views/services/canadddirective/components/CanAddDirectiveDetailModal.vue b/src/views/services/canadddirective/components/CanAddDirectiveDetailModal.vue new file mode 100644 index 0000000..034af9d --- /dev/null +++ b/src/views/services/canadddirective/components/CanAddDirectiveDetailModal.vue @@ -0,0 +1,148 @@ + + + + + + diff --git a/src/views/services/canadddirective/components/CanAddDirectiveForm.vue b/src/views/services/canadddirective/components/CanAddDirectiveForm.vue new file mode 100644 index 0000000..a41bc2e --- /dev/null +++ b/src/views/services/canadddirective/components/CanAddDirectiveForm.vue @@ -0,0 +1,445 @@ + + + + + diff --git a/src/views/services/canadddirective/components/CanAddDirectiveModal.vue b/src/views/services/canadddirective/components/CanAddDirectiveModal.vue new file mode 100644 index 0000000..47dd7e9 --- /dev/null +++ b/src/views/services/canadddirective/components/CanAddDirectiveModal.vue @@ -0,0 +1,145 @@ + + + + + + diff --git a/src/views/services/directivemedia/DirectiveMedia.api.ts b/src/views/services/directivemedia/DirectiveMedia.api.ts new file mode 100644 index 0000000..7533d8f --- /dev/null +++ b/src/views/services/directivemedia/DirectiveMedia.api.ts @@ -0,0 +1,72 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/services/directiveMedia/list', + save='/services/directiveMedia/add', + edit='/services/directiveMedia/edit', + deleteOne = '/services/directiveMedia/delete', + deleteBatch = '/services/directiveMedia/deleteBatch', + importExcel = '/services/directiveMedia/importExcel', + exportXls = '/services/directiveMedia/exportXls', +} + +/** + * 导出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 }); + +/** + * 删除单个 + * @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 }); +} diff --git a/src/views/services/directivemedia/DirectiveMedia.data.ts b/src/views/services/directivemedia/DirectiveMedia.data.ts new file mode 100644 index 0000000..5c8c8a8 --- /dev/null +++ b/src/views/services/directivemedia/DirectiveMedia.data.ts @@ -0,0 +1,63 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +import { getWeekMonthQuarterYear } from '/@/utils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '服务指令名称', + align: "center", + dataIndex: 'directiveName' + }, + { + title: '分类标签', + align: "center", + dataIndex: 'instructionTagId_dictText' + }, + { + title: '服务类别', + align: "center", + dataIndex: 'categoryId_dictText' + }, + { + title: '服务类型', + align: "center", + dataIndex: 'typeId_dictText' + }, + { + title: '周期类型', + align: "center", + dataIndex: 'cycleType_dictText' + }, + { + title: '服务指令图片大图', + align: "center", + dataIndex: 'previewFile', + customRender: render.renderImage, + }, + { + title: '服务指令图片小图', + align: "center", + dataIndex: 'previewFileSmall', + customRender: render.renderImage, + }, + { + title: '即时指令图标', + align: "center", + dataIndex: 'immediateFile', + customRender: render.renderImage, + }, +]; + +// 高级查询数据 +export const superQuerySchema = { + directiveName: {title: '服务指令名称',order: 0,view: 'text', type: 'string',}, + 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: '',}, + 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 new file mode 100644 index 0000000..4eaf4fa --- /dev/null +++ b/src/views/services/directivemedia/DirectiveMediaList.vue @@ -0,0 +1,308 @@ + + + + + diff --git a/src/views/services/directivemedia/components/DirectiveMediaForm.vue b/src/views/services/directivemedia/components/DirectiveMediaForm.vue new file mode 100644 index 0000000..11db597 --- /dev/null +++ b/src/views/services/directivemedia/components/DirectiveMediaForm.vue @@ -0,0 +1,336 @@ + + + + + diff --git a/src/views/services/directivemedia/components/DirectiveMediaModal.vue b/src/views/services/directivemedia/components/DirectiveMediaModal.vue new file mode 100644 index 0000000..c365040 --- /dev/null +++ b/src/views/services/directivemedia/components/DirectiveMediaModal.vue @@ -0,0 +1,83 @@ + + + + + + diff --git a/src/views/services/serviceDirective/ConfigServiceDirective.api.ts b/src/views/services/serviceDirective/ConfigServiceDirective.api.ts index c0541d6..2edfbaf 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirective.api.ts +++ b/src/views/services/serviceDirective/ConfigServiceDirective.api.ts @@ -6,6 +6,7 @@ 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', @@ -21,6 +22,7 @@ enum Api { idListByDS = '/services/serviceDirective/idListByDS', syncDirective = '/services/serviceDirective/syncDirective', useOrStopCascade = '/services/serviceDirective/useOrStopCascade', + compareList = '/services/serviceDirective/compareList', } /** @@ -94,6 +96,13 @@ 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 }); +}; /** * 同步数据 @@ -141,4 +150,11 @@ export const syncDirective = (dataSourceCode: string, params: any) => { */ export const useOrStopCascade = (params) => { return defHttp.post({ url: Api.useOrStopCascade, params }); -}; \ No newline at end of file +}; + +/** + * 差异数据对比 + * @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/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts index b0c2edb..9356621 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirective.data.ts +++ b/src/views/services/serviceDirective/ConfigServiceDirective.data.ts @@ -78,18 +78,18 @@ export const columns: BasicColumn[] = [ dataIndex: 'comPrice', width: 95, }, - { - title: '医保报销', - align: 'center', - dataIndex: 'izReimbursement_dictText', - width: 100, - }, - { - title: '机构优惠', - align: 'center', - dataIndex: 'izPreferential_dictText', - width: 100, - }, + // { + // title: '医保报销', + // align: 'center', + // dataIndex: 'izReimbursement_dictText', + // width: 100, + // }, + // { + // title: '机构优惠', + // align: 'center', + // dataIndex: 'izPreferential_dictText', + // width: 100, + // }, { title: '周期类型', align: 'center', @@ -114,11 +114,17 @@ export const columns: BasicColumn[] = [ width: 100, }, { - title: '服务指令图片', + title: '服务指令图片大图', align: 'center', dataIndex: 'previewFile', customRender: render.renderImage, }, + { + title: '服务指令图片小图', + align: 'center', + dataIndex: 'previewFileSmall', + customRender: render.renderImage, + }, { title: '服务指令描述', align: 'center', diff --git a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue index 5b22c78..c72bef7 100644 --- a/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue +++ b/src/views/services/serviceDirective/ConfigServiceDirectiveList.vue @@ -73,7 +73,8 @@
-
+
@@ -88,7 +89,7 @@
新增分类标签 + v-show="mainOrgCode == ownOrgCode" preIcon="ant-design:plus-outlined">新增分类标签 + + diff --git a/src/views/services/serviceDirective/components/CompareDirectiveList.vue b/src/views/services/serviceDirective/components/CompareDirectiveList.vue new file mode 100644 index 0000000..c1075b9 --- /dev/null +++ b/src/views/services/serviceDirective/components/CompareDirectiveList.vue @@ -0,0 +1,357 @@ + + + + + diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirective.data.ts b/src/views/services/serviceDirective/components/ConfigServiceDirective.data.ts index a364a3b..369c371 100644 --- a/src/views/services/serviceDirective/components/ConfigServiceDirective.data.ts +++ b/src/views/services/serviceDirective/components/ConfigServiceDirective.data.ts @@ -77,18 +77,18 @@ export const columns: BasicColumn[] = [ align: 'center', dataIndex: 'comPrice', }, - { - title: '医保报销', - align: 'center', - dataIndex: 'izReimbursement_dictText', - width: 100, - }, - { - title: '机构优惠', - align: 'center', - dataIndex: 'izPreferential_dictText', - width: 100, - }, + // { + // title: '医保报销', + // align: 'center', + // dataIndex: 'izReimbursement_dictText', + // width: 100, + // }, + // { + // title: '机构优惠', + // align: 'center', + // dataIndex: 'izPreferential_dictText', + // width: 100, + // }, { title: '周期类型', align: 'center', diff --git a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue index 96e92de..3a30f7f 100644 --- a/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue +++ b/src/views/services/serviceDirective/components/ConfigServiceDirectiveForm.vue @@ -1,12 +1,46 @@