Commit 8150555a by wangshuangqing

Merge branch 'feature/修改' into develop

parents 670a906b 173bb4dc
...@@ -11,7 +11,9 @@ ...@@ -11,7 +11,9 @@
<div class="outpatientDetails_top"> <div class="outpatientDetails_top">
<div class="outpatientDetails_top_div1"> <div class="outpatientDetails_top_div1">
<span class="span1">患者信息</span> <span class="span1">患者信息</span>
<!-- <el-button size="mini" type="primary" @click="getControl">医嘱质控</el-button> --> <el-button class="outpatientDetails_top_div1_button" type="primary" size="mini" @click="getControl "
>医嘱质控</el-button
>
<!-- <el-button size="mini" type="primary">医嘱质控</el-button> --> <!-- <el-button size="mini" type="primary">医嘱质控</el-button> -->
</div> </div>
...@@ -158,44 +160,82 @@ ...@@ -158,44 +160,82 @@
<div class="outpatientDetails_bottom" :style="{ height: bottomheight }"> <div class="outpatientDetails_bottom" :style="{ height: bottomheight }">
<!-- 有数据 --> <!-- 有数据 -->
<div <div class="outpatientDetails_bottom_leftShowBox">
class="outpatientDetails_bottom_leftShowBox"
>
<div class="outpatientDetails_bottom_leftShowBox_left"> <div class="outpatientDetails_bottom_leftShowBox_left">
<el-table <el-table
ref="monthlyPlanTable" ref="monthlyPlanTable"
:data="tableData1" :data="tableData1"
style="width: 100%;" style="width: 100%"
height='98%' height="98%"
row-key="id" row-key="id"
size="small" size="small"
:default-expand-all="false" :default-expand-all="false"
:highlight-current-row="true" :highlight-current-row="true"
:tree-props="{ children: 'inpat_FeeDatas', hasChildren: 'hasChildren' }" :tree-props="{
children: 'inpat_FeeDatas',
hasChildren: 'hasChildren',
}"
@row-click="eowclick" @row-click="eowclick"
@expand-change="changeRowClick" @expand-change="changeRowClick"
> >
<el-table-column prop="iteM_TYPE" label="项目名称" width="100" header-align="center" align="center"> </el-table-column> <el-table-column
<el-table-column prop="totalFee" label="总金额(小计)" width="80" header-align="center" align="center"> prop="iteM_TYPE"
label="项目名称"
width="110"
header-align="center"
align="left"
>
</el-table-column>
<el-table-column
prop="totalFee"
label="总金额(小计)"
width="80"
header-align="center"
align="right"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ decimal(scope.row.totalFee) }} {{ decimal(scope.row.totalFee) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="proportion" label="占总费用(比例)" width="80" header-align="center" align="center"> <el-table-column
<template slot-scope="scope" > prop="proportion"
{{scope.row.proportion !=undefined?decimal(scope.row.proportion)+'%':''}} label="占总费用(比例)"
width="90"
header-align="center"
align="right"
>
<template slot-scope="scope">
{{
scope.row.proportion != undefined
? decimal(scope.row.proportion) + "%"
: ""
}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="coreTotalFee" label="预计DRG设定费用(参考)" width="100" header-align="center" align="center"> <el-table-column
<template slot-scope="scope" > prop="coreTotalFee"
{{ decimal(scope.row.coreTotalFee)}} label="预计DRG设定费用(参考)"
width="100"
header-align="center"
align="right"
>
<template slot-scope="scope">
{{ decimal(scope.row.coreTotalFee) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="coreProportion" label="设定费用比例(参考)" header-align="center" align="center"> <el-table-column
<template slot-scope="scope" > prop="coreProportion"
{{ scope.row.coreProportion !=undefined? decimal(scope.row.coreProportion)+'%':''}} label="设定费用比例(参考)"
width="100"
header-align="center"
align="center"
>
<template slot-scope="scope">
{{
scope.row.coreProportion != undefined
? decimal(scope.row.coreProportion) + "%"
: ""
}}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -212,7 +252,7 @@ ...@@ -212,7 +252,7 @@
style="width: 100%" style="width: 100%"
:default-sort="{ prop: 'date', order: 'descending' }" :default-sort="{ prop: 'date', order: 'descending' }"
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
height='98%' height="98%"
> >
<el-table-column <el-table-column
label="开单日期" label="开单日期"
...@@ -274,11 +314,13 @@ ...@@ -274,11 +314,13 @@
<div class="outpatientDetails_bottom_rght2_top_mes"> <div class="outpatientDetails_bottom_rght2_top_mes">
<span <span
class="outpatientDetails_bottom_rght2_top_mes_span1" class="outpatientDetails_bottom_rght2_top_mes_span1"
:class="{ outpatientDetails_bottom_rght2_top_mes_span1background: ind == span1Ind }" :class="{
outpatientDetails_bottom_rght2_top_mes_span1background:
ind == span1Ind,
}"
v-for="(item, ind) in typeCountDatas" v-for="(item, ind) in typeCountDatas"
:key="ind" :key="ind"
@click="gettype(item.name, ind)"
@click="gettype(item.name,ind)"
>{{ item.name }}:<span :style="{ color: item.color }">{{ >{{ item.name }}:<span :style="{ color: item.color }">{{
item.count item.count
}}</span></span }}</span></span
...@@ -292,10 +334,12 @@ ...@@ -292,10 +334,12 @@
<div class="outpatientDetails_bottom_rght2_bottom"> <div class="outpatientDetails_bottom_rght2_bottom">
<div <div
class="outpatientDetails_bottom_rght2_bottom_li" class="outpatientDetails_bottom_rght2_bottom_li"
:class="{outpatientDetails_bottom_rght2_bottom_liInd:ind==liInd}" :class="{
outpatientDetails_bottom_rght2_bottom_liInd: ind == liInd,
}"
v-for="(item, ind) in options" v-for="(item, ind) in options"
:key="ind" :key="ind"
@click="getruleId(item.ruleId,ind)" @click="getruleId(item.ruleId, ind)"
> >
<span <span
v-show="item.projectRuleLevel == '禁止'" v-show="item.projectRuleLevel == '禁止'"
...@@ -343,7 +387,7 @@ import { ...@@ -343,7 +387,7 @@ import {
onMounted, onMounted,
nextTick, nextTick,
computed, computed,
ref ref,
} from "@vue/composition-api"; } from "@vue/composition-api";
import { decimal } from "../utils/decimal"; import { decimal } from "../utils/decimal";
...@@ -353,7 +397,7 @@ import { setItem, getItem } from "../utils/auth"; ...@@ -353,7 +397,7 @@ import { setItem, getItem } from "../utils/auth";
export default { export default {
name: "outpatientDetails", name: "outpatientDetails",
setup() { setup() {
const monthlyPlanTable=ref(); const monthlyPlanTable = ref();
//表格颜色 //表格颜色
const tableRowClassName = ({ row }) => { const tableRowClassName = ({ row }) => {
if (row.rowIndex % 2 == 0) { if (row.rowIndex % 2 == 0) {
...@@ -364,18 +408,18 @@ export default { ...@@ -364,18 +408,18 @@ export default {
}; };
//当某一个行被点击时 //当某一个行被点击时
const eowclick=(row)=>{ const eowclick = (row) => {
if(state.tableData1 !=[]){ if (state.tableData1 != []) {
getInpatFeesByREGCODE(row.types) getInpatFeesByREGCODE(row.types);
} }
}; };
//获取左侧表格数据 //获取左侧表格数据
const getlefttable = () => { const getlefttable = () => {
http http
.post(`/medical/Post/getHisStaChargeType?code=${route.value.query.id}`, {}) .post(
`/medical/Post/getHisStaChargeType?code=${route.value.query.id}`,
{}
)
.then((data) => { .then((data) => {
state.tableData1 = data; state.tableData1 = data;
if (state.tableData1 != []) { if (state.tableData1 != []) {
...@@ -383,7 +427,6 @@ export default { ...@@ -383,7 +427,6 @@ export default {
//默认高亮第一行 //默认高亮第一行
nextTick(() => { nextTick(() => {
monthlyPlanTable.value.setCurrentRow(state.tableData1[0]); monthlyPlanTable.value.setCurrentRow(state.tableData1[0]);
}); });
} }
//中间的表格默认展示第一条数据 //中间的表格默认展示第一条数据
...@@ -391,11 +434,8 @@ export default { ...@@ -391,11 +434,8 @@ export default {
.catch((error) => {}); .catch((error) => {});
}; };
//当行展开和关闭是触发 //当行展开和关闭是触发
const changeRowClick=(row)=>{ const changeRowClick = (row) => {
console.log('row-chang',row); console.log("row-chang", row);
}; };
//异常问题接口 显示全部异常信息 //异常问题接口 显示全部异常信息
...@@ -415,16 +455,19 @@ export default { ...@@ -415,16 +455,19 @@ export default {
.catch((error) => {}); .catch((error) => {});
}; };
//点击异常分类 显示异常信息 //点击异常分类 显示异常信息
const gettype=(name,ind)=>{ const gettype = (name, ind) => {
console.log('name',name); console.log("name", name);
state.showCountDatas = true; state.showCountDatas = true;
state.showbottom = true; state.showbottom = true;
http http
.post(`/medical/get/GetPRHisData?&code=${route.value.query.id}&projectType=${name}`, {}) .post(
`/medical/get/GetPRHisData?&code=${route.value.query.id}&projectType=${name}`,
{}
)
.then((data) => { .then((data) => {
state.liInd=-1; state.liInd = -1;
state.span1Ind=ind; state.span1Ind = ind;
state.options = data.projectRules; state.options = data.projectRules;
// state.typeCountDatas = data.typeCountDatas; // state.typeCountDatas = data.typeCountDatas;
// if (data.typeCountDatas == null) { // if (data.typeCountDatas == null) {
...@@ -434,30 +477,23 @@ export default { ...@@ -434,30 +477,23 @@ export default {
state.showbottom = false; state.showbottom = false;
} }
}) })
.catch((error) => { .catch((error) => {});
});
}; };
//点击获取中间的表格数据 //点击获取中间的表格数据
const getruleId=(ruleId,ind)=>{ const getruleId = (ruleId, ind) => {
http http
.post(`/medical/Post/GetiFHisByItemCode?code=${route.value.query.id}&ruleId=${ruleId}`, {}) .post(
`/medical/Post/GetiFHisByItemCode?code=${route.value.query.id}&ruleId=${ruleId}`,
{}
)
.then((data) => { .then((data) => {
state.liInd=ind; state.liInd = ind;
state.tableData = data; state.tableData = data;
}) })
.catch((error) => { .catch((error) => {});
});
}; };
//医嘱质控 //医嘱质控
const getControl = () => { const getControl = () => {
http http
...@@ -524,8 +560,6 @@ export default { ...@@ -524,8 +560,6 @@ export default {
} else if (data.lowMagnification != 0) { } else if (data.lowMagnification != 0) {
state.bottomheight = "70%"; state.bottomheight = "70%";
} }
}) })
.catch((error) => {}); .catch((error) => {});
}; };
...@@ -552,7 +586,7 @@ export default { ...@@ -552,7 +586,7 @@ export default {
name: "", name: "",
healthyID: "", healthyID: "",
paymentType: "", paymentType: "",
disNature:'', disNature: "",
doctorName: "", doctorName: "",
rw: "", rw: "",
totalFee: "", totalFee: "",
...@@ -631,32 +665,28 @@ export default { ...@@ -631,32 +665,28 @@ export default {
eowclick, eowclick,
changeRowClick, changeRowClick,
getlefttable, getlefttable,
monthlyPlanTable monthlyPlanTable,
}; };
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../styles/mixin.scss"; @import "../styles/mixin.scss";
@import '../styles/media/components/outpatientDetails.scss'; @import "../styles/media/components/outpatientDetails.scss";
// 左侧表格点击高亮背景色 // 左侧表格点击高亮背景色
::v-deep .el-table__body tr.current-row > td { ::v-deep .el-table__body tr.current-row > td {
background-color: #ffff !important; background-color: #ffff !important;
} }
// 点击文本颜色 // 点击文本颜色
::v-deep .current-row{ ::v-deep .current-row {
color: #55a6da !important; color: #55a6da !important;
} }
// 点击icon颜色 // 点击icon颜色
::v-deep .current-row .el-table__expand-icon{ ::v-deep .current-row .el-table__expand-icon {
color: #55a6da !important; color: #55a6da !important;
} }
.outpatientDetails { .outpatientDetails {
// height: calc(100% - 50px); // height: calc(100% - 50px);
// background-color: white; // background-color: white;
...@@ -682,6 +712,10 @@ color: #55a6da !important; ...@@ -682,6 +712,10 @@ color: #55a6da !important;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 400; font-weight: 400;
} }
&_button{
background-color: #2cabe3;
color: #fff;
}
} }
&_message { &_message {
...@@ -1030,7 +1064,6 @@ color: #55a6da !important; ...@@ -1030,7 +1064,6 @@ color: #55a6da !important;
text-align: center; text-align: center;
padding-top: 10px; padding-top: 10px;
} }
&_t3:hover { &_t3:hover {
width: 90%; width: 90%;
...@@ -1178,7 +1211,7 @@ color: #55a6da !important; ...@@ -1178,7 +1211,7 @@ color: #55a6da !important;
margin-bottom: 21px; margin-bottom: 21px;
font-size: 13px; font-size: 13px;
color: #6a707e; color: #6a707e;
cursor: pointer;/*鼠标移上有小手*/ cursor: pointer; /*鼠标移上有小手*/
div { div {
width: 98%; width: 98%;
height: 46px; height: 46px;
...@@ -1269,7 +1302,7 @@ color: #55a6da !important; ...@@ -1269,7 +1302,7 @@ color: #55a6da !important;
width: 20%; width: 20%;
height: 100%; height: 100%;
border: 1px solid #f6f6f8; border: 1px solid #f6f6f8;
padding:0 10px; padding: 0 10px;
&_top { &_top {
height: 20%; height: 20%;
width: 100%; width: 100%;
...@@ -1304,9 +1337,9 @@ color: #55a6da !important; ...@@ -1304,9 +1337,9 @@ color: #55a6da !important;
font-weight: 400; font-weight: 400;
color: #5d5d5d; color: #5d5d5d;
// margin-right: 5px; // margin-right: 5px;
cursor: pointer;/*鼠标移上有小手*/ cursor: pointer; /*鼠标移上有小手*/
} }
&_span1background{ &_span1background {
background: #d9f0fa; background: #d9f0fa;
} }
&_span2 { &_span2 {
...@@ -1357,7 +1390,7 @@ color: #55a6da !important; ...@@ -1357,7 +1390,7 @@ color: #55a6da !important;
&_li { &_li {
width: 100%; width: 100%;
height: 25%; height: 25%;
cursor: pointer;/*鼠标移上有小手*/ cursor: pointer; /*鼠标移上有小手*/
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: flex-start; align-items: flex-start;
...@@ -1386,7 +1419,7 @@ color: #55a6da !important; ...@@ -1386,7 +1419,7 @@ color: #55a6da !important;
width: 97%; width: 97%;
} }
} }
&_liInd{ &_liInd {
background: #f3fafd; background: #f3fafd;
} }
} }
......
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
<!-- 查看质控 --> <!-- 查看质控 -->
<div class="outseeQualityControl"> <div class="outseeQualityControl">
<div class="outseeQualityControl_box"> <div class="outseeQualityControl_box">
<!-- <div class="outseeQualityControl_box_btn"> <div class="outseeQualityControl_box_btn">
<el-button size="mini" type="primary" @click="getSynchronous">同步数据</el-button> <el-button class="outseeQualityControl_box_btn_button" size="mini" type="primary" @click="getSynchronous">同步数据</el-button>
</div> --> </div>
<div class="outseeQualityControl_box_header"> <div class="outseeQualityControl_box_header">
<div class="outseeQualityControl_box_header_text"></div> <div class="outseeQualityControl_box_header_text"></div>
</div> </div>
...@@ -389,8 +389,12 @@ export default { ...@@ -389,8 +389,12 @@ export default {
&_btn { &_btn {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: end; justify-content: flex-end;
margin-bottom: 10px; margin-bottom: 10px;
&_button{
background-color: #2cabe3;
color: #fff;
}
} }
&_header { &_header {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment