浏览代码

Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

yq1 10 个月前
父节点
当前提交
283697ff8e

+ 9 - 0
src/api/doctorSchedule.js 查看文件

@@ -172,3 +172,12 @@ export function getchartlist(params) {
172 172
     params: params
173 173
   })
174 174
 }
175
+
176
+export function DeleteStaffScheduleById(id,params){
177
+  
178
+  return request({
179
+    url:"/api/deletestaffschedulebyid?id="+id,
180
+    methods:"get",
181
+    params:params
182
+  })
183
+}

+ 46 - 24
src/xt_pages/dialysis/template/DialysisPrintOrderseventyone.vue 查看文件

@@ -186,7 +186,7 @@
186 186
             灌流器
187 187
             <span class="under-line" style="display: inline-block;width: 50%;">
188 188
               {{ prescription.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}
189
-            </span>L
189
+            </span>
190 190
           </div>
191 191
           <div style="flex: 1;display: flex">
192 192
             透析液:
@@ -243,8 +243,8 @@
243 243
         <table border="1" style="border-collapse: collapse;text-align: center;">
244 244
           <tr>
245 245
             <td style="width: 60px;text-align: center;" rowspan="2" >时间</td>
246
-            <td colspan="4" style="text-align: center;">透析参数</td>
247
-            <td colspan="5" style="text-align: center;">生命体征</td>
246
+            <td colspan="6" style="text-align: center;">透析参数</td>
247
+            <td colspan="4" style="text-align: center;">生命体征</td>
248 248
             <td colspan="2" style="text-align: center;">治疗中病情变化</td>
249 249
           </tr>
250 250
           <tr>
@@ -252,6 +252,10 @@
252 252
               <p style="height: 20px; line-height: 20px">TMP</p>
253 253
               <p style="height: 20px; line-height: 20px">mmHg</p>
254 254
             </th>
255
+            <th style="width: 70px; font-weight: normal">
256
+              <p style="height: 20px; line-height: 20px">动脉压</p>
257
+              <p style="height: 20px; line-height: 20px">mmHg</p>
258
+            </th>
255 259
             <th style="width: 70px; font-weight: normal">
256 260
               <p style="height: 20px; line-height: 20px">静脉压</p>
257 261
               <p style="height: 20px; line-height: 20px">mmHg</p>
@@ -264,8 +268,8 @@
264 268
               <p style="height: 20px; line-height: 20px">脱水量</p>
265 269
               <p style="height: 20px; line-height: 20px">ml</p>
266 270
             </th>
267
-            <th style="width: 80px; font-weight: normal">
268
-              <p style="height: 20px; line-height: 20px">T</p>
271
+            <th style="width: 120px; font-weight: normal">
272
+              <p style="height: 20px; line-height: 30px">透析液温度</p>
269 273
               <p style="height: 20px; line-height: 20px">℃</p>
270 274
             </th>
271 275
             <th style="width: 60px; font-weight: normal">
@@ -282,12 +286,12 @@
282 286
             </th>
283 287
 
284 288
             <th style="width: 80px; font-weight: normal">
285
-              <p style="height: 20px; line-height: 20px">SpO₂</p>
286
-              <p style="height: 20px; line-height: 20px">%</p>
289
+              <p style="height: 20px; line-height: 20px">电导度</p>
290
+              <p style="height: 20px; line-height: 20px">mS/m</p>
287 291
             </th>
288
-            <th style="width: 70px; font-weight: normal">
292
+            <!-- <th style="width: 70px; font-weight: normal">
289 293
               时间
290
-            </th>
294
+            </th> -->
291 295
             <th style="width: 333px; font-weight: normal">
292 296
               <p style="height: 20px; line-height: 20px">
293 297
                 记&nbsp;&nbsp;&nbsp;&nbsp;录
@@ -298,23 +302,35 @@
298 302
             <td style="min-width: 60px; height: 30px">
299 303
               {{ getTime(monitor.operate_time, "{h}:{i}") }}
300 304
             </td>
305
+            
301 306
             <td>
302 307
               <span v-if="getTime(monitor.operate_time) != ''">
303 308
                 {{
304 309
                   monitor.transmembrane_pressure
305 310
                     ? monitor.transmembrane_pressure
306
-                    : ""
311
+                    : "/"
307 312
                 }}
308 313
               </span>
309 314
             </td>
315
+
316
+            <th style="width: 70px; font-weight: normal">
317
+              <span v-if="getTime(monitor.operate_time) != ''">
318
+                {{
319
+                  monitor.arterial_pressure
320
+                    ? monitor.arterial_pressure
321
+                    : "/"
322
+                }}
323
+              </span>
324
+            </th>
325
+            
310 326
             <td>
311 327
               <span v-if="getTime(monitor.operate_time) != ''">
312
-                &nbsp;{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}
328
+                &nbsp;{{ monitor.venous_pressure ? monitor.venous_pressure : "/" }}
313 329
               </span>
314 330
             </td>
315 331
             <td>
316 332
               <span v-if="getTime(monitor.operate_time) != ''">
317
-                {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}
333
+                {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "/" }}
318 334
               </span>
