Skip to content

V
vue-composition-api
Commit 1ea18bf1 by Licx
Options

Merge branch 'feature/恭城' of… 

Merge branch 'feature/恭城' of https://gitlab.suvalue.com/ninglupeng/vue-composition-api into feature/恭城

# Conflicts:
#	src/views/outHistorygrouping.vue
parents fde54b38 564260c8
Showing with 101 additions and 67 deletions
package-lock.json
......@@ -14,6 +14,8 @@
"element-ui": "^2.15.6",
"jquery": "^3.6.0",
"js-cookie": "^3.0.1",
"lodash": "^4.17.21",
"sortablejs": "^1.15.2",
"vue": "^2.6.11"
},
"devDependencies": {
......@@ -8790,9 +8792,8 @@
},
"node_modules/lodash": {
"version": "4.17.21",
"resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"dev": true
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
},
"node_modules/lodash.debounce": {
"version": "4.0.8",
......@@ -12424,6 +12425,11 @@
"node": ">=0.10.0"
}
},
"node_modules/sortablejs": {
"version": "1.15.2",
"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.2.tgz",
"integrity": "sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA=="
},
"node_modules/source-list-map": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/source-list-map/-/source-list-map-2.0.1.tgz",
......@@ -22405,9 +22411,8 @@
},
"lodash": {
"version": "4.17.21",
"resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"dev": true
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
},
"lodash.debounce": {
"version": "4.0.8",
......@@ -25474,6 +25479,11 @@
"is-plain-obj": "^1.0.0"
}
},
"sortablejs": {
"version": "1.15.2",
"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.2.tgz",
"integrity": "sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA=="
},
"source-list-map": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/source-list-map/-/source-list-map-2.0.1.tgz",
package.json
......@@ -14,6 +14,8 @@
"element-ui": "^2.15.6",
"jquery": "^3.6.0",
"js-cookie": "^3.0.1",
"lodash": "^4.17.21",
"sortablejs": "^1.15.2",
"vue": "^2.6.11"
},
"devDependencies": {
......
src/main.js
......@@ -9,6 +9,7 @@ import Vue from "vue";
import App from "./App.vue";
import store from "./store";
import router from "@/router/index";
import "@/assets/scss/app.scss";
Vue.config.productionTip = false;
import http from "@/utils/http.js";
Vue.prototype.$http = http;
......@@ -21,9 +22,11 @@ Vue.use(VueCompositionApi);
import dayjs from "dayjs";
import "dayjs/locale/zh-cn";
dayjs.locale("zh-cn");
//引入 lodash
import _ from "lodash";
Vue.prototype._ = _;
new Vue({
store,
router,
render: (h) => h(App),
}).$mount("#app");
src/router/index.js
......@@ -51,9 +51,14 @@ const router = new Router({
{
path: "/outpatientDetails_pingguo",
name: "outpatientDetails",
name: "outpatientDetails_pingguo",
component: (resolve) => require(["@/views/outpatientDetails_pingguo.vue"], resolve),
},
{
path: "/seeSettlementList",
name: "seeSettlementList",
component: (resolve) => require(["@/views/seeSettlementList.vue"], resolve),
},
],
// mode: 'history' /*hash*/ /*不显示路由中的#*/
});
......
src/utils/decimal.js
......@@ -3,7 +3,7 @@
* @Date: 2022-06-07 01:16:57
* @LastEditors: ninglupeng
* @LastEditTime: 2022-06-07 01:17:18
* @Description:
* @Description:
*/
export function decimal(num) {
var result = parseFloat(num);
......@@ -12,14 +12,14 @@ export function decimal(num) {
} else {
result = Math.round(num * 100) / 100;
var s_x = result.toString();
var pos_decimal = s_x.indexOf('.');
var pos_decimal = s_x.indexOf(".");
if (pos_decimal < 0) {
//不是小数
pos_decimal = s_x.length;
s_x += '.';
s_x += ".";
}
while (s_x.length <= pos_decimal + 2) {
s_x += '0';
s_x += "0";
}
return s_x;
}
......@@ -27,26 +27,24 @@ export function decimal(num) {
export function toPercent(point) {
var str = Number(point * 100).toFixed(2);
str += '%';
str += "%";
return str;
}
export function keepTwoDecimalFull(num) {
var result = parseFloat(num);
result = Math.round(num * 100) / 100;
var s_x = result.toString();
var pos_decimal = s_x.indexOf('.');
var pos_decimal = s_x.indexOf(".");
if (pos_decimal < 0) {
pos_decimal = s_x.length;
s_x += '.';
s_x += ".";
}
while (s_x.length <= pos_decimal + 2) {
s_x += '0';
s_x += "0";
}
return s_x;
}
export function changeArr(
data
) {
export function changeArr(data) {
let arr = data.map((o) => [
o.cmi,
o.feeConsumeIndex,
......@@ -69,5 +67,3 @@ export function changeArr(
return arr;
}
src/views/outHistorygrouping.vue
......@@ -8,42 +8,51 @@
<template>
<!-- 智能分组 -->
<div class="outsetgrouping" id="setGroupingbox">
<div class="outsetgrouping_button">
<router-link
target="_blank"
:to="{ path: '/medicalRecordImport', query: { id: $route.query.id } }"
>
<div class="outsetgrouping_button flex-between-center font-14 color-666">
<div>
<span class="span1">患者信息</span
><span class="mar-left-15 color-F54" v-if="casehisObj?.isLowRisk"
>该主诊断符合低风险死亡</span
>
</div>
<div>
<router-link
target="_blank"
v-if="$route.query.type"
:to="{ path: '/medicalRecordImport', query: { id: $route.query.id } }"
>
<el-button
class="outsetgrouping_button_Searchbtn"
size="mini"
type="primary"
>DRG历史分组结果查询</el-button
></router-link
>
<el-button
class="outsetgrouping_button_Searchbtn"
style="margin-left: 10px"
size="mini"
type="primary"
>DRG历史分组结果查询</el-button
></router-link
>
<el-button
class="outsetgrouping_button_Searchbtn"
style="margin-left: 10px"
size="mini"
type="primary"
@click="topage1"
>病案质控</el-button
>
<el-button
class="outsetgrouping_button_Searchbtn"
type="primary"
size="mini"
@click="toPage"
>
<span class="s2">费用监控</span>
</el-button>
<el-button
class="outsetgrouping_button_Searchbtn"
type="primary"
size="mini"
@click="gosear"
>
<span class="s2">疾病分组查询</span>
</el-button>
@click="topage1"
>病案质控</el-button
>
<el-button
class="outsetgrouping_button_Searchbtn"
type="primary"
size="mini"
@click="toPage"
>
<span class="s2">费用监控</span>
</el-button>
<el-button
class="outsetgrouping_button_Searchbtn"
type="primary"
size="mini"
@click="gosear"
>
<span class="s2">疾病分组查询</span>
</el-button>
</div>
</div>
<div class="outsetgrouping_top">
<div class="outsetgrouping_top_message">
......@@ -376,6 +385,16 @@
:fullscreen="true"
>
<!-- 病案分组 -->
<diagList :code="casehisObj" :isshow="addrecordEnrollmentShow"></diagList>
</el-dialog>
<el-dialog
center
:visible.sync="addrecordEnrollmentShow1"
class="fullscreen"
:before-close="closeDialog"
:fullscreen="true"
>
<!-- 病案分组 -->
<div class="outaddrecordEnrollment" id="outaddrecordEnrollment">
<div class="outaddrecordEnrollment_search">
<div class="outaddrecordEnrollment_search_div1">
......@@ -703,8 +722,10 @@ import { decimal } from '../utils/decimal'
import { Message } from 'element-ui'
import { useRoute, useRouter } from '../utils/useVueRouter'
import { initEcharts, categoryChart, categoryChart11 } from '../utils/echarts'
import diagList from './diagList'
export default {
name: 'outHistorygrouping',
components: { diagList },
data() {
return {
abc: '',
......@@ -738,6 +759,7 @@ export default {
addgroupList2: [], //主手术
addgroupArr2: [],
addrecordEnrollmentShow: false,
addrecordEnrollmentShow1: false,
// 性别选择器
sexoptions: [
{
......@@ -934,11 +956,7 @@ export default {
//关闭弹层前的回调
closeDialog() {
this.addrecordEnrollmentShow = false
this.outaddsearchForm = {
diagName: '',
opsName: ''
}
;(this.otdiagName = []), (this.otopsName = []), this.addclear()
// this.getCaseHis(this.$route.query.id);
},
//清空输入框的值时触发
......@@ -1177,7 +1195,7 @@ export default {
</script>
<style lang="scss">
@import '../styles/mixin.scss';
@import '../styles/outHistorygrouping.scss';
// @import "../styles/outHistorygrouping.scss";
.outsetgrouping {
height: 96%;
background-color: white;
......@@ -1843,7 +1861,7 @@ export default {
.fullscreen {
.el-dialog.is-fullscreen {
.el-dialog__body {
height: 91%;
height: 90%;
}
}
}
......
src/views/outpatientDetails.vue
......@@ -12,8 +12,8 @@
<div class="outpatientDetails_top_div1">
<span class="span1">患者信息</span>
<div>
<el-button class="outpatientDetails_top_div1_button" type="primary" size="mini" @click="gosear"> 疾病分组查询 </el-button>
<el-button class="outpatientDetails_top_div1_button" size="mini" type="primary" @click="topage">病案质控</el-button>
<!-- <el-button class="outpatientDetails_top_div1_button" type="primary" size="mini" @click="gosear"> 疾病分组查询 </el-button> -->
<!-- <el-button class="outpatientDetails_top_div1_button" size="mini" type="primary" @click="topage">病案质控</el-button> -->
<el-button class="outpatientDetails_top_div1_button" type="primary" size="mini" @click="getControl">医嘱质控</el-button>
</div>
</div>
......@@ -155,18 +155,18 @@
@row-click="eowclick"
@expand-change="changeRowClick"
>
<el-table-column prop="iteM_TYPE" label="项目名称" width="110" header-align="center" align="center"> </el-table-column>
<el-table-column prop="totalFee" label="总金额(小计)" width="80" header-align="center" align="right">
<el-table-column prop="iteM_TYPE" label="项目名称" header-align="center" align="center"> </el-table-column>
<el-table-column prop="totalFee" label="总金额(小计)" header-align="center" align="right">
<template slot-scope="scope">
{{ decimal(scope.row.totalFee) }}
</template>
</el-table-column>
<el-table-column prop="proportion" label="占总费用(比例)" width="90" header-align="center" align="right">
<el-table-column prop="proportion" label="占总费用(比例)" header-align="center" align="right">
<template slot-scope="scope">
{{ scope.row.proportion != undefined ? decimal(scope.row.proportion) + "%" : "" }}
</template>
</el-table-column>
<el-table-column prop="coreTotalFee" label="预计DRG设定费用(参考)" width="100" header-align="center" align="right">
<!-- <el-table-column prop="coreTotalFee" label="预计DRG设定费用(参考)" width="100" header-align="center" align="right">
<template slot-scope="scope">
{{ decimal(scope.row.coreTotalFee) }}
</template>
......@@ -175,7 +175,7 @@
<template slot-scope="scope">
{{ scope.row.coreProportion != undefined ? decimal(scope.row.coreProportion) + "%" : "" }}
</template>
</el-table-column>
</el-table-column> -->
</el-table>
</div>
<!-- 中间有数据样式 表格-->
......
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