Browse Source

新分支

28169 1 year ago
parent
commit
ad63f28eb3

+ 8 - 8
index.html View File

@@ -18,14 +18,14 @@
18 18
   </head>
19 19
 
20 20
   <body>
21
-    <script src="https://images.shengws.com/reconnecting-websocket.min.js"></script>
22
-    <script src="https://images.shengws.com/jquery.min.js"></script>
23
-    <script src="<%= htmlWebpackPlugin.options.path %>/tinymce4.7.5/tinymce.min.js"></script>
24
-    <script src="<%= htmlWebpackPlugin.options.path %>/neditor/neditor.config.js"></script>
25
-    <script src="<%= htmlWebpackPlugin.options.path %>/neditor/neditor.all.min.js"></script>
26
-    <script src="<%= htmlWebpackPlugin.options.path %>/neditor/neditor.service.js"></script>
27
-    <script src="<%= htmlWebpackPlugin.options.path %>/neditor/i18n/zh-cn/zh-cn.js"></script>
28
-    <script src="<%= htmlWebpackPlugin.options.path %>/neditor/neditor.parse.min.js"></script>
21
+      <script src="https://images.shengws.com/reconnecting-websocket.min.js"></script>
22
+      <script src="https://images.shengws.com/jquery.min.js"></script>
23
+      <script src="https://images.shengws.com/tinymce4.7.5/tinymce.min.js"></script>
24
+      <script src="https://images.shengws.com/neditor/neditor.config.js"></script>
25
+      <script src="https://images.shengws.com/neditor/neditor.all.min.js"></script>
26
+      <script src="https://images.shengws.com/neditor/neditor.service.js"></script>
27
+      <script src="https://images.shengws.com/neditor/i18n/zh-cn/zh-cn.js"></script>
28
+      <script src="https://images.shengws.com/neditor/neditor.parse.min.js"></script>
29 29
 
30 30
     <div id="app"></div>
31 31
     <!-- built files will be auto injected -->

+ 18 - 0
src/api/dialysis.js View File

@@ -509,4 +509,22 @@ export function getAferLogList(params){
509 509
     method:"get",
510 510
     params:params,
511 511
   })
512
+}
513
+
514
+
515
+export function saveGatherSetting(){
516
+
517
+  return request({
518
+     url:"/api/patient/savegathersetting",
519
+     method:"get",
520
+     params:params,
521
+  })
522
+}
523
+
524
+export function getGatherSetting(){
525
+  return request({
526
+    url:"/api/patient/getgathersetting",
527
+    method:"get",
528
+    params:params
529
+  })
512 530
 }

+ 10 - 1
src/xt_pages/dialysis/details/consumable/index.vue View File

@@ -15,6 +15,10 @@
15 15
             <el-tab-pane label="透析参数" name="third">
16 16
                <DialysisParameter ref="mychildtwo"></DialysisParameter>
17 17
             </el-tab-pane>
18
+
19
+            <el-tab-pane label="汇总" name="four">
20
+               <DialysisGather ref="mychildthree"></DialysisGather>
21
+            </el-tab-pane>
18 22
         
19 23
         </el-tabs>
20 24
      </div>
@@ -26,7 +30,7 @@ import BreadCrumb from "@/xt_pages/components/bread-crumb";
26 30
 import DialysisGood from "@/xt_pages/dialysis/details/consumable/dialysisGood"
27 31
 import DialysisDrug from "@/xt_pages/dialysis/details/consumable/dialysisDrug"
28 32
 import DialysisParameter from "@/xt_pages/dialysis/details/consumable/dialysisParameter"
29
-
33
+import DialysisGather from "@/xt_pages/dialysis/details/consumable/dialysisGather"
30 34
 export default {
31 35
   name: "stockNewQuery",
32 36
   
@@ -35,6 +39,7 @@ export default {
35 39
     DialysisGood,
36 40
     DialysisDrug,
37 41
     DialysisParameter,
42
+    DialysisGather
38 43
   },
39 44
   data() {
40 45
     return {
@@ -49,6 +54,7 @@ export default {
49 54
   },
50 55
   methods:{
51 56
     handleClick(val){
57
+      console.log("woowowow",val.name)
52 58
       if(val.name == "first"){
53 59
        this.$refs.mychild.open()
54 60
       }   
@@ -58,6 +64,9 @@ export default {
58 64
       if(val.name == "third"){
59 65
         this.$refs.mychildtwo.open()
60 66
       }
67
+      if(val.name =="four"){
68
+         this.$refs.mychildthree.open()
69
+      }
61 70
     }
62 71
   }
63 72
 };

+ 1 - 1
src/xt_pages/user/dialysisSolution.vue View File

@@ -2065,7 +2065,7 @@
2065 2065
 
2066 2066
         this.addPlan.amylaceum = row.amylaceum
2067 2067
         this.addPlan.chaptalization = row.chaptalization
2068
-
2068
+        this.addPlan.blood_access_part_id = row.blood_access_part_id  
2069 2069
 
2070 2070
       },
2071 2071
       isShows(name) {