319 335
             </td>
320 336
             <td style="min-width: 45px">
@@ -324,7 +340,7 @@
324 340
                   {{
325 341
                   monitor.ultrafiltration_volume
326 342
                     ? monitor.ultrafiltration_volume
327
-                    : " "
343
+                    : ""
328 344
                  }}
329 345
                 </span>
330 346
               
@@ -334,19 +350,19 @@
334 350
             <!-- T -->
335 351
             <td>
336 352
               <span v-if="getTime(monitor.operate_time) != ''">
337
-                {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}
353
+                {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "/" }}
338 354
               </span>
339 355
             </td>
340 356
             <!-- HR -->
341 357
             <td>
342 358
               <span v-if="getTime(monitor.operate_time) != ''">
343
-                {{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}
359
+                {{ monitor.pulse_frequency ? monitor.pulse_frequency : "/" }}
344 360
               </span>
345 361
             </td>
346 362
             <!-- R -->
347 363
             <td>
348 364
               <span v-if="getTime(monitor.operate_time) != ''">
349
-                {{ monitor.breathing_rate ? monitor.breathing_rate : "" }}
365
+                {{ monitor.breathing_rate ? monitor.breathing_rate : "/" }}
350 366
               </span>
351 367
             </td>
352 368
             <!-- BP -->
@@ -355,11 +371,11 @@
355 371
                 {{
356 372
                   monitor.systolic_blood_pressure
357 373
                     ? monitor.systolic_blood_pressure
358
-                    : ""
374
+                    : "/"
359 375
                 }}/{{
360 376
                   monitor.diastolic_blood_pressure
361 377
                     ? monitor.diastolic_blood_pressure
362
-                    : ""
378
+                    : "/"
363 379
                 }}
364 380
               </span>
365 381
             </td>
@@ -367,17 +383,17 @@
367 383
             <td>
368 384
               <span v-if="getTime(monitor.operate_time) != ''">
369 385
                 {{
370
-                  monitor.blood_oxygen_saturation
371
-                    ? monitor.blood_oxygen_saturation
372
-                    : ""
386
+                  monitor.conductivity
387
+                    ? monitor.conductivity
388
+                    : "/"
373 389
                 }}
374 390
               </span>
375 391
             </td>
376 392
 
377 393
             <!-- 病情变化 -->
378
-            <td style="min-width: 60px; height: 30px">
394
+            <!-- <td style="min-width: 60px; height: 30px">
379 395
               {{ getTime(monitor.operate_time, "{h}:{i}") }}
380
-            </td>
396
+            </td> -->
381 397
             <td>
382 398
               <template 
383 399
               v-if=" (dialysisOrder && monitor.operate_time == dialysisOrder.start_time)&&(org_id!=10414) "
@@ -415,7 +431,13 @@
415 431
                 <p style="height:15px;line-height:15px">上次透后体重</p>
416 432
               </td>
417 433
               <td style="width:8%;">
418
-                {{ assessmentafter.weight_after ? assessmentafter.weight_after : "0" }}kg
434
+                 <span v-if="assessmentafter.weight_after == 0">
435
+                  {{ afterdialysis.last_after_weight ? assessmentafter.last_after_weight : "0" }}kg
436
+                 </span>
437
+                 <span v-if="assessmentafter.weight_after>0">
438
+                  {{ assessmentafter.weight_after ? assessmentafter.weight_after : "0" }}kg
439
+                 </span>
440
+                  
419 441
               </td>
420 442
             </tr>
421 443
 

+ 55 - 27
src/xt_pages/medicalScheduling/index.vue 查看文件

@@ -42,8 +42,8 @@
42 42
             </div>
43 43
             <div class="schedulingTable" style="display:flex;justify-content: space-between;">
44 44
                 <div style="width: 70%">
45
-                    <el-table :data="tableData" border 
46
-                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" 
45
+                    <el-table :data="tableData" border
46
+                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
47 47
                     :row-style="{ color: '#303133' }"  @cell-click="clickThis" :cell-style="tableCellStyle"
48 48
                     @cell-mouse-enter="hoverMouse" @cell-mouse-leave="leavemouse">
49 49
                     <!-- @cell-mouse-enter="hoverMouse" @cell-mouse-leave="leavemouse" -->
@@ -56,10 +56,12 @@
56 56
                             <template slot-scope="scope">
57 57
                                 <div v-if="name==scope.row.user_name&&column_lie =='周一' ? true:false">
58 58
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true" >
59
-                                    <el-button type="danger" size="mini" icon="el-icon-close" 
60
-                                      circle @click.stop=""   
59
+                                    <el-button type="danger" size="mini" icon="el-icon-close"
60
+                                      circle @click.stop=""
61 61
                                     ></el-button>
62 62
                                   </div>
63
+                                <div class="del_table_btn" v-show="scope.row.user_name=='合计'? false : true">
64
+                                  <el-button type="danger" size="mini" icon="el-icon-close" circle @click.stop="toClick(scope.row,scope.$index)"></el-button>
63 65
                                 </div>
64 66
                                 <div @click="hangdleClick(scope.row,scope.$index,0)">
65 67
                                     <el-dropdown trigger="click" @command="changeSchedule" >
@@ -80,12 +82,12 @@
80 82
                              <template slot-scope="scope">
81 83
                               <div v-if="name==scope.row.user_name&&column_lie =='周二' ? true:false">
82 84
                                 <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
83
-                                  <el-button type="danger" size="mini" icon="el-icon-close" 
84
-                                    circle @click.stop=""   
85
+                                  <el-button type="danger" size="mini" icon="el-icon-close"
86
+                                    circle @click.stop=""
85 87
                                   ></el-button>
86 88
                                 </div>
87 89
                               </div>
88
-                                
90
+
89 91
                                 <div @click="hangdleClick(scope.row,scope.$index,1)">
90 92
                                     <el-dropdown trigger="click" @command="changeSchedule">
91 93
                                         <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,2) == 2' style="color:red">
