diff --git a/openhis-ui-vue3/package-lock.json b/openhis-ui-vue3/package-lock.json index 4b106bf0..6e2324e6 100644 --- a/openhis-ui-vue3/package-lock.json +++ b/openhis-ui-vue3/package-lock.json @@ -3,14 +3,6 @@ "version": "3.8.7", "lockfileVersion": 3, "requires": true, - "resolutions": { - "stable": "^0.1.8", - "source-map-url": "^0.4.1", - "urix": "^0.1.0", - "resolve-url": "^0.2.1", - "source-map-resolve": "^0.6.0", - "sourcemap-codec": "^1.4.8" - }, "packages": { "": { "name": "openhis", @@ -8329,5 +8321,13 @@ "tslib": "2.3.0" } } + }, + "resolutions": { + "resolve-url": "^0.2.1", + "source-map-resolve": "^0.6.0", + "source-map-url": "^0.4.1", + "sourcemap-codec": "^1.4.8", + "stable": "^0.1.8", + "urix": "^0.1.0" } -} \ No newline at end of file +} diff --git a/openhis-ui-vue3/src/api/system/config.js b/openhis-ui-vue3/src/api/system/config.js index a404d825..f22408e5 100644 --- a/openhis-ui-vue3/src/api/system/config.js +++ b/openhis-ui-vue3/src/api/system/config.js @@ -18,10 +18,11 @@ export function getConfig(configId) { } // 根据参数键名查询参数值 -export function getConfigKey(configKey) { +export function getConfigKey(configKey, options = {}) { return request({ url: '/system/config/configKey/' + configKey, - method: 'get' + method: 'get', + ...options }) } diff --git a/openhis-ui-vue3/src/views/maintainSystem/chargeConfig/index.vue b/openhis-ui-vue3/src/views/maintainSystem/chargeConfig/index.vue index 0074b351..20f63dcd 100644 --- a/openhis-ui-vue3/src/views/maintainSystem/chargeConfig/index.vue +++ b/openhis-ui-vue3/src/views/maintainSystem/chargeConfig/index.vue @@ -16,97 +16,147 @@ - +
- - + + - - 病历费入账标志 + +
- - + + - - 是否启用晚班 + +
- - 就诊卡记账标志 + + - - + +
- - 自动产生门诊号 + + - - 建档时是否允许修改门诊号 + +
- - + + - +
- - + + - +
- - 减免标志 + + - - 义诊标志 + + - - 启用法定节假日挂号费浮动 + +
- - + + - - 门诊挂号启用双屏 + +
- - 挂号类型可选择 + +
@@ -132,10 +182,10 @@