Yajentine/his
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

版本更新

Browse Source
This commit is contained in:
Zhang.WH
2025-10-16 17:38:08 +08:00
parent f515bb8fbb
commit e4c5f36f2e
488 changed files with 41436 additions and 2901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-ui-vue3/src/views/catalog/device/components/deviceDialog.vue
View File

@@ -136,7 +136,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="拆零比" prop="partPercent">
<el-input v-model="form.partPercent" placeholder="" />
<el-input-number v-model="form.partPercent" controls-position="right" placeholder="" :min="1"/>
</el-form-item>
</el-col>
<el-col :span="8">

78
openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue
View File

@@ -115,6 +115,11 @@
>启用</el-button
>
</el-col>
<el-col :span="1.5">
<el-button type="info" plain icon="Upload" @click="handleImport">导入</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" plain icon="Search" @click="getList">查询</el-button>
</el-col>
@@ -337,10 +342,34 @@
}
"
/>
<!-- 诊疗目录导入对话框 -->
<el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
<el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
<el-icon class="el-icon--upload"><upload-filled /></el-icon>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<template #tip>
<div class="el-upload__tip text-center">
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
@click="importTemplate">下载模板</el-link>
</div>
</template>
</el-upload>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="upload.open = false">取 消</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="DiagnosisTreatment">
import { getToken } from "@/utils/auth";
import {
getDiagnosisTreatmentList,
stopDiseaseTreatment,
@@ -373,6 +402,23 @@ const currentData = ref({});
const viewData = ref({});
const currentCategoryEnum = ref('');
/*** 诊疗目录导入参数 */
const upload = reactive({
// 是否显示弹出层
open: false,
// 弹出层标题
title: "",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的数据
updateSupport: 0,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: import.meta.env.VITE_APP_BASE_API + "/data-dictionary/diagnosis-treatment/import-data"
});
const data = reactive({
form: {},
queryParams: {
@@ -475,6 +521,38 @@ function handleExport() {
);
}
/** 导入按钮操作 */
function handleImport() {
upload.title = '诊疗目录导入';
upload.open = true;
}
/** 下载模板操作 */
function importTemplate() {
proxy.download('/data-dictionary/diagnosis-treatment/import-template', {}, `diagnosis_treatment_template_${new Date().getTime()}.xlsx`);
}
/**文件上传中处理 */
const handleFileUploadProgress = (event, file, fileList) => {
upload.isUploading = true;
};
/** 文件上传成功处理 */
const handleFileSuccess = (response, file, fileList) => {
upload.open = false;
upload.isUploading = false;
proxy.$refs['uploadRef'].handleRemove(file);
proxy.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg +
'</div>',
'导入结果',
{ dangerouslyUseHTMLString: true }
);
getList();
};
/** 提交上传文件 */
function submitFileForm() {
proxy.$refs['uploadRef'].submit();
}
/** 选择条数 */
function handleSelectionChange(selection) {
console.log(selection, 'selection');

2
openhis-ui-vue3/src/views/catalog/medicine/components/medicineDialog.vue
View File

@@ -287,7 +287,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="拆零比" prop="partPercent">
<el-input v-model="form.partPercent" placeholder="" />
<el-input-number v-model="form.partPercent" controls-position="right" placeholder="" :min="1"/>
</el-form-item>
</el-col>

48
openhis-ui-vue3/src/views/catalog/medicine/components/medicineYbDialog.vue
View File

@@ -70,6 +70,7 @@
<script setup>
import { getYbMedicationList, queryYbCatalogue } from './medicine';
import { formatDateStr } from '@/utils/index';
const emit = defineEmits(['selectMedicine']);
const visible = ref(false);
@@ -107,28 +108,33 @@ function cancel() {
}
function handlewAddMedicine(row) {
queryYbCatalogue({ hilistCode: row.medicalCatalogCode, dateStr: '2020-01-01' }).then((res) => {
if (res.data.length > 0) {
let resultList = res.data.filter((item) => {
return (
item.memo != null &&
item.memo != '' &&
item.memo != 'null' &&
item.memo != '目录变更' &&
item.memo != '历史数据迁移' &&
item.memo != '0' &&
item.memo != ' '
);
});
if (resultList.length > 0) {
row.restrictedFlag = 1;
row.restrictedScope = resultList[0].memo;
queryYbCatalogue({
hilistCode: row.medicalCatalogCode,
dateStr: formatDateStr(new Date(), 'YYYY') + '-01-01',
})
.then((res) => {
if (res.data.length > 0) {
let resultList = res.data.filter((item) => {
return (
item.memo != null &&
item.memo != '' &&
item.memo != 'null' &&
item.memo != '目录变更' &&
item.memo != '历史数据迁移' &&
item.memo != '0' &&
item.memo != ' '
);
});
if (resultList.length > 0) {
row.restrictedFlag = 1;
row.restrictedScope = resultList[0].memo;
}
}
}
emit('selectMedicine', row);
}).catch(() => {
emit('selectMedicine', row);
});
emit('selectMedicine', row);
})
.catch(() => {
emit('selectMedicine', row);
});
cancel();
}