@@ -105,8 +107,8 @@
105 107
                              <template slot-scope="scope">
106 108
                                 <div v-if="name==scope.row.user_name&&column_lie =='周三' ? true:false">
107 109
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
108
-                                    <el-button type="danger" size="mini" icon="el-icon-close" 
109
-                                      circle @click.stop=""   
110
+                                    <el-button type="danger" size="mini" icon="el-icon-close"
111
+                                      circle @click.stop=""
110 112
                                     ></el-button>
111 113
                                   </div>
112 114
                                 </div>
@@ -129,8 +131,8 @@
129 131
                              <template slot-scope="scope">
130 132
                                 <div v-if="name==scope.row.user_name&&column_lie =='周四' ? true:false">
131 133
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
132
-                                    <el-button type="danger" size="mini" icon="el-icon-close" 
133
-                                      circle @click.stop=""   
134
+                                    <el-button type="danger" size="mini" icon="el-icon-close"
135
+                                      circle @click.stop=""
134 136
                                     ></el-button>
135 137
                                   </div>
136 138
                                 </div>
@@ -153,8 +155,8 @@
153 155
                              <template slot-scope="scope">
154 156
                                 <div v-if="name==scope.row.user_name&&column_lie =='周五' ? true:false">
155 157
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
156
-                                    <el-button type="danger" size="mini" icon="el-icon-close" 
157
-                                      circle @click.stop=""   
158
+                                    <el-button type="danger" size="mini" icon="el-icon-close"
159
+                                      circle @click.stop=""
158 160
                                     ></el-button>
159 161
                                   </div>
160 162
                                 </div>
@@ -177,8 +179,8 @@
177 179
                              <template slot-scope="scope">
178 180
                                 <div v-if="name==scope.row.user_name&&column_lie =='周六' ? true:false">
179 181
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
180
-                                    <el-button type="danger" size="mini" icon="el-icon-close" 
181
-                                      circle @click.stop=""   
182
+                                    <el-button type="danger" size="mini" icon="el-icon-close"
183
+                                      circle @click.stop=""
182 184
                                     ></el-button>
183 185
                                   </div>
184 186
                                 </div>
@@ -201,8 +203,8 @@
201 203
                              <template slot-scope="scope">
202 204
                                 <div v-if="name==scope.row.user_name&&column_lie =='周日' ? true:false">
203 205
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
204
-                                    <el-button type="danger" size="mini" icon="el-icon-close" 
205
-                                      circle @click.stop=""   
206
+                                    <el-button type="danger" size="mini" icon="el-icon-close"
207
+                                      circle @click.stop=""
206 208
                                     ></el-button>
207 209
                                   </div>
208 210
                                 </div>
@@ -400,7 +402,7 @@
400 402
 <script>
401 403
 const moment = require('moment')
402 404
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
403
-import { getDoctorList,getScheduleList,addSchedule,getStaffScheduleList,getNextWeekList,getScheduleByDoctorId,toSearchScheduleList,DeleteStaffSchedule,copyStaffSchedule,UpdateContinusSchedule,SaveNurseSort,SaveIsSchedule } from '@/api/doctorSchedule'
405
+import { getDoctorList,getScheduleList,addSchedule,getStaffScheduleList,getNextWeekList,getScheduleByDoctorId,toSearchScheduleList,DeleteStaffSchedule,copyStaffSchedule,UpdateContinusSchedule,SaveNurseSort,SaveIsSchedule,DeleteStaffScheduleById } from '@/api/doctorSchedule'
404 406
 import { constants } from 'crypto'
