xinyilu/postdischarge-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
闫晓茹 2024-06-17 09:35:43 +08:00
commit 3095a4af40
7 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/manage/servicewaycontent/index.vue
View File

@ -865,7 +865,7 @@ export default {
.left { .left {
height: calc(100vh - 124px); height: calc(100vh - 124px);
overflow: scroll; overflow-y: auto;
.name { .name {
font-weight: 700; font-weight: 700;

7
src/views/manage/template/index.vue
View File

@ -59,16 +59,11 @@
<el-table-column label="模板来源" align="center" prop="templateSource"> <el-table-column label="模板来源" align="center" prop="templateSource">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.templateSource == "WE_CHAT_APPLET" ? "小程序" : "" }} {{ scope.row.templateSource == "WE_CHAT_APPLET" ? "小程序" : "" }}
{{ {{ scope.row.templateSource == "WE_CHAT_OFFICIAL_ACCOUNT" ? "公众号" : "" }}
scope.row.templateSource == "WE_CHAT_OFFICIAL_ACCOUNT"
? "公众号"
: ""
}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="适用任务类型" align="center" prop="suitTaskTypeName" :show-overflow-tooltip="true" /> <el-table-column label="适用任务类型" align="center" prop="suitTaskTypeName" :show-overflow-tooltip="true" />
<el-table-column label="病种名称" align="center" prop="diseaseTypeName" /> <el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"

2
src/views/system/bank/index.vue
View File

@ -607,7 +607,7 @@ export default {
<style lang="scss"> <style lang="scss">
.left { .left {
height: calc(100vh - 119px); height: calc(100vh - 119px);
overflow: scroll; overflow-y: auto;
.name { .name {
font-weight: 700; font-weight: 700;

7
src/views/system/department/index.vue
View File

@ -66,7 +66,7 @@
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="科室名称" align="center" prop="departmentName" /> <el-table-column label="科室名称" align="center" prop="departmentName" />
<el-table-column label="科室代码" align="center" prop="departmentCode" /> <el-table-column label="科室代码" align="center" prop="departmentCode" :show-overflow-tooltip="true" />
<el-table-column label="科室类型" align="center" prop="departmentType"> <el-table-column label="科室类型" align="center" prop="departmentType">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.departmentType == "ADMINISTRATION_LOGISTICS" ? "行政后勤类" : "" }} {{ scope.row.departmentType == "ADMINISTRATION_LOGISTICS" ? "行政后勤类" : "" }}
@ -811,8 +811,9 @@ export default {
::v-deep .el-row { ::v-deep .el-row {
height: 100% !important; height: 100% !important;
} }
.head-container{
.head-container {
height: calc(100vh - 119px); height: calc(100vh - 119px);
overflow: scroll; overflow-y: auto;
} }
</style> </style>

14
src/views/system/post/index.vue
View File

@ -44,17 +44,17 @@
<div ref="table"> <div ref="table">
<el-table :max-height="maxTableHeight" v-loading="loading" :data="postList" <el-table :max-height="maxTableHeight" v-loading="loading" :data="postList"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="70" align="center" />
<el-table-column label="岗位编号" align="center" prop="postId" /> <el-table-column label="岗位编号" align="center" prop="postId" width="120" />
<el-table-column label="岗位编码" align="center" prop="postCode" /> <el-table-column label="岗位编码" align="center" prop="postCode" width="150" />
<el-table-column label="岗位名称" align="center" prop="postName" /> <el-table-column label="岗位名称" align="center" prop="postName" width="150" />
<el-table-column label="岗位排序" align="center" prop="postSort" /> <el-table-column label="岗位排序" align="center" prop="postSort" width="100" />
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" /> <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="创建时间" align="center" prop="createTime" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>

16
src/views/system/role/index.vue
View File

@ -50,23 +50,23 @@
<div ref="table"> <div ref="table">
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange" <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange"
:max-height="maxTableHeight"> :max-height="maxTableHeight">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" align="center" width="70" />
<el-table-column label="角色编号" prop="roleId" width="120" /> <el-table-column label="角色编号" align="left" prop="roleId" width="100" />
<el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" /> <el-table-column label="角色名称" align="left" prop="roleName" :show-overflow-tooltip="true" width="150" />
<el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" /> <el-table-column label="状态" align="left" width="100">
<el-table-column label="显示顺序" prop="roleSort" width="100" />
<el-table-column label="状态" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1" <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
@change="handleStatusChange(scope.row)"></el-switch> @change="handleStatusChange(scope.row)"></el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="权限字符" align="left" prop="roleKey" :show-overflow-tooltip="true" width="150" />
<el-table-column label="创建时间" align="left" prop="createTime" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="显示顺序" align="left" prop="roleSort" width="120" />
<el-table-column label="操作" align="left" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1"> <template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']">修改</el-button> v-hasPermi="['system:role:edit']">修改</el-button>

18
src/views/system/user/index.vue
View File

@ -56,26 +56,26 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange"
:max-height="maxTableHeight"> :max-height="maxTableHeight">
<el-table-column type="selection" width="100" align="left" /> <el-table-column type="selection" width="100" align="left" />
<el-table-column label="姓名" align="left" prop="nickName" width='150' v-if="columns[1].visible" <el-table-column label="姓名" align="left" prop="nickName" width='120' v-if="columns[1].visible"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column label="系统账号" align="left" prop="userName" width='150' v-if="columns[1].visible" <el-table-column label="系统账号" align="left" prop="userName" width='120' v-if="columns[1].visible"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true" />
<el-table-column label="所属机构" align="left" prop="nickName" width='200' v-if="columns[2].visible" <el-table-column label="账号状态" align="left" key="status" width='150' v-if="columns[5].visible">
:show-overflow-tooltip="true" />
<el-table-column label="手机号码" align="left" key="phonenumber" width='200' prop="phonenumber"
v-if="columns[4].visible" />
<el-table-column label="账号状态" align="left" key="status" width='200' v-if="columns[5].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1" <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
@change="handleStatusChange(scope.row)"></el-switch> @change="handleStatusChange(scope.row)"></el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="left" prop="createTime" v-if="columns[6].visible"> <el-table-column label="所属机构" align="left" prop="nickName" width='170' v-if="columns[2].visible"
:show-overflow-tooltip="true" />
<el-table-column label="手机号码" align="left" key="phonenumber" width='170' prop="phonenumber"
v-if="columns[4].visible" />
<el-table-column label="创建时间" align="left" prop="createTime" width='230' v-if="columns[6].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="left" width="160" class-name="small-padding fixed-width"> <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.userId !== 1"> <template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']">修改</el-button> v-hasPermi="['system:user:edit']">修改</el-button>