Explorar el Código

Merge branch 'master' of http://git.shengws.com/csx/Vue_New

See999 hace 4 años
padre
commit
e971f13206

+ 7 - 12
src/api/data.js Ver fichero

@@ -17,6 +17,7 @@ export function createChildConfig(params) {
17 17
 }
18 18
 
19 19
 export function updateChildConfig(params) {
20
+  console.log('params', params)
20 21
   return request({
21 22
     url: '/api/updatechildconfig',
22 23
     method: 'post',
@@ -40,29 +41,23 @@ export function updateTemplate(params) {
40 41
   })
41 42
 }
42 43
 
43
-
44
-export function updateFieldIsShow(id,is_show) {
44
+export function updateFieldIsShow(id, is_show) {
45 45
   return request({
46
-    url: '/api/filed/show?id='+id+'&is_show='+is_show,
47
-    method: 'post',
46
+    url: '/api/filed/show?id=' + id + '&is_show=' + is_show,
47
+    method: 'post'
48 48
   })
49 49
 }
50 50
 
51
-
52
-
53
-
54
-
55 51
 export function postPrintTemplate(params) {
56 52
   return request({
57
-    url: '/api/print/template/commit?template_id='+params,
58
-    method: 'post',
53
+    url: '/api/print/template/commit?template_id=' + params,
54
+    method: 'post'
59 55
   })
60 56
 }
61 57
 
62 58
 export function getPrintTemplate() {
63 59
   return request({
64 60
     url: '/api/print/template/get',
65
-    method: 'get',
61
+    method: 'get'
66 62
   })
67 63
 }
68
-

+ 61 - 59
src/views/layout/components/Navbar.vue Ver fichero

@@ -1,9 +1,9 @@
1 1
 <template>
2 2
   <div class="top-nav">
3
-    <div class="nav-logo">
3
+    <!-- <div class="nav-logo">
4 4
       <img :src="require(`../../../assets/logo/logo.png`)" alt="">
5 5
     </div>
6
-    <!-- <el-menu class="navbar" mode="horizontal">
6
+    <el-menu class="navbar" mode="horizontal">
7 7
       <div>
8 8
         <span> {{this.$store.getters.xt_user.org.org_name}}
9 9
         </span>
@@ -62,64 +62,64 @@
62 62
         <modify-org-info-dialog ref="modify_org_info_dialog"></modify-org-info-dialog>
63 63
 
64 64
       </div>
65
-    </el-menu> -->
66
-    <div style="display:flex;align-items: center;justify-content: space-between; width:96%">
67
-      <div class="dropdownBox">
68
-        <el-dropdown trigger="click" @command="handleOrgCommand">
69
-          <span class="el-dropdown-link">
70
-            {{ org_name }}
71
-            <i class="el-icon-arrow-down el-icon--right"></i>
72
-          </span>
65
+    </el-menu>-->
66
+    <div class="dropdownBox">
67
+      <el-dropdown trigger="click" @command="handleOrgCommand">
68
+        <span class="el-dropdown-link">
69
+          {{ org_name }}
70
+          <i class="el-icon-arrow-down el-icon--right"></i>
71
+        </span>
72
+        <el-dropdown-menu slot="dropdown">
73
+          <el-dropdown-item
74
+            v-for="(item, index) in orgs"
75
+            :key="index"
76
+            :command="item.id"
77
+            >{{ item.org_name }}</el-dropdown-item
78
+          >
79
+        </el-dropdown-menu>
80
+      </el-dropdown>
81
+    </div>
82
+    <div class="navRight">
83
+      <!-- <el-input placeholder="搜索患者透析号/姓名/首拼" prefix-icon="el-icon-search" v-model="input2"></el-input>
84
+      <div style="color: #b2b2b3;">通知中心</div> -->
85
+      <div class="right-menu">
86
+        <el-dropdown
87
+          class="avatar-container right-menu-item"
88
+          trigger="click"
89
+          @command="handleCommand"
90
+        >
91
+          <div class="avatar-wrapper">
92
+            <img class="user-avatar" :src="avater" />
93
+            <span class="user-title">{{
94
+              this.$store.getters.xt_user.user.user_name
95
+            }}</span>
96
+            <i class="el-icon-caret-bottom"></i>
97
+          </div>
73 98
           <el-dropdown-menu slot="dropdown">
99
+            <el-dropdown-item command="modifyUserInfoAction"
100
+              >个人信息</el-dropdown-item
101
+            >
74 102
             <el-dropdown-item
75
-              v-for="(item, index) in orgs"
76
-              :key="index"
77
-              :command="item.id"
78
-              >{{ item.org_name }}</el-dropdown-item
103
+              command="modifyOrgInfoAction"
104
+              v-if="is_super_admin === 1"
105
+              >机构信息</el-dropdown-item
79 106
             >
107
+            <el-dropdown-item divided command="logout">{{
108
+              $t("navbar.logOut")
109
+            }}</el-dropdown-item>
80 110
           </el-dropdown-menu>
81 111
         </el-dropdown>
112
+
113
+        <modify-user-info-dialog
114
+          ref="modify_user_info_dialog"
115
+        ></modify-user-info-dialog>
116
+        <modify-org-info-dialog
117
+          ref="modify_org_info_dialog"
118
+        ></modify-org-info-dialog>
82 119
       </div>
83
-      <div class="navRight">
84
-        <!-- <el-input placeholder="搜索患者透析号/姓名/首拼" prefix-icon="el-icon-search" v-model="input2"></el-input>
85
-        <div style="color: #b2b2b3;">通知中心</div> -->
86
-        <div class="right-menu">
87
-          <el-dropdown
88
-            class="avatar-container right-menu-item"
89
-            trigger="click"
90
-            @command="handleCommand"
91
-          >
92
-            <div class="avatar-wrapper">
93
-              <img class="user-avatar" :src="avater" />
94
-              <span class="user-title">{{
95
-                this.$store.getters.xt_user.user.user_name
96
-              }}</span>
97
-              <i class="el-icon-caret-bottom"></i>
98
-            </div>
99
-            <el-dropdown-menu slot="dropdown">
100
-              <el-dropdown-item command="modifyUserInfoAction"
101
-                >个人信息</el-dropdown-item
102
-              >
103
-              <el-dropdown-item command="modifyOrgInfoAction"
104
-                >机构信息</el-dropdown-item
105
-              >
106
-              <el-dropdown-item divided command="logout">{{
107
-                $t("navbar.logOut")
108
-              }}</el-dropdown-item>
109
-            </el-dropdown-menu>
110
-          </el-dropdown>
111
-
112
-          <modify-user-info-dialog
113
-            ref="modify_user_info_dialog"
114
-          ></modify-user-info-dialog>
115
-          <modify-org-info-dialog
116
-            ref="modify_org_info_dialog"
117
-          ></modify-org-info-dialog>
118
-        </div>
119
-        <div>
120
-          <i class="el-icon-question"></i>
121
-          <a href="https://sso.kuyicloud.com/help" target="_blank">帮助中心</a>
122
-        </div>
120
+      <div>
121
+        <i class="el-icon-question"></i>
122
+        <a href="https://sso.kuyicloud.com/help" target="_blank">帮助中心</a>
123 123
       </div>
124 124
     </div>
125 125
   </div>
@@ -145,8 +145,8 @@ export default {
145 145
     return {
146 146
       orgs: [],
147 147
       org_id: this.$store.getters.xt_user.org.id,
148
-      org_name: this.$store.getters.xt_user.org.org_name
149
-
148
+      org_name: this.$store.getters.xt_user.org.org_name,
149
+      is_super_admin: 0
150 150
       // scrm_role_exist: $store.getters.xt_user.scrm_role_exist
151 151
     };
152 152
   },
@@ -284,6 +284,9 @@ export default {
284 284
         console.log("org", this.orgs);
285 285
         var creator = response.data.data.creator;
286 286
         console.log("creator", creator);
287
+        var admin = response.data.data.admin;
288
+        console.log("admin", admin);
289
+        this.is_super_admin = admin.is_super_admin;
287 290
         for (let i = 0; i < this.orgs.length; i++) {
288 291
           if (this.orgs[i].id == this.org_id) {
289 292
             this.org_name = this.orgs[i].org_name;
@@ -297,17 +300,16 @@ export default {
297 300
 
298 301
 <style rel="stylesheet/scss" lang="scss" scoped>
299 302
 .top-nav {
300
-  width: 100%;
301 303
   background: #409eff;
302 304
   position: fixed;
303 305
   top: 0;
304
-  // left: 150px;
306
+  left: 150px;
305 307
   right: 0;
306 308
   z-index: 1000;
307 309
   height: 50px;
308 310
   display: flex;
309 311
   align-items: center;
310
-  // justify-content: space-between;
312
+  justify-content: space-between;
311 313
   color: #fff;
312 314
   .dropdownBox {
313 315
     margin-left: 10px;

+ 0 - 1
src/xt_pages/data/components/table.vue Ver fichero

@@ -192,7 +192,6 @@ export default {
192 192
   },
193 193
   created() {
194 194
     this.getList();
195
-    console.log("list是-----------", this.list);
196 195
   },
197 196
   methods: {
198 197
     fieldChange: function(newValue) {

+ 7 - 4
src/xt_pages/data/components/tableson.vue Ver fichero

@@ -78,7 +78,7 @@
78 78
             <el-form-item label="排序" prop="order">
79 79
               <el-input
80 80
                 type="age"
81
-                v-model.number="temp.order"
81
+                v-model.number="temp.orders"
82 82
                 placeholder="请输入排序值,数值越大,排序越靠前"
83 83
               ></el-input>
84 84
             </el-form-item>
@@ -202,7 +202,8 @@ export default {
202 202
         name: "",
203 203
         field_name: undefined,
204 204
         value: "",
205
-        remark: ""
205
+        remark: "",
206
+        orders: 0
206 207
       },
207 208
       dialogFormVisible: false,
208 209
       dialogStatus: "",
@@ -269,7 +270,8 @@ export default {
269 270
         name: "",
270 271
         field_name: undefined,
271 272
         value: "",
272
-        remark: ""
273
+        remark: "",
274
+        orders: ""
273 275
       };
274 276
     });
275 277
   },
@@ -348,7 +350,8 @@ export default {
348 350
         name: "",
349 351
         field_name: undefined,
350 352
         value: "",
351
-        remark: ""
353
+        remark: "",
354
+        orders: 0
352 355
       };
353 356
     },
354 357
     handleCreate() {

+ 12 - 1
src/xt_pages/dialysis/bloodPresssWatch.vue Ver fichero

@@ -602,6 +602,10 @@ export default {
602 602
       this.getSchedualPatientList();
603 603
     },
604 604
     batchPrintAction: function() {
605
+      if (this.selecting_schs.length === 0) {
606
+        this.$message.error("请至少选择一条需要打印的内容");
607
+        return false;
608
+      }
605 609
       // 模板ID为6
606 610
       var sch_ids = [];
607 611
 
@@ -630,11 +634,14 @@ export default {
630 634
       }
631 635
     },
632 636
     batchPrintActionOne: function() {
637
+      if (this.selecting_schs.length === 0) {
638
+        this.$message.error("请至少选择一条需要打印的内容");
639
+        return false;
640
+      }
633 641
       var sch_ids = [];
634 642
       for (let index = 0; index < this.selecting_schs.length; index++) {
635 643
         sch_ids.push(this.selecting_schs[index].sch_id);
636 644
       }
637
-      console.log("第二个", sch_ids);
638 645
       this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids);
639 646
       if (this.template_id == 2 || this.template_id == 0) {
640 647
         this.$router.push({ path: "/dialysis/print/batch/otherone" });
@@ -645,6 +652,10 @@ export default {
645 652
       }
646 653
     },
647 654
     batchPrintActionTwo: function() {
655
+      if (this.selecting_schs.length === 0) {
656
+        this.$message.error("请至少选择一条需要打印的内容");
657
+        return false;
658
+      }
648 659
       var sch_ids = [];
649 660
       for (let index = 0; index < this.selecting_schs.length; index++) {
650 661
         sch_ids.push(this.selecting_schs[index].sch_id);

+ 1 - 1
src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue Ver fichero

@@ -28,7 +28,7 @@
28 28
 
29 29
           <el-col :span="8" v-if="isShow('实际超滤量')">
30 30
 
31
-            <el-form-item label="实际超滤量(ml): " v-if="this.template_id == 6 || this.template_id == 10">
31
+            <el-form-item label="实际超滤量(ml): " v-if="this.template_id == 6 || this.template_id == 10 || this.template_id == 11">
32 32
               <el-input v-model="form.actual_ultrafiltration"></el-input>
33 33
             </el-form-item>
34 34
             <el-form-item label="实际超滤量(L): " v-else>

+ 2 - 13
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Ver fichero

@@ -691,10 +691,10 @@
691 691
       <span slot="footer" class="dialog-footer">
692 692
         <el-button @click="handleCancle">取 消</el-button>
693 693
         <!-- <el-button type="primary" @click="handleCommit" v-if="isPermission()">保 存</el-button> -->
694
-        <el-button type="primary" @click="handleCommit" v-if="hasPermission"
694
+        <el-button type="primary" @click="handleCommit"
695 695
           >保 存</el-button
696 696
         >
697
-        <el-button type="primary" @click="handleSolution" v-if="isPermission()"
697
+        <el-button type="primary" @click="handleSolution"
698 698
           >保存为长期处方</el-button
699 699
         >
700 700
       </span>
@@ -1178,17 +1178,6 @@ export default {
1178 1178
         }
1179 1179
       }
1180 1180
     },
1181
-    isPermission() {
1182
-      if (
1183
-        this.$store.getters.xt_user.user.user_type == 3 &&
1184
-        (this.$store.getters.xt_user.template_info.template_id == 2 ||
1185
-          this.$store.getters.xt_user.template_info.template_id == 6)
1186
-      ) {
1187
-        return false;
1188
-      } else {
1189
-        return true;
1190
-      }
1191
-    },
1192 1181
     setLastRecord: function(
1193 1182
       schedual,
1194 1183
       lastAssessmentAfterDislysis,

+ 39 - 9
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Ver fichero

@@ -140,7 +140,7 @@
140 140
             align="center"
141 141
             label="超滤量(ml)"
142 142
             width="110"
143
-            v-if="isShow('超滤量') && (template_id == 6 || template_id == 10)"
143
+            v-if="isShow('超滤量') && (template_id == 6 || template_id == 10 || template_id == 11)"
144 144
           >
145 145
             <template slot-scope="scope">
146 146
               {{
@@ -155,7 +155,7 @@
155 155
             align="center"
156 156
             label="超滤量(L)"
157 157
             width="110"
158
-            v-if="isShow('超滤量') && template_id != 6 &&  template_id != 10"
158
+            v-if="isShow('超滤量') && template_id != 6 &&  template_id != 10 && template_id != 11"
159 159
           >
160 160
             <template slot-scope="scope">
161 161
               {{
@@ -200,7 +200,7 @@
200 200
             align="center"
201 201
             label="置换率(ml/min)"
202 202
             width="120"
203
-            v-if="isShow('置换率') && (template_id == 6  || template_id == 10)"
203
+            v-if="isShow('置换率') && (template_id == 6  || template_id == 10 || template_id == 11)"
204 204
           >
205 205
             <template slot-scope="scope">
206 206
               {{ scope.row.replacement_rate ? scope.row.replacement_rate : "" }}
@@ -211,7 +211,7 @@
211 211
             align="center"
212 212
             label="置换率(L/h)"
213 213
             width="120"
214
-            v-if="isShow('置换率') && template_id != 6 && template_id != 10"
214
+            v-if="isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11"
215 215
           >
216 216
             <template slot-scope="scope">
217 217
               {{ scope.row.replacement_rate ? scope.row.replacement_rate : "" }}
@@ -222,7 +222,7 @@
222 222
             align="center"
223 223
             label="置换量(ml)"
224 224
             width="100"
225
-            v-if="isShow('置换量') && (template_id == 6 || template_id == 10)"
225
+            v-if="isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11)"
226 226
           >
227 227
             <template slot-scope="scope">
228 228
               {{
@@ -238,7 +238,7 @@
238 238
             align="center"
239 239
             label="SpO₂(%)"
240 240
             width="100"
241
-            v-if="isShow('SpO₂') && template_id != 6 && template_id != 10"
241
+            v-if="isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11"
242 242
           >
243 243
             <template slot-scope="scope">
244 244
               {{
@@ -254,7 +254,7 @@
254 254
             align="center"
255 255
             label="置换量(L)"
256 256
             width="100"
257
-            v-if="isShow('置换量') && template_id != 6 && template_id != 10"
257
+            v-if="isShow('置换量') && template_id != 6 && template_id != 10 || template_id != 11"
258 258
           >
259 259
             <template slot-scope="scope">
260 260
               {{
@@ -417,12 +417,12 @@
417 417
               <el-input v-model="form.ultrafiltration_rate"></el-input>
418 418
             </el-form-item>
419 419
           </el-col>
420
-          <el-col :span="8" v-if="isShow('超滤量') &&(template_id != 6 || template_id != 10)">
420
+          <el-col :span="8" v-if="isShow('超滤量') &&(template_id != 6 || template_id != 10 || template_id != 11)">
421 421
             <el-form-item label="超滤量(ml):">
422 422
               <el-input v-model="form.ultrafiltration_volume"></el-input>
423 423
             </el-form-item>
424 424
           </el-col>
425
-          <el-col :span="8" v-if="isShow('超滤量') && template_id != 6 && template_id != 10">
425
+          <el-col :span="8" v-if="isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11">
426 426
             <el-form-item label="超滤量(L):">
427 427
               <el-input v-model="form.ultrafiltration_volume"></el-input>
428 428
             </el-form-item>
@@ -469,6 +469,13 @@
469 469
             </el-form-item>
470 470
           </el-col>
471 471
 
472
+
473
+          <el-col :span="8" v-if="isShow('肝素用量余量')">
474
+            <el-form-item label="肝素用量余量(ml):">
475
+              <el-input v-model="form.heparin"></el-input>
476
+            </el-form-item>
477
+          </el-col>
478
+
472 479
           <!-- </el-row>
473 480
 
474 481
           <el-row :gutter="20"> -->
@@ -642,6 +649,7 @@ export default {
642 649
         displacement_quantity: "", // 置换量
643 650
         conductivity: "", // 电导度
644 651
         displacement_flow_quantity: "", // 置换液流量
652
+        heparin:"", //肝素用量余量
645 653
         ktv: "", // KT/V
646 654
         symptom: "", // 病情变化
647 655
         dispose: "", // 处理
@@ -770,6 +778,9 @@ export default {
770 778
         this.form.replacement_rate = resp.monitor.replacement_rate
771 779
           ? resp.monitor.replacement_rate
772 780
           : "";
781
+        this.form.heparin = resp.monitor.heparin
782
+          ? resp.monitor.heparin
783
+          : "";
773 784
         this.form.displacement_quantity = ""; // this.last_monitor_record.displacement_quantity;
774 785
         this.form.conductivity = "";
775 786
         this.form.displacement_flow_quantity = "";
@@ -828,6 +839,8 @@ export default {
828 839
         this.form.displacement_quantity = "";
829 840
         this.form.conductivity = "";
830 841
         this.form.displacement_flow_quantity = "";
842
+        this.form.heparin = "";
843
+
831 844
         this.form.ktv = "";
832 845
         this.form.symptom = "";
833 846
         this.form.dispose = "";
@@ -890,6 +903,12 @@ export default {
890 903
           ? monitor.displacement_flow_quantity
891 904
           : "";
892 905
 
906
+        this.form.heparin = monitor.heparin
907
+          ? monitor.heparin
908
+          : "";
909
+
910
+
911
+
893 912
         this.form.ktv = monitor.ktv;
894 913
         this.form.symptom = monitor.symptom;
895 914
         this.form.dispose = monitor.dispose;
@@ -975,6 +994,12 @@ export default {
975 994
           ? 0
976 995
           : parseFloat(this.form.displacement_flow_quantity);
977 996
 
997
+
998
+      this.form.heparin =
999
+        parseFloat(this.form.heparin) == NaN
1000
+          ? 0
1001
+          : parseFloat(this.form.heparin);
1002
+
978 1003
       this.form.ktv =
979 1004
         parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv);
980 1005
       this.form.monitoring_date = parseInt(this.form.monitoring_date);
@@ -1077,6 +1102,11 @@ export default {
1077 1102
               ? 0
1078 1103
               : parseFloat(this.form.displacement_flow_quantity);
1079 1104
 
1105
+          this.form.heparin =
1106
+            parseFloat(this.form.heparin) == NaN
1107
+              ? 0
1108
+              : parseFloat(this.form.heparin);
1109
+
1080 1110
           this.form.ktv =
1081 1111
             parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv);
1082 1112
 

+ 12 - 7
src/xt_pages/dialysis/details/dialysisMonitoring.vue Ver fichero

@@ -12,18 +12,20 @@
12 12
         <th width="76px">静脉压/动脉压(mmHg)</th>
13 13
         <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
14 14
         <th v-if="isShow('跨膜压')" width="76px">跨膜压(mmhg)</th>
15
-        <th v-if="isShow('超滤量') && (template_id == 6 || template_id == 10)" width="76px">超滤量(ml)</th>
16
-        <th v-if="isShow('超滤量') && template_id != 6 && template_id != 10" width="76px">超滤量(L)</th>
15
+        <th v-if="isShow('超滤量') && (template_id == 6 || template_id == 10 || template_id == 11)" width="76px">超滤量(ml)</th>
16
+        <th v-if="isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11" width="76px">超滤量(L)</th>
17 17
         <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
18 18
         <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
19
-        <th v-if="isShow('置换率')&& (template_id == 6 || template_id == 10)" width="92px">置换率(ml/min)</th>
20
-        <th v-if="isShow('置换率')&& template_id != 6 && template_id != 10" width="92px">置换率(L/h)</th>
19
+        <th v-if="isShow('置换率')&& (template_id == 6 || template_id == 10 || template_id == 11)" width="92px">置换率(ml/min)</th>
20
+        <th v-if="isShow('置换率')&& template_id != 6 && template_id != 10 && template_id != 11" width="92px">置换率(L/h)</th>
21 21
 
22
-        <th v-if="isShow('置换量')&& (template_id == 6 || template_id == 10)" width="92px">置换量(ml)</th>
23
-        <th v-if="isShow('置换量')&& template_id != 6 && template_id != 10" width="92px">置换量(L)</th>
24
-         <th v-if="isShow('SpO₂')&& template_id != 6 && template_id != 10" width="92px">SpO₂(%)</th>
22
+        <th v-if="isShow('置换量')&& (template_id == 6 || template_id == 10 ||  template_id == 11)" width="92px">置换量(ml)</th>
23
+        <th v-if="isShow('置换量')&& template_id != 6 && template_id != 10 && template_id != 10" width="92px">置换量(L)</th>
24
+         <th v-if="isShow('SpO₂')&& template_id != 6 && template_id != 10 && template_id != 11" width="92px">SpO₂(%)</th>
25 25
         <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
26 26
         <th v-if="isShow('置换液流量')"  width="92px">置换液流量(ml/h)</th>
27
+        <th v-if="isShow('肝素用量余量')"  width="92px">肝素用量余量(ml)</th>
28
+
27 29
         <th v-if="isShow('病情变化')" width="92px">病情变化</th>
28 30
         <th v-if="isShow('处理')"  width="92px">处理</th>
29 31
         <th v-if="isShow('结果')" width="92px">结果</th>
@@ -45,6 +47,9 @@
45 47
         <td v-if="isShow('SpO₂')">{{monitor.blood_oxygen_saturation?monitor.blood_oxygen_saturation:''}}</td>
46 48
         <td v-if="isShow('电导度')">{{ monitor.conductivity?monitor.conductivity:'' }}</td>
47 49
         <th v-if="isShow('置换液流量')" >{{monitor.displacement_flow_quantity?monitor.displacement_flow_quantity:''}}</th>
50
+
51
+        <th v-if="isShow('肝素用量余量')" >{{monitor.heparin?monitor.heparin:''}}</th>
52
+
48 53
         <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
49 54
         <td v-if="isShow('处理')">{{ monitor.dispose }}</td>
50 55
         <td v-if="isShow('结果')">{{ monitor.result }}</td>

+ 9 - 2
src/xt_pages/dialysis/dialysisPrintOrder.vue Ver fichero

@@ -96,7 +96,7 @@
96 96
       <template
97 97
         v-if="
98 98
           org_template_info.template_id == 6 ||
99
-            org_template_info.template_id == 10
99
+            org_template_info.template_id == 10 ||  org_template_info.template_id == 11
100 100
         "
101 101
       >
102 102
         <el-button
@@ -211,6 +211,11 @@
211 211
         v-bind:childResponse="childResponse"
212 212
         v-if="org_template_info.template_id == 9"
213 213
       ></DialysisPrintOrderNine>
214
+
215
+    <DialysisPrintOrderEleven
216
+      v-bind:childResponse="childResponse"
217
+      v-if="org_template_info.template_id == 11"
218
+    ></DialysisPrintOrderEleven>
214 219
     </div>
215 220
   </div>
216 221
 </template>
@@ -232,10 +237,12 @@ import DialysisPrintOrderEight from "./template/DialysisPrintOrderEight";
232 237
 import DialysisPrintOrderNine from "./template/DialysisPrintOrderNine";
233 238
 import print from "print-js";
234 239
 import DialysisPrintOrderTen from "./template/DialysisPrintOrderTen";
240
+import DialysisPrintOrderEleven from './template/DialysisPrintOrderEleven'
235 241
 
236 242
 export default {
237 243
   name: "dialysisPrintOrder",
238 244
   components: {
245
+    DialysisPrintOrderEleven,
239 246
     DialysisPrintOrderTen,
240 247
     DialysisPrintOrderOne,
241 248
     DialysisPrintOrderTwo,
@@ -423,7 +430,7 @@ export default {
423 430
         });
424 431
       } else if (
425 432
         this.org_template_info.template_id == 6 ||
426
-        this.org_template_info.template_id == 10
433
+        this.org_template_info.template_id == 10 ||  this.org_template_info.template_id == 11
427 434
       ) {
428 435
         printJS({
429 436
           printable: "dialysis-print-box-1",

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1954 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue


+ 2 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue Ver fichero

@@ -1025,6 +1025,8 @@
1025 1025
                           </span>
1026 1026
                     </div>
1027 1027
                   </td>
1028
+
1029
+
1028 1030
                   <td>
1029 1031
                   <span
1030 1032
                     v-if="setAdminUserES(monitor.monitoring_nurse) == ''"

+ 26 - 28
src/xt_pages/dialysis/template/dialysisPrintOrderNine.vue Ver fichero

@@ -1383,7 +1383,7 @@
1383 1383
                   </tr> -->
1384 1384
                   <tr>
1385 1385
                     <td width="70">拔针压迫:</td>
1386
-                    <td width="350">
1386
+                    <td width="300">
1387 1387
                       <div style="display:flex;justify-content:space-between;">
1388 1388
                         <label-box
1389 1389
                           showValue="自己压迫"
@@ -1405,12 +1405,6 @@
1405 1405
                             afterdialysis.hemostasis_opera == 1 ? true : false
1406 1406
                           "
1407 1407
                         ></label-box>
1408
-                        <label-box
1409
-                          showValue="内瘘止血带"
1410
-                          :isChecked="
1411
-                            afterdialysis.hemostasis_opera == 4 ? true : false
1412
-                          "
1413
-                        ></label-box>
1414 1408
                       </div>
1415 1409
                     </td>
1416 1410
                     <td width="50"></td>
@@ -1669,24 +1663,24 @@
1669 1663
                         ></label-box>
1670 1664
                       </div>
1671 1665
                     </td>
1672
-                    <!--<td width="80"></td>-->
1673
-                    <!--<td width="60">管路:</td>-->
1674
-                    <!--<td width="220">-->
1675
-                      <!--<div style="display:flex;justify-content:space-between;">-->
1676
-                        <!--<label-box showValue="无" :isChecked="-->
1677
-                            <!--afterdialysis.channel == 1 ? true : false-->
1678
-                          <!--"></label-box>-->
1679
-                        <!--<label-box showValue="+" :isChecked="-->
1680
-                            <!--afterdialysis.channel == 2 ? true : false-->
1681
-                          <!--"></label-box>-->
1682
-                        <!--<label-box showValue="+ +" :isChecked="-->
1683
-                            <!--afterdialysis.channel == 3  ? true : false-->
1684
-                          <!--"></label-box>-->
1685
-                        <!--<label-box showValue="+ + +" :isChecked="-->
1686
-                            <!--afterdialysis.channel == 4 ? true : false-->
1687
-                          <!--"></label-box>-->
1688
-                      <!--</div>-->
1689
-                    <!--</td>-->
1666
+                    <td width="80"></td>
1667
+                    <td width="60">管路:</td>
1668
+                    <td width="220">
1669
+                      <div style="display:flex;justify-content:space-between;">
1670
+                        <label-box showValue="无" :isChecked="
1671
+                            afterdialysis.channel == 1 ? true : false
1672
+                          "></label-box>
1673
+                        <label-box showValue="+" :isChecked="
1674
+                            afterdialysis.channel == 2 ? true : false
1675
+                          "></label-box>
1676
+                        <label-box showValue="+ +" :isChecked="
1677
+                            afterdialysis.channel == 3  ? true : false
1678
+                          "></label-box>
1679
+                        <label-box showValue="+ + +" :isChecked="
1680
+                            afterdialysis.channel == 4 ? true : false
1681
+                          "></label-box>
1682
+                      </div>
1683
+                    </td>
1690 1684
                     <td></td>
1691 1685
                   </tr>
1692 1686
                 </tbody>
@@ -1977,9 +1971,13 @@
1977 1971
             <td width="30">医生</td>
1978 1972
             <td width="80">
1979 1973
               <div class="under-line">
1980
-                &nbsp
1981
-                <span v-if=" setAdminUserES(prescription.creater) == '' " >{{ getAdminUser(prescription.creater)}}</span >
1982
-                <img style="height:20px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else  />
1974
+                &nbsp;
1975
+                <span v-if="doctorForm.url === ''">{{
1976
+                  doctorForm.doctor
1977
+                }}</span>
1978
+                <span v-if="doctorForm.url !== ''">
1979
+                  <img style="height:20px" :src="doctorForm.url" />
1980
+                </span>
1983 1981
               </div>
1984 1982
             </td>
1985 1983
             <td width="50">治疗护士</td>