405 407
 export default {
406 408
     components:{
@@ -499,7 +501,7 @@ export default {
499 501
                     this.getStaffScheduleList()
500 502
 
501 503
                     var doctorlist =  response.data.data.doctorlist
502
-                  
504
+
503 505
                     for(let i=0;i<doctorlist.length;i++){
504 506
                         if(doctorlist[i].sort == 0){
505 507
                           doctorlist[i].sort = ""
@@ -747,7 +749,7 @@ export default {
747 749
                         })
748 750
                         sevenStr = zeroStr
749 751
                     }
750
-                    
752
+
751 753
                     if(staffList[i].schedule_week == 1){
752 754
                         staffList[i].class_index = 1
753 755
                         var arr = []
@@ -859,7 +861,7 @@ export default {
859 861
                         fourStr = strFour
860 862
                     }
861 863
 
862
-                    
864
+
863 865
                     if(staffList[i].schedule_week == 5){
864 866
                         staffList[i].class_index = 5
865 867
 
@@ -917,10 +919,12 @@ export default {
917 919
                         sixStr = strSix
918 920
                      }
919 921
                     }
922
+
920 923
                     let tempArr = [], newArr = []
921 924
                     for (let i = 0; i < staffList.length; i++) {
922 925
                         if (tempArr.indexOf(staffList[i].user_name) == -1) {
923 926
                             newArr.push({
927
+                                id:staffList[i].id,
924 928
                                 user_name: staffList[i].user_name,
925 929
                                 admin_user_id:staffList[i].admin_user_id,
926 930
                                 user_type:staffList[i].doctor_type,
@@ -938,7 +942,7 @@ export default {
938 942
                             }
939 943
                         }
940 944
                     }
941
-                    
945
+
942 946
                     let arrTen = [...newArr]
943 947
                     console.log("newArr22o2o2o2o2wo",arrTen)
944 948
                     let newNurse = []
@@ -970,7 +974,7 @@ export default {
970 974
                         }
971 975
                     })
972 976
                     newNurse.sort(this.compare('sort'))
973
-                  
977
+
974 978
                     // //医生
975 979
                     newDoctor.sort(this.compare('admin_user_id'))
976 980
                     let newDoctorTableData = []
@@ -991,7 +995,7 @@ export default {
991 995
 
992 996
 
993 997
                     let arr2 = []
994
-                    
998
+
995 999
                     arr2.push({class_name:oneStr,schedule_week:1})
996 1000
                     arr2.push({class_name:twoStr,schedule_week:2})
997 1001
                     arr2.push({class_name:threeStr,schedule_week:3})
@@ -1007,12 +1011,12 @@ export default {
1007 1011
                     arr.push(obj)
1008 1012
 
1009 1013
                     let data = []
1010
-                  
1014
+
1011 1015
                     data.push(...newNurse)
1012 1016
                     data.push(...newDoctor)
1013 1017
                     data.push(obj)
1014 1018
                     console.log("data2o2oo2o2o2o22o",data)
1015
-                    
1019
+
1016 1020
                     // this.tableData = this.distinct(data)
1017 1021
                     this.tableData = data
1018 1022
 
@@ -2050,10 +2054,34 @@ export default {
2050 2054
         return jsonData.map(v => filterVal.map(j => v[j]))
2051 2055
        },
2052 2056
 
2057
+       toClick(row,index){
2058
+          this.$confirm(
2059
+            '是否要清除当前排班? <br>清除后,信息将无法恢复',
2060
+            '删除提示',
2061
+            {
2062
+                dangerouslyUseHTMLString: true,
2063
+                confirmButtonText: '确定',
2064
+                cancelButtonText: '取消',
2065
+                type: 'warning'
2066
+            }
2067
+            ).then(()=>{
2068
+
2069
+            DeleteStaffScheduleById(row.id).then(response=>{
2070
+                if(response.data.state == 1){
2071
+                    var msg =  response.data.data.msg
2072
+                    this.$message.success("清除成功")
2073
+                    this.getStaffScheduleList()
2074
+
2075
+                }
2076
+            })
2077
+         })
2078
+       }
2079
+
2080
+
2053 2081
        hoverMouse(row,column, cell, event){
2054 2082
         this.name=row.user_name
2055 2083
         this.column_lie= column.label.split('\n')[0]
2056
-        
2084
+
2057 2085
        },
2058 2086
        leavemouse(row, column, cell, event){
2059 2087
         this.name=''