wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

merge: 合并远程 develop 分支，解决 package-lock.json 冲突

Browse Source
This commit is contained in:
华佗
2026-06-02 16:00:39 +08:00
parent 67a0f7fc08 6958654d26
commit 9b785e5e63
162 changed files with 2143 additions and 2552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openhis-ui-vue3/src/views/medicationmanagement/pharmacyReconciliation/index.vue
View File

@@ -516,10 +516,10 @@ onMounted(() => {
}
.text-red {
color: #f56c6c;
color: #EF4444;
}
.text-green {
color: #67c23a;
color: #10B981;
}
</style>

6
openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/outpatientDepartmentMetrics.vue
View File

@@ -507,17 +507,17 @@ getList();
<style scoped>
.subtotal-text {
font-weight: bold;
color: #409EFF;
color: #3B82F6;
}
.drug-text {
font-weight: bold;
color: #67C23A;
color: #10B981;
}
.total-text {
font-weight: bold;
color: #F56C6C;
color: #EF4444;
}
/* 行样式 */

2
openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/pharmacyMonthlybalance.vue
View File

@@ -402,7 +402,7 @@ function handleExport() {
}
.link {
color: #409eff;
color: #3B82F6;
cursor: pointer;
text-decoration: underline;
}

16
openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/portal.vue
View File

@@ -18,7 +18,7 @@
<div class="card-icon">
<i
class="el-icon-data-analysis"
style="font-size: 36px; color: #409EFF;"
style="font-size: 36px; color: #3B82F6;"
/>
</div>
<div class="card-text">
@@ -37,7 +37,7 @@
<div class="card-icon">
<i
class="el-icon-warning-outline"
style="font-size: 36px; color: #E6A23C;"
style="font-size: 36px; color: #F59E0B;"
/>
</div>
<div class="card-text">
@@ -56,7 +56,7 @@
<div class="card-icon">
<i
class="el-icon-trend-charts"
style="font-size: 36px; color: #67C23A;"
style="font-size: 36px; color: #10B981;"
/>
</div>
<div class="card-text">
@@ -75,7 +75,7 @@
<div class="card-icon">
<i
class="el-icon-sell"
style="font-size: 36px; color: #F56C6C;"
style="font-size: 36px; color: #EF4444;"
/>
</div>
<div class="card-text">
@@ -94,7 +94,7 @@
<div class="card-icon">
<i
class="el-icon-shopping-cart-full"
style="font-size: 36px; color: #909399;"
style="font-size: 36px; color: #64748B;"
/>
</div>
<div class="card-text">
@@ -113,7 +113,7 @@
<div class="card-icon">
<i
class="el-icon-shopping-cart-1"
style="font-size: 36px; color: #409EFF;"
style="font-size: 36px; color: #3B82F6;"
/>
</div>
<div class="card-text">
@@ -149,7 +149,7 @@ const goToPage = (path) => {
.portal-description {
text-align: center;
color: #909399;
color: #64748B;
margin-bottom: 30px;
}
@@ -188,7 +188,7 @@ const goToPage = (path) => {
p {
margin: 0;
font-size: 14px;
color: #909399;
color: #64748B;
}
}
}

4
openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/reconciliationDetails.vue
View File

@@ -112,10 +112,10 @@
>
请上传
<template v-if="fileSize">
大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
大小不超过 <b style="color: #EF4444">{{ fileSize }}MB</b>
</template>
<template v-if="fileType">
格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
格式为 <b style="color: #EF4444">{{ fileType.join("/") }}</b>
</template>
的文件
</div>

6
openhis-ui-vue3/src/views/medicationmanagement/storeReconciliation/index.vue
View File

@@ -479,10 +479,10 @@ onMounted(() => {
</script>
<style lang="scss" scoped>
.label-red {
color: #f56c6c;
color: #EF4444;
}
.label-green {
color: #67c23a;
color: #10B981;
}
.formula-wrapper {
margin-top: 8px;
@@ -505,6 +505,6 @@ onMounted(() => {
}
.formula-operator {
padding: 0 2px;
color: #909399;
color: #64748B;
}
</style>