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

src/api/doctorSchedule.js

@@ -172,3 +172,12 @@ export function getchartlist(params) {
     params: params
   })
 }
+
+export function DeleteStaffScheduleById(id,params){
+  
+  return request({
+    url:"/api/deletestaffschedulebyid?id="+id,
+    methods:"get",
+    params:params
+  })
+}

src/xt_pages/dialysis/template/DialysisPrintOrderseventyone.vue

@@ -186,7 +186,7 @@
             灌流器
             <span class="under-line" style="display: inline-block;width: 50%;">
               {{ prescription.dialysis_irrigation ? prescription.dialysis_irrigation : "/" }}
-            </span>L
+            </span>
           </div>
           <div style="flex: 1;display: flex">
             透析液：
@@ -243,8 +243,8 @@
         <table border="1" style="border-collapse: collapse;text-align: center;">
           <tr>
             <td style="width: 60px;text-align: center;" rowspan="2" >时间</td>
-            <td colspan="4" style="text-align: center;">透析参数</td>
-            <td colspan="5" style="text-align: center;">生命体征</td>
+            <td colspan="6" style="text-align: center;">透析参数</td>
+            <td colspan="4" style="text-align: center;">生命体征</td>
             <td colspan="2" style="text-align: center;">治疗中病情变化</td>
           </tr>
           <tr>
@@ -252,6 +252,10 @@
               <p style="height: 20px; line-height: 20px">TMP</p>
               <p style="height: 20px; line-height: 20px">mmHg</p>
             </th>
+            <th style="width: 70px; font-weight: normal">
+              <p style="height: 20px; line-height: 20px">动脉压</p>
+              <p style="height: 20px; line-height: 20px">mmHg</p>
+            </th>
             <th style="width: 70px; font-weight: normal">
               <p style="height: 20px; line-height: 20px">静脉压</p>
               <p style="height: 20px; line-height: 20px">mmHg</p>
@@ -264,8 +268,8 @@
               <p style="height: 20px; line-height: 20px">脱水量</p>
               <p style="height: 20px; line-height: 20px">ml</p>
             </th>
-            <th style="width: 80px; font-weight: normal">
-              <p style="height: 20px; line-height: 20px">T</p>
+            <th style="width: 120px; font-weight: normal">
+              <p style="height: 20px; line-height: 30px">透析液温度</p>
               <p style="height: 20px; line-height: 20px">℃</p>
             </th>
             <th style="width: 60px; font-weight: normal">
@@ -282,12 +286,12 @@
             </th>
 
             <th style="width: 80px; font-weight: normal">
-              <p style="height: 20px; line-height: 20px">SpO₂</p>
-              <p style="height: 20px; line-height: 20px">%</p>
+              <p style="height: 20px; line-height: 20px">电导度</p>
+              <p style="height: 20px; line-height: 20px">mS/m</p>
             </th>
-            <th style="width: 70px; font-weight: normal">
+            <!-- <th style="width: 70px; font-weight: normal">
               时间
-            </th>
+            </th> -->
             <th style="width: 333px; font-weight: normal">
               <p style="height: 20px; line-height: 20px">
                 记&nbsp;&nbsp;&nbsp;&nbsp;录
@@ -298,23 +302,35 @@
             <td style="min-width: 60px; height: 30px">
               {{ getTime(monitor.operate_time, "{h}:{i}") }}
             </td>
+            
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
                 {{
                   monitor.transmembrane_pressure
                     ? monitor.transmembrane_pressure
-                    : ""
+                    : "/"
                 }}
               </span>
             </td>
+
+            <th style="width: 70px; font-weight: normal">
+              <span v-if="getTime(monitor.operate_time) != ''">
+                {{
+                  monitor.arterial_pressure
+                    ? monitor.arterial_pressure
+                    : "/"
+                }}
+              </span>
+            </th>
+            
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
-                &nbsp;{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}
+                &nbsp;{{ monitor.venous_pressure ? monitor.venous_pressure : "/" }}
               </span>
             </td>
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
-                {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}
+                {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "/" }}
               </span>
             </td>
             <td style="min-width: 45px">
@@ -324,7 +340,7 @@
                   {{
                   monitor.ultrafiltration_volume
                     ? monitor.ultrafiltration_volume
-                    : " "
+                    : ""
                  }}
                 </span>
               
