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

This commit is contained in:
闫晓茹 2024-06-20 14:09:41 +08:00
commit 3a5053d2fa
13 changed files with 197 additions and 61 deletions

View File

@ -1,14 +1,17 @@
<template>
<div style="background-color: #f1f3f5">
<div
slot="footer"
style="float: right; padding: 10px 10px 0 0; height: 35px"
>
<el-button size="mini" @click="cancel"> </el-button>
<el-button size="mini" type="primary" @click="auditing"
>审核通过</el-button
>
<el-button size="mini" type="info" @click="ignore">忽略</el-button>
<div slot="footer" class="topfooter">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="画像审核" name="portrait"></el-tab-pane>
<el-tab-pane label="路径审核" name="route"></el-tab-pane>
</el-tabs>
<div class="right">
<el-button size="mini" @click="cancel"> </el-button>
<el-button size="mini" type="primary" @click="auditing"
>审核通过</el-button
>
<el-button size="mini" type="info" @click="ignore">忽略</el-button>
</div>
</div>
<div class="card">
<div class="cardleft">
@ -80,6 +83,9 @@
<div class="text" v-if="list.visitMethod == 'BE_IN_HOSPITAL'">
出院时间: {{ list.dischargeTime }}
</div>
<div class="text" v-if="list.visitMethod == 'BE_IN_HOSPITAL'">
审核时间: {{ list.dischargeTime }}
</div>
<div class="text" v-if="list.visitMethod == 'OUTPATIENT_SERVICE'">
就诊时间: {{ list.dischargeTime }}
</div>
@ -302,6 +308,7 @@ export default {
name: "Auditing",
data() {
return {
activeName: 'portrait',
baseUrl: process.env.VUE_APP_BASE_API,
activeNames: ['-1', '-2', '-3'],
list: {},
@ -315,6 +322,9 @@ export default {
this.info();
},
methods: {
handleClick(tab, event) {
console.log(tab, event,this.activeName);
},
//
lookpropaganda(item) {
this.lookitem = item.detailInfo
@ -422,14 +432,35 @@ export default {
};
</script>
<style lang="scss" scoped>
::v-deep iframe{
width:100%;
height: 500px;
::v-deep .el-tabs__nav{
padding-left: 15px;
}
::v-deep .el-tabs__active-bar{
left: 15px;
}
::v-deep iframe {
width: 100%;
height: 500px;
}
::v-deep .el-collapse-item__header {
font-size: 16px;
font-weight: bold;
}
.topfooter {
background: #fff;
width: 98%;
margin: 0 auto;
padding: 20px 0;
.right {
/* float: right; */
padding: 10px 10px 0 0;
height: 35px;
position: absolute;
right: 15px;
top: 8px;
}
}
.texts {
margin: 16px 0 20px;
@ -452,7 +483,7 @@ export default {
width: 100%;
display: flex;
justify-content: space-evenly;
padding: 20px 0;
// padding: 20px 0;
height: calc(100vh - 119px);
.cardleft {
@ -515,6 +546,7 @@ export default {
width: 62%;
padding: 20px;
font-size: 14px;
margin-top: 20px;
.textarea {
font-size: 14px;

View File

@ -60,8 +60,10 @@
</el-table-column>
</el-table>
</div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> -->
<myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
:indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
</el-col>
</el-row>
<!-- 添加或修改手术信息对话框 -->
@ -132,8 +134,10 @@
<el-table-column property="departmentName" label="科室名称" align="center" :show-overflow-tooltip="true">
</el-table-column>
</el-table>
<pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
:limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" class="pag"/>
<!-- <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
:limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" /> -->
<myPagination v-show="totaldepartment > 0" :total="totaldepartment" :pageSize="informationqueryParams.pageSize"
:indexFromWrap="informationqueryParams.pageNum" @updateCPage="updateCPagetwo"></myPagination>
</el-dialog>
</div>
</template>
@ -489,6 +493,16 @@ export default {
...this.queryParams
}, `operationInfo_${new Date().getTime()}.xlsx`)
},
updateCPage(index, size) {
this.queryParams.pageNum = index
this.queryParams.pageSize = size
this.getList();
},
updateCPagetwo(index, size) {
this.informationqueryParams.pageNum = index
this.informationqueryParams.pageSize = size
this.informationInfoinfo();
},
//
getMaxTableHeight() {
const windowInnerHeight = window.innerHeight //
@ -516,12 +530,10 @@ export default {
};
</script>
<style lang="scss" scoped>
.pag{
top: 13px;
position: relative;
left: 61%;
::v-deep .el-dialog__body {
padding-bottom: 60px !important;
}
::v-deep .el-input-number .el-input__inner {
text-align: left;
}

View File

@ -89,8 +89,10 @@
</el-table-column>
</el-table>
</div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
:indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> -->
<!-- 添加或修改机构类别对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@ -221,6 +223,11 @@ export default {
this.screenChange()
},
methods: {
updateCPage(index, size) {
this.queryParams.pageNum = index
this.queryParams.pageSize = size
this.getList();
},
//
gettreelistitem() {
agencyCategoryList().then((res) => {

View File

@ -90,9 +90,10 @@
</el-table-column>
</el-table>
</div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> -->
<myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
:indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
<!-- 添加或修改标准科室对照信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline="true">
@ -146,26 +147,26 @@
<el-form-item label="科室名称" prop="departmentName" label-width="120">
<el-input v-model="informationqueryParams.departmentName" placeholder="请输入科室名称" clearable />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="informationInfoinfo">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="addresetQuerylist">重置</el-button>
</el-form-item>
</el-form>
<el-table :data="infolist" @cell-dblclick="nurseclick" v-loading="loading">
<el-table-column label="请选择" width="100" align="center">
<el-table-column label="请选择" width="150" align="center">
<template slot-scope="scope">
<el-button type="primary" style="width: 15px; height: 15px"
v-if="form.departmentId == scope.row.departmentCode" circle @click="nurseclick(scope.row)"></el-button>
<el-button v-else style="width: 15px; height: 15px" circle @click="nurseclick(scope.row)"></el-button>
</template>
</el-table-column>
<el-table-column property="departmentName" label="科室名称" align="center" :show-overflow-tooltip="true">
<el-table-column property="departmentName" label="科室名称" align="center" :show-overflow-tooltip="true">
</el-table-column>
</el-table>
<pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
:limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" />
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> -->
<myPagination v-show="totaldepartment > 0" :total="totaldepartment" :pageSize="informationqueryParams.pageSize"
:indexFromWrap="informationqueryParams.pageNum" @updateCPage="updateCPagetwo"></myPagination>
</el-dialog>
</div>
</template>
@ -258,6 +259,16 @@ export default {
// console.log(this.departmentName, "0000");
this.innerVisibleshow = false;
},
updateCPage(index, size) {
this.queryParams.pageNum = index
this.queryParams.pageSize = size
this.getList();
},
updateCPagetwo(index, size) {
this.informationqueryParams.pageNum = index
this.informationqueryParams.pageSize = size
this.informationInfoinfo();
},
//
informationInfoinfo() {
department(this.informationqueryParams).then((response) => {
@ -403,3 +414,8 @@ export default {
}
};
</script>
<style scoped>
::v-deep .el-dialog__body {
padding-bottom: 60px !important;
}
</style>

View File

@ -79,8 +79,10 @@
</el-table-column>
</el-table>
</div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
:indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> -->
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
@ -172,6 +174,11 @@ export default {
this.screenChange()
},
methods: {
updateCPage(index, size) {
this.queryParams.pageNum = index
this.queryParams.pageSize = size
this.getList();
},
/** 查询参数列表 */
getList() {
this.loading = true;

View File

@ -99,8 +99,10 @@
</el-table-column>
</el-table>
</div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" /> -->
<myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
:indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
</el-col>
</el-row>
<!-- 导入 -->
@ -477,6 +479,11 @@ export default {
this.infocompare();
},
methods: {
updateCPage(index, size) {
this.queryParams.pageNum = index
this.queryParams.pageSize = size
this.getList();
},
optionsubdivision(e) {
// this.form.subdivisionCategoryId = this.optionsubdivisionCategory.find(
// (e) => e.id == this.form.subdivisionCategoryId

View File

@ -112,9 +112,10 @@
</el-table-column>
</el-table>
</div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> -->
<myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
:indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
</el-col>
</el-row>
<!-- 添加或修改科室病种信息对话框 -->
@ -211,7 +212,7 @@
</el-form>
<el-table :data="infolist" @cell-dblclick="nurseclick" v-loading="loading">
<el-table-column label="请选择" width="100" align="center">
<el-table-column label="请选择" width="150" align="center">
<template slot-scope="scope">
<el-button type="primary" style="width: 15px; height: 15px" v-if="form.departmentId == scope.row.id" circle
@click="nurseclick(scope.row)"></el-button>
@ -221,8 +222,10 @@
<el-table-column property="departmentName" label="科室名称" align="center" :show-overflow-tooltip="true">
</el-table-column>
</el-table>
<pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
:limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" />
<!-- <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
:limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" /> -->
<myPagination v-show="totaldepartment > 0" :total="totaldepartment" :pageSize="informationqueryParams.pageSize"
:indexFromWrap="informationqueryParams.pageNum" @updateCPage="updateCPagetwo"></myPagination>
</el-dialog>
</div>
</template>
@ -570,6 +573,16 @@ export default {
`科室病种信息_${new Date().getTime()}.xlsx`
);
},
updateCPage(index, size) {
this.queryParams.pageNum = index
this.queryParams.pageSize = size
this.getList();
},
updateCPagetwo(index, size) {
this.informationqueryParams.pageNum = index
this.informationqueryParams.pageSize = size
this.informationInfoinfo();
},
//
getMaxTableHeight() {
const windowInnerHeight = window.innerHeight //
@ -645,7 +658,13 @@ export default {
top: -11px;
}
</style>
<style lang="scss" scoped>
::v-deep .el-dialog__body {
padding-bottom: 60px !important;
}
.app-container {
padding: 20px 0 0 20px !important;
}
@ -654,4 +673,3 @@ export default {
height: 100% !important;
}
</style>

View File

@ -85,9 +85,10 @@
</el-table-column>
</el-table>
</div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> -->
<myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
:indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
@ -173,6 +174,11 @@ export default {
this.screenChange()
},
methods: {
updateCPage(index, size) {
this.queryParams.pageNum = index
this.queryParams.pageSize = size
this.getList();
},
/** 查询字典类型列表 */
getList() {
this.loading = true;

View File

@ -70,9 +70,10 @@
</el-table-column>
</el-table>
</div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
:indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> -->
<!-- 添加或修改公告对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
@ -171,6 +172,11 @@ export default {
this.screenChange()
},
methods: {
updateCPage(index, size) {
this.queryParams.pageNum = index
this.queryParams.pageSize = size
this.getList();
},
/** 查询公告列表 */
getList() {
this.loading = true;

View File

@ -69,8 +69,10 @@
</el-table-column>
</el-table>
</div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
:indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> -->
<!-- 添加或修改岗位对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@ -161,6 +163,11 @@ export default {
this.screenChange()
},
methods: {
updateCPage(index, size) {
this.queryParams.pageNum = index
this.queryParams.pageSize = size
this.getList();
},
/** 查询岗位列表 */
getList() {
this.loading = true;

View File

@ -88,9 +88,10 @@
</el-table-column>
</el-table>
</div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
:indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> -->
<!-- 添加或修改角色配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@ -270,6 +271,11 @@ export default {
this.getList();
},
methods: {
updateCPage(index, size) {
this.queryParams.pageNum = index
this.queryParams.pageSize = size
this.getList();
},
/** 查询角色列表 */
getList() {
this.loading = true;

View File

@ -64,10 +64,10 @@
</el-table-column>
</el-table>
</div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> -->
<myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
:indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
<!-- 添加或修改细分类别信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline="true">
@ -156,6 +156,11 @@ export default {
this.getList();
},
methods: {
updateCPage(index, size) {
this.queryParams.pageNum = index
this.queryParams.pageSize = size
this.getList();
},
/** 查询细分类别信息列表 */
getList() {
this.loading = true;

View File

@ -101,8 +101,10 @@
</el-table-column>
</el-table>
</div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
:indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> -->
<!-- 添加或修改用户配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
@ -699,6 +701,11 @@ export default {
this.screenChange()
},
methods: {
updateCPage(index, size) {
this.queryParams.pageNum = index
this.queryParams.pageSize = size
this.getList();
},
infopostname() {
var dictType = "post_name";
getAgencytype(dictType).then((res) => {