入组改分组

src/assets/font/c/iconfont.json

@@ -14,7 +14,7 @@
     },
     {
       "icon_id": "8304933",
-      "name": "加入组织",
+      "name": "加分组织",
       "font_class": "jiaruzuzhi",
       "unicode": "e6bb",
       "unicode_decimal": 59067

src/assets/font/complete/iconfont.json

@@ -35,7 +35,7 @@
     },
     {
       "icon_id": "8304933",
-      "name": "加入组织",
+      "name": "加分组织",
       "font_class": "jiaruzuzhi",
       "unicode": "e6bb",
       "unicode_decimal": 59067

src/utils/echarts.js

-import { nextTick } from '@vue/composition-api';
-import * as echarts from 'echarts';
-
-
+import { nextTick } from "@vue/composition-api";
+import * as echarts from "echarts";
 
 /**
  * @param echarts初始化
@@ -11,143 +9,146 @@ import * as echarts from 'echarts';
 export function initEcharts(option, panelId) {
     var svChart;
     return nextTick(() => {
-
         svChart = echarts.getInstanceByDom(document.getElementById(panelId));
 
-
         if (svChart == null) {
             svChart = echarts.init(document.getElementById(panelId));
         }
-        document.getElementById(panelId).setAttribute('_echarts_instance_', '');
+        document.getElementById(panelId).setAttribute("_echarts_instance_", "");
         svChart.clear();
         svChart.setOption(option);
         svChart.resize();
         // 屏幕大小改变
-        window.addEventListener('resize', () => {
+        window.addEventListener("resize", () => {
             svChart.resize();
         });
 
         return svChart;
-    })
-
+    });
 }
 
-
-
-
-
-
 //百分比图  智能分组
 export function categoryChart(data, tcolor) {
     const option = {
-        title: [{
+        title: [
+            {
                 text: data + `%`,
-            x: 'center',
-            top: '38%',
+                x: "center",
+                top: "38%",
                 textStyle: {
-                fontSize: '16', //百分比的样式
+                    fontSize: "16", //百分比的样式
                     color: tcolor,
-                fontFamily: 'Arial',
-                foontWeight: '600',
+                    fontFamily: "Arial",
+                    foontWeight: "600",
+                },
             },
-        },],
+        ],
         polar: {
-            radius: ['100%', '60%'],
-            center: ['50%', '50%'],
+            radius: ["100%", "60%"],
+            center: ["50%", "50%"],
         },
         angleAxis: {
             max: 100,
             show: false,
         },
         radiusAxis: {
-            type: 'category',
+            type: "category",
             show: false,
         },
-        series: [{
-            name: '',
-            type: 'bar',
+        series: [
+            {
+                name: "",
+                type: "bar",
                 roundCap: true,
                 barWidth: 6,
                 showBackground: true,
                 backgroundStyle: {
-                color: '#f3fafd', //留白颜色
+                    color: "#f3fafd", //留白颜色
                 },
                 data: [data],
-            coordinateSystem: 'polar',
+                coordinateSystem: "polar",
 
                 itemStyle: {
                     normal: {
-                    color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+                        color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                            {
                                 offset: 0,
                                 color: tcolor, //填色颜色
-                    },]),
                             },
+                        ]),
                     },
-        },],
+                },
+            },
+        ],
     };
 
     return option;
 }
 
-//百分比图  病案入组
+//百分比图  病案分组
 export function categoryChart11(text, data, tcolor) {
     const option = {
-        title: [{
+        title: [
+            {
                 text: text,
-            x: 'center',
-            top: '52%',
+                x: "center",
+                top: "52%",
                 textStyle: {
-                fontSize: '14', //百分比的样式
+                    fontSize: "14", //百分比的样式
                     color: tcolor,
-                fontFamily: 'PingFang SC',
-                foontWeight: '300',
+                    fontFamily: "PingFang SC",
+                    foontWeight: "300",
                 },
             },
             {
                 text: data + `%`,
-            x: 'center',
-            top: '28%',
+                x: "center",
+                top: "28%",
                 textStyle: {
-                fontSize: '20', //百分比的样式
+                    fontSize: "20", //百分比的样式
                     color: tcolor,
-                fontFamily: 'Arial',
-                foontWeight: '600',
+                    fontFamily: "Arial",
+                    foontWeight: "600",
                 },
             },
         ],
         polar: {
-            radius: ['100%', '60%'],
-            center: ['50%', '50%'],
+            radius: ["100%", "60%"],
+            center: ["50%", "50%"],
         },
         angleAxis: {
             max: 100,
             show: false,
         },
         radiusAxis: {
-            type: 'category',
+            type: "category",
             show: false,
         },
-        series: [{
-            name: '',
-            type: 'bar',
+        series: [
+            {
+                name: "",
+                type: "bar",
                 roundCap: true,
                 barWidth: 6,
                 showBackground: true,
                 backgroundStyle: {
-                color: '#f3fafd', //留白颜色
+                    color: "#f3fafd", //留白颜色
                 },
                 data: [data],
-            coordinateSystem: 'polar',
+                coordinateSystem: "polar",
 
                 itemStyle: {
                     normal: {
-                    color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+                        color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                            {
                                 offset: 0,
                                 color: tcolor, //填色颜色
-                    },]),
                             },
+                        ]),
                     },
-        },],
+                },
+            },
+        ],
     };
 
     return option;

src/views/outHistorygrouping.vue

@@ -44,13 +44,13 @@
                 <div class="outsetgrouping_top2_message_left">
                     <span class="outsetgrouping_top2_message_left_tu4"><img src="../assets/img/bianma.png" alt="" /> </span>
                     <div class="outsetgrouping_top2_message_left_t1">
-                        当前入组编码:<span>{{ casehisObj ? casehisObj.drgs.code : "" }}</span>
+                        当前分组编码:<span>{{ casehisObj ? casehisObj.drgs.code : "" }}</span>
                     </div>
                 </div>
                 <div class="outsetgrouping_top2_message_centert">
                     <span class="outsetgrouping_top2_message_centert_tu5"><img src="../assets/img/daoru.png" alt="" /></span>
                     <div class="outsetgrouping_top2_message_centert_t2">
-                        入组名称:<span>{{ casehisObj ? casehisObj.drgs.name : "" }}</span>
+                        分组名称:<span>{{ casehisObj ? casehisObj.drgs.name : "" }}</span>
                     </div>
                 </div>
                 <div class="outsetgrouping_top2_message_right">
@@ -87,7 +87,7 @@
                         <div class="outsetgrouping_centent_totalnum_left_text_msg2">
                             <div class="outsetgrouping_centent_totalnum_left_text_msg2_text3">
                                 <span>分组编码：{{ item.code }}</span>
-                                <span>入组名称：{{ item.coreName }}</span>
+                                <span>分组名称：{{ item.coreName }}</span>
                             </div>
                             <div class="outsetgrouping_centent_totalnum_left_text_msg2_text4">
                                 <span>主诊断编码：{{ item.disCode }}</span
@@ -232,7 +232,7 @@ export default {
         const submit = () => {
             if (state.radio == "") {
                 Message.warning({
-                    message: "请先选择要入组的病组",
+                    message: "请先选择要分组的病组",
                     type: "warning",
                 });
             } else {

src/views/outpatientDetails.vue

@@ -299,8 +299,7 @@
 import http from "../utils/http";
 import { decimal } from "../utils/decimal";
 import { transformTimestamp } from "../utils/formatTime";
-import { Message } from "element-ui";
-import { Loading } from "element-ui";
+import { Loading, Message } from "element-ui";
 export default {
     name: "outpatientDetails",
     data() {
@@ -334,6 +333,7 @@ export default {
                 avgFee: "",
                 days: "",
                 profitLoss: "",
+                patientType: "",
             },
             checkindex: 0, // 初始化第一个栏块高亮
             goods: [], //左侧费用类型
@@ -612,23 +612,10 @@ export default {
     },
 };
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 @import "../styles/mixin.scss";
 @import "../styles/media/components/outpatientDetails.scss";
 
-// 左侧表格点击高亮背景色
-::v-deep .el-table__body tr.current-row > td {
-    background-color: #ffff !important;
-}
-// 点击文本颜色
-::v-deep .current-row {
-    color: #55a6da !important;
-}
-// 点击icon颜色
-::v-deep .current-row .el-table__expand-icon {
-    color: #55a6da !important;
-}
-
 .outpatientDetails {
     // height: calc(100% - 50px);
     // background-color: white;
@@ -1506,5 +1493,17 @@ export default {
             }
         }
     }
+    // 左侧表格点击高亮背景色
+    .el-table__body tr.current-row > td {
+        background-color: #ffff !important;
+    }
+    // 点击文本颜色
+    .current-row {
+        color: #55a6da !important;
+    }
+    // 点击icon颜色
+    .current-row .el-table__expand-icon {
+        color: #55a6da !important;
+    }
 }
 </style>