@@ -334,19 +350,19 @@
             <!-- T -->
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
-                {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}
+                {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "/" }}
               </span>
             </td>
             <!-- HR -->
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
-                {{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}
+                {{ monitor.pulse_frequency ? monitor.pulse_frequency : "/" }}
               </span>
             </td>
             <!-- R -->
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
-                {{ monitor.breathing_rate ? monitor.breathing_rate : "" }}
+                {{ monitor.breathing_rate ? monitor.breathing_rate : "/" }}
               </span>
             </td>
             <!-- BP -->
@@ -355,11 +371,11 @@
                 {{
                   monitor.systolic_blood_pressure
                     ? monitor.systolic_blood_pressure
-                    : ""
+                    : "/"
                 }}/{{
                   monitor.diastolic_blood_pressure
                     ? monitor.diastolic_blood_pressure
-                    : ""
+                    : "/"
                 }}
               </span>
             </td>
@@ -367,17 +383,17 @@
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
                 {{
-                  monitor.blood_oxygen_saturation
-                    ? monitor.blood_oxygen_saturation
-                    : ""
+                  monitor.conductivity
+                    ? monitor.conductivity
+                    : "/"
                 }}
               </span>
             </td>
 
             <!-- 病情变化 -->
-            <td style="min-width: 60px; height: 30px">
+            <!-- <td style="min-width: 60px; height: 30px">
               {{ getTime(monitor.operate_time, "{h}:{i}") }}
-            </td>
+            </td> -->
             <td>
               <template 
               v-if=" (dialysisOrder && monitor.operate_time == dialysisOrder.start_time)&&(org_id!=10414) "
@@ -415,7 +431,13 @@
                 <p style="height:15px;line-height:15px">上次透后体重</p>
               </td>
               <td style="width:8%;">
-                {{ assessmentafter.weight_after ? assessmentafter.weight_after : "0" }}kg
+                 <span v-if="assessmentafter.weight_after == 0">
+                  {{ afterdialysis.last_after_weight ? assessmentafter.last_after_weight : "0" }}kg
+                 </span>
+                 <span v-if="assessmentafter.weight_after>0">
+                  {{ assessmentafter.weight_after ? assessmentafter.weight_after : "0" }}kg
+                 </span>
+                  
               </td>
             </tr>
 

src/xt_pages/medicalScheduling/index.vue

@@ -42,8 +42,8 @@
             </div>
             <div class="schedulingTable" style="display:flex;justify-content: space-between;">
                 <div style="width: 70%">
-                    <el-table :data="tableData" border 
-                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" 
+                    <el-table :data="tableData" border
+                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
                     :row-style="{ color: '#303133' }"  @cell-click="clickThis" :cell-style="tableCellStyle"
                     @cell-mouse-enter="hoverMouse" @cell-mouse-leave="leavemouse">
                     <!-- @cell-mouse-enter="hoverMouse" @cell-mouse-leave="leavemouse" -->
@@ -56,10 +56,12 @@
                             <template slot-scope="scope">
                                 <div v-if="name==scope.row.user_name&&column_lie =='周一' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true" >
-                                    <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop=""   
+                                    <el-button type="danger" size="mini" icon="el-icon-close"
+                                      circle @click.stop=""
                                     ></el-button>
                                   </div>
+                                <div class="del_table_btn" v-show="scope.row.user_name=='合计'? false : true">
+                                  <el-button type="danger" size="mini" icon="el-icon-close" circle @click.stop="toClick(scope.row,scope.$index)"></el-button>
                                 </div>
                                 <div @click="hangdleClick(scope.row,scope.$index,0)">
                                     <el-dropdown trigger="click" @command="changeSchedule" >
@@ -80,12 +82,12 @@
                              <template slot-scope="scope">
                               <div v-if="name==scope.row.user_name&&column_lie =='周二' ? true:false">
                                 <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
-                                  <el-button type="danger" size="mini" icon="el-icon-close" 
-                                    circle @click.stop=""   
+                                  <el-button type="danger" size="mini" icon="el-icon-close"
+                                    circle @click.stop=""
                                   ></el-button>
                                 </div>
                               </div>
-                                
+
                                 <div @click="hangdleClick(scope.row,scope.$index,1)">
                                     <el-dropdown trigger="click" @command="changeSchedule">
                                         <span class="el-dropdown-link" v-if='getClassAttributes(scope.row.user_name,2) == 2' style="color:red">
@@ -105,8 +107,8 @@
                              <template slot-scope="scope">
                                 <div v-if="name==scope.row.user_name&&column_lie =='周三' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
-                                    <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop=""   
+                                    <el-button type="danger" size="mini" icon="el-icon-close"
+                                      circle @click.stop=""
                                     ></el-button>
                                   </div>
                                 </div>
@@ -129,8 +131,8 @@
                              <template slot-scope="scope">
                                 <div v-if="name==scope.row.user_name&&column_lie =='周四' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
-                                    <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop=""   
+                                    <el-button type="danger" size="mini" icon="el-icon-close"
+                                      circle @click.stop=""
                                     ></el-button>
                                   </div>
                                 </div>
@@ -153,8 +155,8 @@
                              <template slot-scope="scope">
                                 <div v-if="name==scope.row.user_name&&column_lie =='周五' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
-                                    <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop=""   
+                                    <el-button type="danger" size="mini" icon="el-icon-close"
+                                      circle @click.stop=""
                                     ></el-button>
                                   </div>
                                 </div>
@@ -177,8 +179,8 @@
                              <template slot-scope="scope">
                                 <div v-if="name==scope.row.user_name&&column_lie =='周六' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
-                                    <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop=""   
+                                    <el-button type="danger" size="mini" icon="el-icon-close"
+                                      circle @click.stop=""
                                     ></el-button>
                                   </div>
                                 </div>
@@ -201,8 +203,8 @@
                              <template slot-scope="scope">
                                 <div v-if="name==scope.row.user_name&&column_lie =='周日' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
-                                    <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop=""   
+                                    <el-button type="danger" size="mini" icon="el-icon-close"
+                                      circle @click.stop=""
                                     ></el-button>
                                   </div>
                                 </div>
@@ -400,7 +402,7 @@
 <script>
 const moment = require('moment')
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { getDoctorList,getScheduleList,addSchedule,getStaffScheduleList,getNextWeekList,getScheduleByDoctorId,toSearchScheduleList,DeleteStaffSchedule,copyStaffSchedule,UpdateContinusSchedule,SaveNurseSort,SaveIsSchedule } from '@/api/doctorSchedule'
+import { getDoctorList,getScheduleList,addSchedule,getStaffScheduleList,getNextWeekList,getScheduleByDoctorId,toSearchScheduleList,DeleteStaffSchedule,copyStaffSchedule,UpdateContinusSchedule,SaveNurseSort,SaveIsSchedule,DeleteStaffScheduleById } from '@/api/doctorSchedule'
 import { constants } from 'crypto'
 export default {
     components:{
@@ -499,7 +501,7 @@ export default {
                     this.getStaffScheduleList()
 
                     var doctorlist =  response.data.data.doctorlist
-                  
+
                     for(let i=0;i<doctorlist.length;i++){
                         if(doctorlist[i].sort == 0){
                           doctorlist[i].sort = ""
@@ -747,7 +749,7 @@ export default {
                         })
                         sevenStr = zeroStr
                     }
-                    
+
                     if(staffList[i].schedule_week == 1){
                         staffList[i].class_index = 1
                         var arr = []
@@ -859,7 +861,7 @@ export default {
                         fourStr = strFour
                     }
 
-                    
+
                     if(staffList[i].schedule_week == 5){
                         staffList[i].class_index = 5
 
@@ -917,10 +919,12 @@ export default {
                         sixStr = strSix
                      }
                     }
+
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) == -1) {
                             newArr.push({
+                                id:staffList[i].id,
                                 user_name: staffList[i].user_name,
                                 admin_user_id:staffList[i].admin_user_id,
                                 user_type:staffList[i].doctor_type,
@@ -938,7 +942,7 @@ export default {
                             }
                         }
                     }
-                    
+
                     let arrTen = [...newArr]
                     console.log("newArr22o2o2o2o2wo",arrTen)
                     let newNurse = []
@@ -970,7 +974,7 @@ export default {
                         }
                     })
                     newNurse.sort(this.compare('sort'))
-                  
+
                     // //医生
                     newDoctor.sort(this.compare('admin_user_id'))
                     let newDoctorTableData = []
@@ -991,7 +995,7 @@ export default {
 
 
                     let arr2 = []
-                    
+
                     arr2.push({class_name:oneStr,schedule_week:1})
                     arr2.push({class_name:twoStr,schedule_week:2})
                     arr2.push({class_name:threeStr,schedule_week:3})
@@ -1007,12 +1011,12 @@ export default {
                     arr.push(obj)
 
                     let data = []
-                  
+
                     data.push(...newNurse)
                     data.push(...newDoctor)
                     data.push(obj)
                     console.log("data2o2oo2o2o2o22o",data)
-                    
+
                     // this.tableData = this.distinct(data)
                     this.tableData = data
 
@@ -2050,10 +2054,34 @@ export default {
         return jsonData.map(v => filterVal.map(j => v[j]))
        },
 
+       toClick(row,index){
+          this.$confirm(
+            '是否要清除当前排班? <br>清除后,信息将无法恢复',
+            '删除提示',
+            {
+                dangerouslyUseHTMLString: true,
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }
+            ).then(()=>{
+
+            DeleteStaffScheduleById(row.id).then(response=>{
+                if(response.data.state == 1){
+                    var msg =  response.data.data.msg
+                    this.$message.success("清除成功")
+                    this.getStaffScheduleList()
+
+                }
+            })
+         })
+       }
+
+
        hoverMouse(row,column, cell, event){
         this.name=row.user_name
         this.column_lie= column.label.split('\n')[0]
-        
+
        },
        leavemouse(row, column, cell, event){
         this.name=''