From dea1ea05e53c8e4200d3746f55359f373c41001b Mon Sep 17 00:00:00 2001 From: Zhuangxingyu Date: Wed, 26 Feb 2025 13:07:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AE=9A=E4=BB=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ItemDefinitionController.java | 92 +- .../dto/ChargeItemDefPageDto.java | 3 +- .../dto/ChargeItemOptionDto.java | 5 + .../datadictionary/dto/ItemDefinitionDto.java | 3 +- .../mapper/ChargeItemDefSearchMapper.java | 9 +- .../common/enums/PublicationStatus.java | 8 + openhis-ui-vue3/package.json | 5 +- openhis-ui-vue3/src/utils/his.js | 264 ++++++ .../definition/components/definition.js | 36 + .../definition/components/edit.vue | 215 +++++ .../views/datadictionary/definition/index.vue | 790 ++++++++++++++++++ 11 files changed, 1377 insertions(+), 53 deletions(-) create mode 100644 openhis-ui-vue3/src/utils/his.js create mode 100644 openhis-ui-vue3/src/views/datadictionary/definition/components/definition.js create mode 100644 openhis-ui-vue3/src/views/datadictionary/definition/components/edit.vue create mode 100644 openhis-ui-vue3/src/views/datadictionary/definition/index.vue diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java index e068e18a..17f3e656 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/ItemDefinitionController.java @@ -3,10 +3,8 @@ */ package com.openhis.web.datadictionary.controller; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; @@ -33,6 +31,7 @@ import com.openhis.administration.domain.ChargeItemDefinition; import com.openhis.administration.service.IChargeItemDefAppService; import com.openhis.administration.service.IChargeItemDefinitionService; import com.openhis.common.constant.PromptMsgConstant; +import com.openhis.common.enums.PublicationStatus; import com.openhis.web.datadictionary.dto.ChargeItemDefPageDto; import com.openhis.web.datadictionary.dto.ChargeItemOptionDto; import com.openhis.web.datadictionary.dto.ItemDefSearchParam; @@ -72,56 +71,55 @@ public class ItemDefinitionController { List chargeItemOptions = new ArrayList<>(); if (DefinitionTypeEnum.MEDICATION.getCode().equals(itemDefSearchParam.getDefinitionType())) { // 西药 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.WEST_MEDICINE.getCode()) - .setLabel(ChargeItemEnum.WEST_MEDICINE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.WEST_MEDICINE.getCode(), + ChargeItemEnum.WEST_MEDICINE.getInfo())); // 中药饮片 - chargeItemOptions - .add(new ChargeItemOptionDto().setValue(ChargeItemEnum.CHINESE_MEDICINE_SLICES_FEE.getCode()) - .setLabel(ChargeItemEnum.CHINESE_MEDICINE_SLICES_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.CHINESE_MEDICINE_SLICES_FEE.getCode(), + ChargeItemEnum.CHINESE_MEDICINE_SLICES_FEE.getInfo())); // 中成药 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.CHINESE_MEDICINE_FEE.getCode()) - .setLabel(ChargeItemEnum.CHINESE_MEDICINE_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.CHINESE_MEDICINE_FEE.getCode(), + ChargeItemEnum.CHINESE_MEDICINE_FEE.getInfo())); // 其他 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.OTHER_FEE.getCode()) - .setLabel(ChargeItemEnum.OTHER_FEE.getInfo())); + chargeItemOptions + .add(new ChargeItemOptionDto(ChargeItemEnum.OTHER_FEE.getCode(), ChargeItemEnum.OTHER_FEE.getInfo())); } else if (DefinitionTypeEnum.DEVICE.getCode().equals(itemDefSearchParam.getDefinitionType())) { // 卫生材料 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.SANITARY_MATERIALS_FEE.getCode()) - .setLabel(ChargeItemEnum.SANITARY_MATERIALS_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.SANITARY_MATERIALS_FEE.getCode(), + ChargeItemEnum.SANITARY_MATERIALS_FEE.getInfo())); // 其他 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.OTHER_FEE.getCode()) - .setLabel(ChargeItemEnum.OTHER_FEE.getInfo())); + chargeItemOptions + .add(new ChargeItemOptionDto(ChargeItemEnum.OTHER_FEE.getCode(), ChargeItemEnum.OTHER_FEE.getInfo())); } else if (DefinitionTypeEnum.ACTIVITY.getCode().equals(itemDefSearchParam.getDefinitionType())) { // 床位 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.BED_FEE.getCode()) - .setLabel(ChargeItemEnum.BED_FEE.getInfo())); + chargeItemOptions + .add(new ChargeItemOptionDto(ChargeItemEnum.BED_FEE.getCode(), ChargeItemEnum.BED_FEE.getInfo())); // 诊察 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.DIAGNOSTIC_FEE.getCode()) - .setLabel(ChargeItemEnum.DIAGNOSTIC_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.DIAGNOSTIC_FEE.getCode(), + ChargeItemEnum.DIAGNOSTIC_FEE.getInfo())); // 检查 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.CHECK_FEE.getCode()) - .setLabel(ChargeItemEnum.CHECK_FEE.getInfo())); + chargeItemOptions + .add(new ChargeItemOptionDto(ChargeItemEnum.CHECK_FEE.getCode(), ChargeItemEnum.CHECK_FEE.getInfo())); // 化验 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.DIAGNOSTIC_TEST_FEE.getCode()) - .setLabel(ChargeItemEnum.DIAGNOSTIC_TEST_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.DIAGNOSTIC_TEST_FEE.getCode(), + ChargeItemEnum.DIAGNOSTIC_TEST_FEE.getInfo())); // 治疗 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.MEDICAL_EXPENSE_FEE.getCode()) - .setLabel(ChargeItemEnum.MEDICAL_EXPENSE_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.MEDICAL_EXPENSE_FEE.getCode(), + ChargeItemEnum.MEDICAL_EXPENSE_FEE.getInfo())); // 手术 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.OPERATION_FEE.getCode()) - .setLabel(ChargeItemEnum.OPERATION_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.OPERATION_FEE.getCode(), + ChargeItemEnum.OPERATION_FEE.getInfo())); // 护理费 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.NURSING_FEE.getCode()) - .setLabel(ChargeItemEnum.NURSING_FEE.getInfo())); + chargeItemOptions.add( + new ChargeItemOptionDto(ChargeItemEnum.NURSING_FEE.getCode(), ChargeItemEnum.NURSING_FEE.getInfo())); // 其他 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.GENERAL_CONSULTATION_FEE.getCode()) - .setLabel(ChargeItemEnum.GENERAL_CONSULTATION_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.GENERAL_CONSULTATION_FEE.getCode(), + ChargeItemEnum.GENERAL_CONSULTATION_FEE.getInfo())); // 挂号 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.REGISTRATION_FEE.getCode()) - .setLabel(ChargeItemEnum.REGISTRATION_FEE.getInfo())); + chargeItemOptions.add(new ChargeItemOptionDto(ChargeItemEnum.REGISTRATION_FEE.getCode(), + ChargeItemEnum.REGISTRATION_FEE.getInfo())); // 其他 - chargeItemOptions.add(new ChargeItemOptionDto().setValue(ChargeItemEnum.OTHER_FEE.getCode()) - .setLabel(ChargeItemEnum.OTHER_FEE.getInfo())); + chargeItemOptions + .add(new ChargeItemOptionDto(ChargeItemEnum.OTHER_FEE.getCode(), ChargeItemEnum.OTHER_FEE.getInfo())); } return R.ok(chargeItemOptions); } @@ -157,16 +155,13 @@ public class ItemDefinitionController { // 通过 DefinitionType 区分药品定价/器具定价/活动定价 if (DefinitionTypeEnum.MEDICATION.getCode().equals(chargeItemDefPageDto.getDefinitionType())) { queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, "med_medication_definition"); - chargeItemDefinitionPage = - chargeItemDefSearchMapper.getMedList(new Page<>(pageNo, pageSize), queryWrapper); + chargeItemDefinitionPage = chargeItemDefSearchMapper.getMedList(new Page<>(pageNo, pageSize), queryWrapper); } else if (DefinitionTypeEnum.DEVICE.getCode().equals(chargeItemDefPageDto.getDefinitionType())) { queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, "adm_device_definition"); - chargeItemDefinitionPage = - chargeItemDefSearchMapper.getDevList(new Page<>(pageNo, pageSize), queryWrapper); + chargeItemDefinitionPage = chargeItemDefSearchMapper.getDevList(new Page<>(pageNo, pageSize), queryWrapper); } else if (DefinitionTypeEnum.ACTIVITY.getCode().equals(chargeItemDefPageDto.getDefinitionType())) { queryWrapper.eq(ChargeItemDefPageDto::getInstanceTable, "wor_activity_definition"); - chargeItemDefinitionPage = - chargeItemDefSearchMapper.getActList(new Page<>(pageNo, pageSize), queryWrapper); + chargeItemDefinitionPage = chargeItemDefSearchMapper.getActList(new Page<>(pageNo, pageSize), queryWrapper); } return R.ok(chargeItemDefinitionPage, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null)); } @@ -196,6 +191,17 @@ public class ItemDefinitionController { : R.fail(PromptMsgConstant.Common.M00007, null); } + /** + * 修改项目定价 + * + * @return 修改结果 + */ + @GetMapping(value = "/status-enum-option") + public R getDropdownOption() { + return R.ok(Arrays.stream(PublicationStatus.values()) + .map(status -> new ChargeItemOptionDto(status.getValue(), status.getInfo())).collect(Collectors.toList())); + } + /** * 采番测试（例子，非常规代码，请勿调用） * diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java index 1b076786..c2e4d91e 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemDefPageDto.java @@ -6,6 +6,7 @@ package com.openhis.web.datadictionary.dto; import java.math.BigDecimal; import java.util.Date; +import com.openhis.common.enums.PublicationStatus; import lombok.Data; import lombok.experimental.Accessors; @@ -35,7 +36,7 @@ public class ChargeItemDefPageDto { private String totalVolume; /** 状态 */ - private Integer statusEnum; + private PublicationStatus statusEnum; /** 单位 */ private String unitCode; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java index 78bb83c9..ebf06774 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ChargeItemOptionDto.java @@ -21,4 +21,9 @@ public class ChargeItemOptionDto { /** 标签 */ private String label; + + public ChargeItemOptionDto(Integer value, String info) { + this.value = value; + this.label = info; + } } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java index 0ca84024..9413ceb6 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/ItemDefinitionDto.java @@ -3,6 +3,7 @@ */ package com.openhis.web.datadictionary.dto; +import com.openhis.common.enums.PublicationStatus; import lombok.Data; import lombok.experimental.Accessors; @@ -32,7 +33,7 @@ public class ItemDefinitionDto { private String title; /** 状态 */ - private Integer statusEnum; + private PublicationStatus statusEnum; /** 机构编码 */ private String orgCode; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java index a2fc70b2..7566cd11 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/mapper/ChargeItemDefSearchMapper.java @@ -1,7 +1,5 @@ package com.openhis.web.datadictionary.mapper; -import java.util.List; - import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -12,7 +10,6 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.openhis.administration.domain.ChargeItemDefinition; import com.openhis.web.datadictionary.dto.ChargeItemDefPageDto; -import com.openhis.web.datadictionary.dto.ItemDefSearchParam; /** * 费用定价管理Mapper接口 @@ -31,7 +28,7 @@ public interface ChargeItemDefSearchMapper extends BaseMapper getMedList(@Param("page") Page page, - @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper); + @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper); /** * 器具费用定价分页查询 @@ -41,7 +38,7 @@ public interface ChargeItemDefSearchMapper extends BaseMapper getDevList(@Param("page") Page page, - @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper); + @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper); /** * 活动费用定价分页查询 @@ -51,5 +48,5 @@ public interface ChargeItemDefSearchMapper extends BaseMapper getActList(@Param("page") Page page, - @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper); + @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper); } \ No newline at end of file diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java index c7272fd2..4ece8aa5 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java @@ -1,5 +1,6 @@ package com.openhis.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; +import com.fasterxml.jackson.annotation.JsonValue; import lombok.AllArgsConstructor; import lombok.Getter; @@ -16,7 +17,14 @@ public enum PublicationStatus { UNKNOWN(4, "unknown", "未知"); + PublicationStatus(int value, String code, String info) { + this.value = value; + this.code = code; + this.info = info; + } + @EnumValue + @JsonValue // 标记响应json值 private final Integer value; private final String code; private final String info; diff --git a/openhis-ui-vue3/package.json b/openhis-ui-vue3/package.json index a820a230..acd8f81f 100644 --- a/openhis-ui-vue3/package.json +++ b/openhis-ui-vue3/package.json @@ -26,6 +26,7 @@ "fuse.js": "6.6.2", "js-cookie": "3.0.5", "jsencrypt": "3.3.2", + "moment": "^2.30.1", "nprogress": "0.2.0", "pinia": "2.1.7", "vue": "3.3.9", @@ -37,9 +38,9 @@ "@vue/compiler-sfc": "3.3.9", "sass": "1.69.5", "unplugin-auto-import": "0.17.1", + "unplugin-vue-setup-extend-plus": "1.0.0", "vite": "5.0.4", "vite-plugin-compression": "0.5.1", - "vite-plugin-svg-icons": "2.0.1", - "unplugin-vue-setup-extend-plus": "1.0.0" + "vite-plugin-svg-icons": "2.0.1" } } diff --git a/openhis-ui-vue3/src/utils/his.js b/openhis-ui-vue3/src/utils/his.js new file mode 100644 index 00000000..25954883 --- /dev/null +++ b/openhis-ui-vue3/src/utils/his.js @@ -0,0 +1,264 @@ + + +// 日期格式化 +export function parseTime(time, pattern) { + if (arguments.length === 0 || !time) { + return null + } + const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}' + let date + if (typeof time === 'object') { + date = time + } else { + if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { + time = parseInt(time) + } else if (typeof time === 'string') { + time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), ''); + } + if ((typeof time === 'number') && (time.toString().length === 10)) { + time = time * 1000 + } + date = new Date(time) + } + const formatObj = { + y: date.getFullYear(), + m: date.getMonth() + 1, + d: date.getDate(), + h: date.getHours(), + i: date.getMinutes(), + s: date.getSeconds(), + a: date.getDay() + } + const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { + let value = formatObj[key] + // Note: getDay() returns 0 on Sunday + if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] } + if (result.length > 0 && value < 10) { + value = '0' + value + } + return value || 0 + }) + return time_str +} + +// 表单重置 +export function resetForm(refName) { + if (this.$refs[refName]) { + this.$refs[refName].resetFields(); + } +} + +// 添加日期范围 +export function addDateRange(params, dateRange, propName) { + let search = params; + search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {}; + dateRange = Array.isArray(dateRange) ? dateRange : []; + if (typeof (propName) === 'undefined') { + search.params['beginTime'] = dateRange[0]; + search.params['endTime'] = dateRange[1]; + } else { + search.params['begin' + propName] = dateRange[0]; + search.params['end' + propName] = dateRange[1]; + } + return search; +} +export function addDateRanges(params, dateRange1, dateRange2, propName) { + let search = params; + search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {}; + dateRange1 = Array.isArray(dateRange1) ? dateRange1 : []; + dateRange2 = Array.isArray(dateRange2) ? dateRange2 : []; + if (typeof (propName) === 'undefined') { + search.params['beginTime'] = dateRange1[0]; + search.params['endTime'] = dateRange1[1]; + search.params['timeFrom'] = dateRange2[0]; + search.params['timeTo'] = dateRange2[1]; + } else { + search.params['begin' + propName] = dateRange1[0]; + search.params['end' + propName] = dateRange1[1]; + search.params['from' + propName] = dateRange2[0]; + search.params['to' + propName] = dateRange2[1]; + } + return search; +} + +// 回显数据字典 +export function selectDictLabel(datas, value) { + if (value === undefined) { + return ""; + } + var actions = []; + Object.keys(datas).some((key) => { + if (datas[key].value == ('' + value)) { + actions.push(datas[key].label); + return true; + } + }) + if (actions.length === 0) { + actions.push(value); + } + return actions.join(''); +} + +// 回显数据字典（字符串数组） +export function selectDictLabels(datas, value, separator) { + if (value === undefined || value.length ===0) { + return ""; + } + if (Array.isArray(value)) { + value = value.join(","); + } + var actions = []; + var currentSeparator = undefined === separator ? "," : separator; + var temp = value.split(currentSeparator); + Object.keys(value.split(currentSeparator)).some((val) => { + var match = false; + Object.keys(datas).some((key) => { + if (datas[key].value == ('' + temp[val])) { + actions.push(datas[key].label + currentSeparator); + match = true; + } + }) + if (!match) { + actions.push(temp[val] + currentSeparator); + } + }) + return actions.join('').substring(0, actions.join('').length - 1); +} + +// 字符串格式化(%s ) +export function sprintf(str) { + var args = arguments, flag = true, i = 1; + str = str.replace(/%s/g, function () { + var arg = args[i++]; + if (typeof arg === 'undefined') { + flag = false; + return ''; + } + return arg; + }); + return flag ? str : ''; +} + +// 转换字符串，undefined,null等转化为"" +export function parseStrEmpty(str) { + if (!str || str == "undefined" || str == "null") { + return ""; + } + return str; +} + +// 千位分隔 +export function thousandNumber (num) { + return String(num).replace(/\B(?=(\d{3})+(?!\d))/g, ','); // 3是千分位，4是万分位 +}; + +// 数据合并 +export function mergeRecursive(source, target) { + for (var p in target) { + try { + if (target[p].constructor == Object) { + source[p] = mergeRecursive(source[p], target[p]); + } else { + source[p] = target[p]; + } + } catch (e) { + source[p] = target[p]; + } + } + return source; +}; + +/** + * 构造树型结构数据 + * @param {*} data 数据源 + * @param {*} id id字段 默认 'id' + * @param {*} parentId 父节点字段 默认 'parentId' + * @param {*} children 孩子节点字段 默认 'children' + */ +export function handleTree(data, id, parentId, children) { + let config = { + id: id || 'id', + parentId: parentId || 'parentId', + childrenList: children || 'children' + }; + + var childrenListMap = {}; + var nodeIds = {}; + var tree = []; + + for (let d of data) { + let parentId = d[config.parentId]; + if (childrenListMap[parentId] == null) { + childrenListMap[parentId] = []; + } + nodeIds[d[config.id]] = d; + childrenListMap[parentId].push(d); + } + + for (let d of data) { + let parentId = d[config.parentId]; + if (nodeIds[parentId] == null) { + tree.push(d); + } + } + + for (let t of tree) { + adaptToChildrenList(t); + } + + function adaptToChildrenList(o) { + if (childrenListMap[o[config.id]] !== null) { + o[config.childrenList] = childrenListMap[o[config.id]]; + } + if (o[config.childrenList]) { + for (let c of o[config.childrenList]) { + adaptToChildrenList(c); + } + } + } + return tree; +} + +/** +* 参数处理 +* @param {*} params 参数 +*/ +export function tansParams(params) { + let result = '' + for (const propName of Object.keys(params)) { + const value = params[propName]; + var part = encodeURIComponent(propName) + "="; + if (value !== null && value !== "" && typeof (value) !== "undefined") { + if (typeof value === 'object') { + for (const key of Object.keys(value)) { + if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') { + let params = propName + '[' + key + ']'; + var subPart = encodeURIComponent(params) + "="; + result += subPart + encodeURIComponent(value[key]) + "&"; + } + } + } else { + result += part + encodeURIComponent(value) + "&"; + } + } + } + return result +} + + +// 返回项目路径 +export function getNormalPath(p) { + if (p.length === 0 || !p || p == 'undefined') { + return p + }; + let res = p.replace('//', '/') + if (res[res.length - 1] === '/') { + return res.slice(0, res.length - 1) + } + return res; +} + +// 验证是否为blob格式 +export function blobValidate(data) { + return data.type !== 'application/json' +} diff --git a/openhis-ui-vue3/src/views/datadictionary/definition/components/definition.js b/openhis-ui-vue3/src/views/datadictionary/definition/components/definition.js new file mode 100644 index 00000000..e974408f --- /dev/null +++ b/openhis-ui-vue3/src/views/datadictionary/definition/components/definition.js @@ -0,0 +1,36 @@ +import request from '@/utils/request' + +// 查询费用定价信息列表 +export function listDefinition(query) { + return request({ + url: '/dict-manager/definition/item-definition-page', + method: 'get', + params: query + }) +} + +// 初始化下拉选 +export function initOption(query) { + return request({ + url: '/dict-manager/definition/init', + method: 'get', + params: query + }) +} + +// 修改费用定价信息 +export function updateDefinition(data) { + return request({ + url: '/dict-manager/definition/item-definition', + method: 'put', + data: data + }) +} + +// 修改费用定价信息 +export function getOptions() { + return request({ + url: '/dict-manager/definition/status-enum-option', + method: 'get', + }) +} \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/datadictionary/definition/components/edit.vue b/openhis-ui-vue3/src/views/datadictionary/definition/components/edit.vue new file mode 100644 index 00000000..0c9f73a1 --- /dev/null +++ b/openhis-ui-vue3/src/views/datadictionary/definition/components/edit.vue @@ -0,0 +1,215 @@ + + + \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/datadictionary/definition/index.vue b/openhis-ui-vue3/src/views/datadictionary/definition/index.vue new file mode 100644 index 00000000..de908c52 --- /dev/null +++ b/openhis-ui-vue3/src/views/datadictionary/definition/index.vue @@ -0,0 +1,790 @@ + + + \ No newline at end of file