clinic-v2
/
web
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
牛子源 2025-05-23 16:48:16 +08:00
parent 6541a1ba34 0839a6094f
commit 4bf1a144cf
10 changed files with 75 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/assets/iconfont/iconfont.css
View File

@ -1,17 +1,26 @@
@font-face {
font-family: "iconfont"; /* Project id 4921806 */
src: url('iconfont.woff?t=1747274949107') format('woff'),
url('iconfont.ttf?t=1747274949107') format('truetype');
src: url('iconfont.woff2?t=1747988318985') format('woff2'),
url('iconfont.woff?t=1747988318985') format('woff'),
url('iconfont.ttf?t=1747988318985') format('truetype');
}
.iconfont {
font-family: "iconfont", serif !important;
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-qunzutaozhuang:before {
content: "\eac9";
}
.icon-jia:before {
content: "\e6a9";
}
.icon-RectangleCopy:before {
content: "\e6a2";
}

BIN
src/assets/iconfont/iconfont.ttf
View File

Binary file not shown.

BIN
src/assets/iconfont/iconfont.woff
View File

Binary file not shown.

4
src/assets/scss/main.scss
View File

@ -143,6 +143,10 @@ $lighter-color: rgba(#4D6DE4, 0.5);
color: #FFF;
font-size: 16px;
text-align: center;
margin-left: 10px;
&:first-child{
margin-left: 0;
}
&:hover{
background: $lighter-color;
}

4
src/components/registration/Edit.vue
View File

@ -248,8 +248,8 @@ const rules = ref<any>({
phone: [
{required: true, message: '请输入手机号', trigger: 'blur'},
],
organzationDoctorId: [
{required: true, message: '请选择医生', trigger: 'blur'},
organizationDoctorId: [
{required: true, message: '请选择医生', trigger: 'change'},
],
certType: [
{required: true, message: '请选择证件类型', trigger: 'change'},

12
src/views/inventory/supplier.vue
View File

@ -33,18 +33,18 @@
</div>
<div class="content">
<el-table :data="tableData" style="width: 100%;height: 100%" @row-click="editSupplier" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
<el-table-column label="供应商名称" prop="name" width="250">
<el-table-column label="供应商名称" prop="name" show-overflow-tooltip>
</el-table-column>
<el-table-column label="启用状态" prop="turn" width="150">
<el-table-column label="启用状态" prop="turn" width="150" show-overflow-tooltip>
<template #default="scope">
<el-tag type="success" v-if="scope.row.turn ==1">启用中</el-tag>
<el-tag type="info" v-else>已禁用</el-tag>
</template>
</el-table-column>
<el-table-column label="许可证号" prop="licenseCode"></el-table-column>
<el-table-column label="联系人" prop="contactName" width="100"></el-table-column>
<el-table-column label="联系方式" prop="contactTel" width="150"></el-table-column>
<el-table-column label="备注" prop="remark"/>
<el-table-column label="许可证号" prop="licenseCode" show-overflow-tooltip></el-table-column>
<el-table-column label="联系人" prop="contactName" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="联系方式" prop="contactTel" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="备注" prop="remark" show-overflow-tooltip/>
</el-table>
</div>
<div class="bottom">

33
src/views/settings/item.vue
View File

@ -17,10 +17,22 @@
</el-form>
</div>
<div class="title-btn">
<span class="default-btn" @click="initData()">查询</span>
<span class="default-btn" @click="resetSearch">重置</span>
<span class="default-btn" @click="openDialog">新建项目</span>
<span class="default-btn" @click="openGroupDialog">组套</span>
<span class="default-btn" @click="initData()">
<span class="iconfont icon-RectangleCopy1"></span>
查询
</span>
<span class="default-btn" @click="resetSearch">
<span class="iconfont icon-RectangleCopy"></span>
重置
</span>
<span class="default-btn" @click="openDialog">
<span class="iconfont icon-jia"></span>
新建项目
</span>
<span class="default-btn" @click="openGroupDialog">
<span class="iconfont icon-qunzutaozhuang"></span>
组套
</span>
</div>
</div>
<div class="table">
@ -119,27 +131,14 @@ const loading= ref(true)
background: #fff;
display: flex;
flex-direction: column;
.title-btn{
.default-btn{
margin-right: 24px;
&:last-child{
margin-right: 0;
}
}
}
.title {
display: flex;
height: 60px;
align-items: center;
justify-content: space-between;
.title-search {
padding: 10px;
border-radius: 10px;
box-sizing: border-box;
margin-top: 10px;
margin-bottom: 10px;
display: flex;
}

2
src/views/settings/log.vue
View File

@ -13,7 +13,7 @@
/>
<el-input placeholder="请输入内容" v-model="searchModel.managerName" style="width: 180px;"></el-input>
<el-input placeholder="请输入内容" v-model="searchModel.message" style="width: 180px;"></el-input>
<span class="default-btn" @click="getData">查询</span>
<span class="default-btn" @click="getData"><span class="iconfont icon-RectangleCopy" style="margin-right: 5px"></span>查询</span>
</el-form>
</div>
<div class="right">

20
src/views/settings/member.vue
View File

@ -25,9 +25,15 @@
</el-form>
</div>
<div class="title-btn">
<span class="default-btn" @click="init()">查询</span>
<span class="default-btn" @click="resetSearch" style="margin: 0 24px">重置</span>
<span class="default-btn" @click="openDialog(null)">新增</span>
<span class="default-btn" @click="resetSearch">
<span class="iconfont icon-RectangleCopy1"></span>
重置
</span>
<span class="default-btn" @click="init()"><span class="iconfont icon-RectangleCopy"></span>查询</span>
<span class="default-btn" @click="openDialog(null)">
<span class="iconfont icon-jia"></span>
新增
</span>
</div>
</div>
<div class="table">
@ -190,10 +196,18 @@ const resetSearch = () => {
justify-content: flex-end;
}
}
:deep(.el-input__wrapper) {
height: 42px;
}
:deep(.el-select__wrapper) {
height: 42px;
}
.default-btn{
margin-left: 10px;
&:first-child{
margin-left: 0;
}
}
</style>

16
src/views/settings/section.vue
View File

@ -18,9 +18,18 @@
</el-form>
</div>
<div class="title-btn">
<span class="default-btn" @click="init()">查询</span>
<span class="default-btn" @click="resetSearch" style="margin: 0 24px">重置</span>
<span class="default-btn" @click="openDialog">新增</span>
<span class="default-btn" @click="resetSearch">
<span class="iconfont icon-RectangleCopy1"></span>
重置
</span>
<span class="default-btn" @click="init()">
<span class="iconfont icon-RectangleCopy"></span>
查询
</span>
<span class="default-btn" @click="openDialog">
<span class="iconfont icon-jia"></span>
新增
</span>
</div>
</div>
<div class="table">
@ -191,7 +200,6 @@ const getDeptDisplayName = (code: string): string => {
height: 60px;
display: flex;
justify-content: space-between;
align-items: center;
}
.table {