Skip to content

V
vue-composition-api
Commit 55ee0b7c by wangshuangqing
Options

Merge branch 'feature/修改' into develop

parents b3fdf099 3f99ca82
Showing with 183 additions and 103 deletions
src/views/outHistorygrouping.vue
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
<!-- <el-button class="outsetgrouping_button_GoBackbtn" size="mini" @click="goback"> <!-- <el-button class="outsetgrouping_button_GoBackbtn" size="mini" @click="goback">
<span class="iconfont icon-daochu"></span> <span class="s2">返回</span> <span class="iconfont icon-daochu"></span> <span class="s2">返回</span>
</el-button> --> </el-button> -->
<el-button class="outsetgrouping_button_Searchbtn" type="primary" size="mini" @click="gosear">
<span class="s2">疾病分组查询</span>
</el-button>
<el-button <el-button
class="outsetgrouping_button_Submitbtn" class="outsetgrouping_button_Submitbtn"
size="mini" size="mini"
...@@ -25,36 +28,47 @@ ...@@ -25,36 +28,47 @@
<div class="outsetgrouping_top"> <div class="outsetgrouping_top">
<div class="outsetgrouping_top_message"> <div class="outsetgrouping_top_message">
<div class="outsetgrouping_top_message_left"> <div class="outsetgrouping_top_message_left">
<span class="outsetgrouping_top_message_left_tu1"><img src="../assets/img/peo.png" alt=""> </span> <span class="outsetgrouping_top_message_left_tu1"
><img src="../assets/img/peo.png" alt="" />
</span>
<div class="outsetgrouping_top_message_left_t1"> <div class="outsetgrouping_top_message_left_t1">
住院号:<span>{{ casehisObj ? casehisObj.a48 : "" }}</span> 住院号:<span>{{ casehisObj ? casehisObj.a48 : "" }}</span>
</div> </div>
</div> </div>
<div class="outsetgrouping_top_message_centert"> <div class="outsetgrouping_top_message_centert">
<span class="outsetgrouping_top_message_centert_tu2"><img src="../assets/img/ka.png" alt=""></span> <span class="outsetgrouping_top_message_centert_tu2"
><img src="../assets/img/ka.png" alt=""
/></span>
<div class="outsetgrouping_top_message_centert_t2"> <div class="outsetgrouping_top_message_centert_t2">
住院次数:<span>{{ casehisObj ? casehisObj.a49 : "" }}</span> 住院次数:<span>{{ casehisObj ? casehisObj.a49 : "" }}</span>
</div> </div>
</div> </div>
<div class="outsetgrouping_top_message_right"> <div class="outsetgrouping_top_message_right">
<span class="outsetgrouping_top_message_right_tu3"><img src="../assets/img/qian.png" alt=""></span> <span class="outsetgrouping_top_message_right_tu3"
><img src="../assets/img/qian.png" alt=""
/></span>
<div class="outsetgrouping_top_message_right_t3"> <div class="outsetgrouping_top_message_right_t3">
医疗付费方式:<span>{{ casehisObj ? casehisObj.a46C : "" }}</span> 医疗付费方式:<span>{{ casehisObj ? casehisObj.a46C : "" }}</span>
</div> </div>
</div> </div>
<div class="outsetgrouping_top_message_blow"> <div class="outsetgrouping_top_message_blow">
<span class="outsetgrouping_top_message_blow_tu7"><img src="../assets/img/daoru.png" alt=""></span> <span class="outsetgrouping_top_message_blow_tu7"
<div class="outsetgrouping_top_message_blow_t4"> ><img src="../assets/img/daoru.png" alt=""
分组类型:<span>{{ casehisObj?casehisObj.drgs.disNature:'' }}</span> /></span>
</div> <div class="outsetgrouping_top_message_blow_t4">
分组类型:<span>{{
casehisObj ? casehisObj.drgs.disNature : ""
}}</span>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="outsetgrouping_top2"> <div class="outsetgrouping_top2">
<div class="outsetgrouping_top2_message"> <div class="outsetgrouping_top2_message">
<div class="outsetgrouping_top2_message_left"> <div class="outsetgrouping_top2_message_left">
<span class="outsetgrouping_top2_message_left_tu4"><img src="../assets/img/bianma.png" alt=""> </span> <span class="outsetgrouping_top2_message_left_tu4"
><img src="../assets/img/bianma.png" alt="" />
</span>
<div class="outsetgrouping_top2_message_left_t1"> <div class="outsetgrouping_top2_message_left_t1">
当前入组编码:<span>{{ 当前入组编码:<span>{{
casehisObj ? casehisObj.drgs.code : "" casehisObj ? casehisObj.drgs.code : ""
...@@ -62,21 +76,23 @@ ...@@ -62,21 +76,23 @@
</div> </div>
</div> </div>
<div class="outsetgrouping_top2_message_centert"> <div class="outsetgrouping_top2_message_centert">
<span class="outsetgrouping_top2_message_centert_tu5"><img src="../assets/img/daoru.png" alt=""></span> <span class="outsetgrouping_top2_message_centert_tu5"
><img src="../assets/img/daoru.png" alt=""
/></span>
<div class="outsetgrouping_top2_message_centert_t2"> <div class="outsetgrouping_top2_message_centert_t2">
入组名称:<span>{{ casehisObj ? casehisObj.drgs.name : "" }}</span> 入组名称:<span>{{ casehisObj ? casehisObj.drgs.name : "" }}</span>
</div> </div>
</div> </div>
<div class="outsetgrouping_top2_message_right"> <div class="outsetgrouping_top2_message_right">
<span class="outsetgrouping_top2_message_right_tu6"><img src="../assets/img/jiner.png" alt=""></span> <span class="outsetgrouping_top2_message_right_tu6"
><img src="../assets/img/jiner.png" alt=""
/></span>
<div class="outsetgrouping_top2_message_right_t3"> <div class="outsetgrouping_top2_message_right_t3">
预计DRG支付费用:<span>{{ 预计DRG支付费用:<span>{{
casehisObj ? casehisObj.drgs.actualfee : "" casehisObj ? casehisObj.drgs.actualfee : ""
}}</span> }}</span>
</div> </div>
</div>
</div>
</div> </div>
</div> </div>
<div class="outsetgrouping_top3"></div> <div class="outsetgrouping_top3"></div>
...@@ -101,16 +117,44 @@ ...@@ -101,16 +117,44 @@
</div> </div>
<div class="outsetgrouping_centent_totalnum_left_text"> <div class="outsetgrouping_centent_totalnum_left_text">
<div class="outsetgrouping_centent_totalnum_left_text_msg1"> <!-- <div class="outsetgrouping_centent_totalnum_left_text_msg1">
<div class="outsetgrouping_centent_totalnum_left_text_msg1_text1"> <div class="outsetgrouping_centent_totalnum_left_text_msg1_text1">
<span> 诊断名称:{{ item.diagMapName }}</span> <span> 诊断名称:{{ item.diagMapName }}</span>
<span> 诊断编码:{{item.disCode}}</span>
<span> 诊断类型:{{ item.diagOrder }}</span> <span> 诊断类型:{{ item.diagOrder }}</span>
<span> 分组类型:{{item.disNature}}</span> <span> 分组类型:{{item.disNature}}</span>
</div> </div>
<div class="outsetgrouping_centent_totalnum_left_text_msg1_text2"> <div class="outsetgrouping_centent_totalnum_left_text_msg1_text2">
<span>操作名称:{{ item.opsMapName }}</span> <span>操作名称:{{ item.opsMapName }}</span>
<span>操作编码:{{item.opsCode}}</span>
<span>操作类型:{{ item.opsOrder }}</span>
</div>
</div> -->
<div class="outsetgrouping_centent_totalnum_left_text_msg1">
<div
class="outsetgrouping_centent_totalnum_left_text_msg1_text11"
>
<span> 诊断名称:{{ item.diagMapName }}</span>
<span>操作名称:{{ item.opsMapName }}</span>
</div>
<div
class="outsetgrouping_centent_totalnum_left_text_msg1_text22"
>
<span> 诊断编码:{{ item.disCode }}</span>
<span>操作编码:{{ item.opsCode }}</span>
</div>
<div
class="outsetgrouping_centent_totalnum_left_text_msg1_text33"
>
<span> 诊断类型:{{ item.diagOrder }}</span>
<span>操作类型:{{ item.opsOrder }}</span> <span>操作类型:{{ item.opsOrder }}</span>
</div> </div>
<div
class="outsetgrouping_centent_totalnum_left_text_msg1_text44"
>
<span> 分组类型:{{ item.disNature }}</span>
</div>
</div> </div>
<div class="outsetgrouping_centent_totalnum_left_text_msg2"> <div class="outsetgrouping_centent_totalnum_left_text_msg2">
<div class="outsetgrouping_centent_totalnum_left_text_msg2_text3"> <div class="outsetgrouping_centent_totalnum_left_text_msg2_text3">
...@@ -213,7 +257,7 @@ import { ...@@ -213,7 +257,7 @@ import {
} from "@vue/composition-api"; } from "@vue/composition-api";
import { decimal } from "../utils/decimal"; import { decimal } from "../utils/decimal";
import { Message } from 'element-ui'; import { Message } from "element-ui";
import { useRoute, useRouter } from "../utils/useVueRouter"; import { useRoute, useRouter } from "../utils/useVueRouter";
import { initEcharts, categoryChart } from "../utils/echarts"; import { initEcharts, categoryChart } from "../utils/echarts";
export default { export default {
...@@ -309,8 +353,8 @@ export default { ...@@ -309,8 +353,8 @@ export default {
const submit = () => { const submit = () => {
if (state.radio == "") { if (state.radio == "") {
Message.warning({ Message.warning({
message: "请先选择要入组的病组", message: "请先选择要入组的病组",
type: 'warning', type: "warning",
}); });
} else { } else {
http http
...@@ -320,10 +364,10 @@ export default { ...@@ -320,10 +364,10 @@ export default {
) )
.then((data) => { .then((data) => {
Message.success({ Message.success({
message: `${data.message}`, message: `${data.message}`,
type: 'success', type: "success",
}); });
getCaseHis(route.value.query.id); getCaseHis(route.value.query.id);
}) })
.catch((error) => {}); .catch((error) => {});
...@@ -365,7 +409,6 @@ export default { ...@@ -365,7 +409,6 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../styles/mixin.scss"; @import "../styles/mixin.scss";
// @import '../styles/media/media/outHistorygrouping.scss';
.outsetgrouping { .outsetgrouping {
height: 900px; height: 900px;
background-color: white; background-color: white;
...@@ -382,7 +425,10 @@ export default { ...@@ -382,7 +425,10 @@ export default {
color: #2cabe3; color: #2cabe3;
border: 1px solid #2cabe3; border: 1px solid #2cabe3;
} }
&_Searchbtn{
background-color: #2CABE3;
color: #fff;
}
&_Submitbtn { &_Submitbtn {
background-color: #2cabe3; background-color: #2cabe3;
color: #fff; color: #fff;
...@@ -416,8 +462,8 @@ export default { ...@@ -416,8 +462,8 @@ export default {
// padding-left: 29px; // padding-left: 29px;
// font-size: 23px; // font-size: 23px;
// } // }
&_tu1{ &_tu1 {
padding-left: 29px; padding-left: 29px;
font-size: 23px; font-size: 23px;
} }
...@@ -429,7 +475,7 @@ export default { ...@@ -429,7 +475,7 @@ export default {
padding-left: 10px; padding-left: 10px;
align-items: center; align-items: center;
background-color: #fff; background-color: #fff;
color: #abafb3; color: #abafb3;
font-size: 14px; font-size: 14px;
margin-left: 29px; margin-left: 29px;
...@@ -453,8 +499,8 @@ export default { ...@@ -453,8 +499,8 @@ export default {
// padding-left: 29px; // padding-left: 29px;
// font-size: 23px; // font-size: 23px;
// } // }
&_tu2{ &_tu2 {
padding-left: 29px; padding-left: 29px;
font-size: 23px; font-size: 23px;
} }
...@@ -490,8 +536,8 @@ export default { ...@@ -490,8 +536,8 @@ export default {
// padding-left: 29px; // padding-left: 29px;
// font-size: 23px; // font-size: 23px;
// } // }
&_tu3{ &_tu3 {
padding-left: 29px; padding-left: 29px;
font-size: 23px; font-size: 23px;
} }
...@@ -521,9 +567,8 @@ export default { ...@@ -521,9 +567,8 @@ export default {
background-color: #f3fafd; background-color: #f3fafd;
font-family: PingFang SC; font-family: PingFang SC;
&_tu7 {
&_tu7{ padding-left: 29px;
padding-left: 29px;
font-size: 23px; font-size: 23px;
} }
...@@ -576,8 +621,8 @@ export default { ...@@ -576,8 +621,8 @@ export default {
// padding-left: 29px; // padding-left: 29px;
// font-size: 23px; // font-size: 23px;
// } // }
&_tu4{ &_tu4 {
padding-left: 29px; padding-left: 29px;
font-size: 23px; font-size: 23px;
} }
...@@ -589,7 +634,7 @@ export default { ...@@ -589,7 +634,7 @@ export default {
padding-left: 10px; padding-left: 10px;
align-items: center; align-items: center;
background-color: #fff; background-color: #fff;
color: #abafb3; color: #abafb3;
font-size: 14px; font-size: 14px;
margin-left: 29px; margin-left: 29px;
...@@ -613,8 +658,8 @@ export default { ...@@ -613,8 +658,8 @@ export default {
// padding-left: 29px; // padding-left: 29px;
// font-size: 23px; // font-size: 23px;
// } // }
&_tu5{ &_tu5 {
padding-left: 29px; padding-left: 29px;
font-size: 23px; font-size: 23px;
} }
&_t2 { &_t2 {
...@@ -625,7 +670,7 @@ export default { ...@@ -625,7 +670,7 @@ export default {
padding-left: 10px; padding-left: 10px;
align-items: center; align-items: center;
background-color: #fff; background-color: #fff;
color: #abafb3; color: #abafb3;
font-size: 14px; font-size: 14px;
margin-left: 29px; margin-left: 29px;
...@@ -644,9 +689,8 @@ export default { ...@@ -644,9 +689,8 @@ export default {
background-color: #f3fafd; background-color: #f3fafd;
font-family: PingFang SC; font-family: PingFang SC;
&_tu6 {
&_tu6{ padding-left: 29px;
padding-left: 29px;
font-size: 23px; font-size: 23px;
} }
...@@ -667,7 +711,6 @@ export default { ...@@ -667,7 +711,6 @@ export default {
} }
} }
} }
} }
} }
...@@ -728,61 +771,98 @@ export default { ...@@ -728,61 +771,98 @@ export default {
width: 97%; width: 97%;
height: 100%; height: 100%;
&_msg1 { &_msg1{
height: 25%; height: 25%;
box-sizing: content-box; box-sizing: content-box;
border: 10px solid rgba(44, 171, 227, 0.08); border: 10px solid rgba(44, 171, 227, 0.08);
border-bottom: 5px solid rgba(44, 171, 227, 0.08); border-bottom: 5px solid rgba(44, 171, 227, 0.08);
border-top: 5px solid rgba(44, 171, 227, 0.08); border-top: 5px solid rgba(44, 171, 227, 0.08);
margin-bottom: 5px; margin-bottom: 5px;
margin-top: 5px; margin-top: 5px;
display: flex; display: flex;
flex-direction: column;
justify-content: center; &_text11 {
align-items: center; width: 25%;
height: 100%;
&_text1 { display: flex;
width: 100%; flex-direction: column;
height: 50%; justify-content: center;
display: flex; span {
justify-content: space-between; height: 100%;
width: 50%;
span { // margin:5px 5px;
height: 100%; display: flex;
width: 50%; justify-content: start;
margin: 5px 5px; align-items: center;
display: flex; font-size: 14px;
justify-content: start; padding-left: 10px;
align-items: center; font-family: PingFang SC;
font-size: 14px; font-weight: 300;
padding-left: 10px; color: #6a707e;
font-family: PingFang SC; }
font-weight: 300; }
color: #6a707e; &_text22 {
} width: 25%;
} height: 100%;
display: flex;
&_text2 { flex-direction: column;
width: 100%; justify-content: center;
height: 48%; span {
display: flex; height: 100%;
justify-content: start; width: 50%;
// margin:5px 5px;
span { display: flex;
height: 100%; justify-content: start;
width: 32%; align-items: center;
margin: 0px 5px; font-size: 14px;
display: flex; padding-left: 10px;
justify-content: start; font-family: PingFang SC;
align-items: center; font-weight: 300;
font-size: 14px; color: #6a707e;
padding-left: 11px; }
font-family: PingFang SC; }
font-weight: 300; &_text33 {
color: #6a707e; width: 25%;
} height: 100%;
} display: flex;
} flex-direction: column;
justify-content: center;
span {
height: 100%;
width: 50%;
// margin:5px 5px;
display: flex;
justify-content: start;
align-items: center;
font-size: 14px;
padding-left: 10px;
font-family: PingFang SC;
font-weight: 300;
color: #6a707e;
}
}
&_text44 {
width: 25%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
span {
height: 100%;
width: 50%;
// margin:5px 5px;
display: flex;
justify-content: start;
align-items: flex-start;
font-size: 14px;
padding-left: 10px;
font-family: PingFang SC;
font-weight: 300;
color: #6a707e;
}
}
}
&_msg2 { &_msg2 {
background-color: rgba(44, 171, 227, 0.08); background-color: rgba(44, 171, 227, 0.08);
......
src/views/outpatientDetails.vue
...@@ -216,11 +216,11 @@ ...@@ -216,11 +216,11 @@
> >
<el-table-column <el-table-column
label="开单日期" label="开单日期"
prop="iteM_CODE" prop="chargeTime"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="项目编码" label="项目编码"
prop="chargeTime" prop="iteM_CODE"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="项目名称" label="项目名称"
...@@ -228,13 +228,13 @@ ...@@ -228,13 +228,13 @@
></el-table-column> ></el-table-column>
<el-table-column label="单价" prop="unitprice"> <el-table-column label="单价" prop="unitprice">
<template slot-scope="scope"> <template slot-scope="scope">
{{ decimal(scope.row.fee) }} {{ decimal(scope.row.unitprice) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="数量" prop="quantity"></el-table-column> <el-table-column label="数量" prop="quantity"></el-table-column>
<el-table-column label="总金额" prop="fee"> <el-table-column label="总金额" prop="fee">
<template slot-scope="scope"> <template slot-scope="scope">
{{ decimal(scope.row.unitprice) }} {{ decimal(scope.row.fee) }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
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