新分支

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

@@ -51,9 +51,7 @@
                         <el-table-column :label="'周一\n(' + weekDayArr[0] + ')'" style="width:200px" align="center">
                             <template slot-scope="scope">
                                 <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=""   
-                                  ></el-button>
+                                  <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">
@@ -381,7 +379,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:{
@@ -896,10 +894,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,
@@ -2029,6 +2029,29 @@ 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()
+                   
+                }
+            })
+         })
+       }
+
 
     },
     created(){