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

src/api/schedule.js

@@ -309,7 +309,7 @@ export function ChangeScheduleTen(id,schedule){
   
   console.log('schedule', schedule)
   return request({
-    url: '/api/schedule/changeschedule?id=' + id,
+    url: '/api/schedule/changeschedule?id=' + id+"&bed_id="+schedule.bed_id+"&mode_id="+schedule.mode_id+"&schedule_type="+schedule.schedule_type,
     method: 'Put',
     data: schedule
   })

src/xt_pages/dialysis/details/dialog/treatmentSummaryDialog.vue

@@ -588,8 +588,7 @@ export default {
        if(this.org_id ==10090){
           var str = " 患者今日来我科行血液透析治疗,血管通路选择:"+this.predialysis_evaluation.blood_access_part_id+ " "+this.QueryOperaById(this.predialysis_evaluation.blood_access_part_opera_id) +",透析模式:"+this.getModeId(this.prescription.mode_id)+
         ",透前检查:"+this.predialysis_evaluation.internal_fistula +this.predialysis_evaluation.catheter + str_one +" "+ ",透析器:"+this.prescription.dialyzer_perfusion_apparatus + ",抗凝剂:"+this.GetAnticoagulant(this.prescription.anticoagulant) +",总量:"+this.prescription.anticoagulant_zongliang+"iu"+
-        ",透前体重:"+this.predialysis_evaluation.weight_before+"kg"+",间期体重增长:"+total +"kg"+",目标脱水量:"+this.prescription.target_ultrafiltration +"ml" +",血流量:"+this.prescription.blood_flow_volume+"ml/min" + ",透析开始时间:"+this.getTime(this.dialysis_order.start_time) +",透析过程中血压波动,"+"最大收缩压:"+monitor_one[0].systolic_blood_pressure+"mmHg"+",最小收缩压:"+monitor_one[monitor_one.length-1].systolic_blood_pressure
-        +"mmHg" +",最小舒张压:" +monitor_two[0].diastolic_blood_pressure+"mmHg" + ",最大舒张压:" + monitor_two[monitor_two.length-1].diastolic_blood_pressure +"mmHg" + ",最大脉搏:"+monitor_three[0].pulse_frequency+"次/分"+",最小脉搏:"+monitor_three[monitor_three.length-1].pulse_frequency+"次/分"+",透析结束时间:"+this.getTime(this.dialysis_order.end_time) +
+        ",透前体重:"+this.predialysis_evaluation.weight_before+"kg"+",间期体重增长:"+total +"kg"+",目标脱水量:"+this.prescription.target_ultrafiltration +"ml" +",血流量:"+this.prescription.blood_flow_volume+"ml/min" + ",透析开始时间:"+this.getTime(this.dialysis_order.start_time) +","+"透析结束时间:"+this.getTime(this.dialysis_order.end_time) +
         ",实际治疗时长:"+ this.assessment_after_dislysis.actual_treatment_hour +"时"+this.assessment_after_dislysis.actual_treatment_minute+"分" +",实际超滤量:"+this.assessment_after_dislysis.actual_ultrafiltration+"ml"+",透后体重:"+this.assessment_after_dislysis.weight_after+"kg"+",透析过程顺利，安全下机" + " "
         +",今日使用药品:"+doc_str +",患者下机后测血压,"+"收缩压:"+this.assessment_after_dislysis.systolic_blood_pressure+"mmHg"+",舒张压:"+this.assessment_after_dislysis.diastolic_blood_pressure+"mmHg"+",脉搏:"+this.assessment_after_dislysis.pulse_frequency +"次/分"
 

src/xt_pages/workforce/components/editTableData.vue

@@ -1380,6 +1380,7 @@
           <el-form-item label="" prop="mode_id">
             <span>透析模式:</span>
             <el-select
+               filterable 
                 v-model="changeSchedule.mode_id"
                 placeholder="请选择"
                 style="width: 100%"
@@ -1398,6 +1399,7 @@
           <!-- <el-form-item>
             <span>透析班次:</span>
             <el-select
+                filterable 
                 v-model="changeSchedule.schedule_type"
                 placeholder="请选择"
                 style="width: 100%"
@@ -1411,11 +1413,12 @@
               >
               </el-option>
             </el-select>
-          </el-form-item>
-         -->
+          </el-form-item> -->
+        
           <!-- <el-form-item>
             <span>透析分区:</span>
             <el-select
+            filterable 
               v-model="changeSchedule.partition_id"
               placeholder="请选择"
               style="width: 100%"
@@ -1434,12 +1437,13 @@
           <!-- <el-form-item>
             <span>透析床位:</span>
             <el-select
-                v-model="device_id"
+               filterable 
+                v-model="changeSchedule.bed_id"
                 placeholder="请选择"
                 style="width: 100%"
             >
               <el-option
-                  v-for="item in current_devices"
+                  v-for="item in numberList"
                   :key="item.id"
                   :label="item.number"
                   :value="item.id"
@@ -2092,6 +2096,7 @@ export default {
       },
       cellflag: 0,
       schedulesGroup:[],
+      numberList:[]
     };
   },
 
@@ -5010,6 +5015,7 @@ export default {
         console.log("ROW22O2O2OWOOW",row)
         console.log("CHANGESHCUEL2O2O2O",this.changeSchedule)
         console.log("WOOWOWOWOWOW",this.zones)
+        console.log("numberowowow",this.numberList)
         this.changeSchedule.mode_id = row[column.property].mode_id
         var zone_names = ""
         for(let i=0;i<this.zones.length;i++){
@@ -5020,6 +5026,7 @@ export default {
         this.changeSchedule.partition_id = zone_names
         this.changeSchedule.schedule_type = week[1];
         this.changeSchedule.bed_id = row.jihao_id;
+        console.log("床位id",this.changeSchedule.bed_id)
         this.changeSchedule.schedule_week = week[0];
       }
 
@@ -5069,8 +5076,7 @@ export default {
       this.changing_mode = true;
       this.changeSchedule.change_action = "change_mode";
 
-      ChangeSchedule(this.currentData.id, this.changeSchedule)
-          .then((response) => {
+      ChangeSchedule(this.currentData.id, this.changeSchedule).then((response) => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
             } else {
@@ -5080,6 +5086,7 @@ export default {
               });
               var that = this;
               var schedule = response.data.data.schedule;
+              this.msDialogVisible = false
               this.scheduleZone.forEach(function (zone, index) {
                 if (
                     zone.zone_id == schedule.partition_id &&
@@ -5095,18 +5102,18 @@ export default {
                         schedule.dialysis_machine_name;
                     that.scheduleZone[index][weekPathKey].mode_id =
                         schedule.mode_id;
-                    that.scheduleZone[index][weekPathKey].mode_name =
-                        typeof that.modeOptions[schedule.mode_id] === "undefined"
+                    that.scheduleZone[index][weekPathKey].mode_name = typeof that.modeOptions[schedule.mode_id] === "undefined"
                             ? ""
                             : that.modeOptions[schedule.mode_id].name;
                   }
                 }
               });
               this.msDialogVisible = false;
+              this.getAllZones()
+             
             }
             this.changing_mode = false;
-          })
-          .catch((err) => {
+          }).catch((err) => {
             this.$message.error(err);
             this.changing_mode = false;
           });
@@ -5774,6 +5781,10 @@ export default {
           var strArr = this.zoneIdList.join(",");
 
           this.strArr = strArr;
+          var device_number =  response.data.data.devicenumber
+
+          this.numberList = device_number
+          console.log("所有床位",device_number)
           this.getWeekPanels();
         }
       });