11

src/api/schedule.js

@@ -296,7 +296,13 @@ export function  postScheduleConfig(params) {
 }
 
 
-
+export function CreateScheduleTwo(id, schedule,id_two) {
+  return request({
+    url: '/api/schedule/create_two?patient_id=' + id+"&id_two="+id_two,
+    method: 'Post',
+    data: schedule
+  })
+}
 
 
 

src/xt_pages/workforce/components/editTableData.vue

@@ -28,7 +28,7 @@
               icon="el-icon-search"
               @click="search"
           >搜索</el-button>
-          
+
         </div>
         <div style="margin-bottom: 10px; display: flex">
           <h3 style="line-height: 45px">
@@ -69,7 +69,7 @@
             <el-table-column
                 prop="name"
                 label="患者名称"
-                
+
                 align="center"
             >
             </el-table-column>
@@ -92,7 +92,7 @@
             <el-table-column
                 prop="name"
                 label="透析模式"
-                
+
                 align="center"
             ></el-table-column>
           </el-table>
@@ -129,7 +129,7 @@
           </el-option>
         </el-select>
         <!-- 编辑排班表格 -->
-        <el-table 
+        <el-table
             :row-style="{ color: '#303133' }"
             :header-cell-style="{
             backgroundColor: 'rgb(245, 247, 250)',
@@ -197,7 +197,7 @@
                     @dragover="allowDrop"
                     @dragover.prevent
                 >
-                
+
                   <schedule-item
                       :schedule-detail="scope.row.Mon_M"
                       :draggable="isEditForDate('Mon_M')&& scope.row.Mon_M ? 'true' : 'false'"
@@ -213,7 +213,7 @@
                         scope.row.Mon_M,
                         scope.row
                       )"
-                      
+
                   >
                   </schedule-item>
                 </div>
@@ -312,7 +312,7 @@
           </el-table-column>
           <el-table-column
               :label="'周二 (' + weekTitle[1] + ')'"
-              
+
               v-if="isShowTwo"
               align="center"
           >
@@ -452,7 +452,7 @@
           </el-table-column>
           <el-table-column
               :label="'周三 (' + weekTitle[2] + ')'"
-              
+
               v-if="isShowThree"
               align="center"
           >
@@ -741,11 +741,11 @@
           </el-table-column>
           <el-table-column
               :label="'周五 (' + weekTitle[4] + ')'"
-             
+
               align="center"
               v-if="isShowFive"
           >
-            <el-table-column prop="Fri_M" label="上" min-width="40" align="center" 
+            <el-table-column prop="Fri_M" label="上" min-width="40" align="center"
 >
               <template slot-scope="scope">
                 <div class="del_table_btn">
@@ -767,7 +767,7 @@
                     scope.row)"
                 @dragover="allowDrop"
                   >
-                 
+
                   <schedule-item
                       :schedule-detail="scope.row.Fri_M"
                       :draggable="isEditForDate('Fri_M')&&scope.row.Fri_M ? 'true' : 'false'"
@@ -781,7 +781,7 @@
                         scope.row.Fri_M,
                         scope.row
                       )
-                    " 
+                    "
                   >
                    <!-- -->
                   </schedule-item>
@@ -800,7 +800,7 @@
                       v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
-        
+
                 <div  @drop="
                   drop($event,
                     'Fri_A',
@@ -877,7 +877,7 @@
           </el-table-column>
           <el-table-column
               :label="'周六 (' + weekTitle[5] + ')'"
-              
+
               align="center"
               v-if="isShowSix"
           >
@@ -950,7 +950,7 @@
                       scope.row
                     )
                   "
-                    @dragover="allowDrop" 
+                    @dragover="allowDrop"
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Sat_A"
@@ -996,7 +996,7 @@
                       scope.row
                     )
                   "
-                    @dragover="allowDrop"  
+                    @dragover="allowDrop"
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Sat_N"
@@ -1011,7 +1011,7 @@
                         scope.row.Sat_N,
                         scope.row
                       )
-                    " 
+                    "
                   >
                   <!--  -->
                     </schedule-item>
@@ -1021,7 +1021,7 @@
           </el-table-column>
           <el-table-column
               :label="'周日 (' + weekTitle[6] + ')'"
-              
+
               align="center"
               v-if="isShowSeven"
           >
@@ -1057,7 +1057,7 @@
                   <schedule-item
                     :draggable="isEditForDate('Sun_M')&&scope.row.Sun_M ? 'true' : 'false'"
                     :schedule-detail="scope.row.Sun_M"
-                    
+
                       class="contitem"
                       :style="{ cursor: scope.row.Sun_M ? 'move' : 'default' }"
                       @mouseover.native="
@@ -1151,7 +1151,7 @@
                   "
                     @dragover="allowDrop"
                 >
-                  
+
                   <schedule-item
                       :schedule-detail="scope.row.Sun_N"
                       :draggable="isEditForDate('Sun_N')&&scope.row.Sun_N ? 'true' : 'false'"
@@ -1184,7 +1184,7 @@
         :v-model="dialog"
         v-loading="creating_schedule"
         :modal-append-to-body='false'
-        
+
     >
     <!-- :close-on-click-modal="false" -->
       <div>
@@ -1211,7 +1211,7 @@
                   v-model="searchKey"
                   placeholder="请输入搜索的内容"
                   style="width: 260px"
-                 
+
               ></el-input>
               <!--  @keyup.enter.native="SubmitSearch" -->
               <el-button
@@ -1729,6 +1729,7 @@ import {
   CancelSchedule,
   ChangeSchedule,
   CreateSchedule,
+  CreateScheduleTwo,
   getSchedulePatients,
   getSchedulesOne,
   getUrgentScheduleInitData,
@@ -1994,7 +1995,7 @@ export default {
         ],
         bed_id: [{ required: true, message: "请选择透析机", trigger: "blur" }],
       },
-     
+
       weekday: 0,//星期几
 
       creating_schedule: false,
@@ -3174,10 +3175,13 @@ export default {
               mode_name : row[key].mode_name,
               patient_name : row[key].patient,
               patient_id : row[key].patient_id,
-              id : row[key].schedule_id
+              id : row[key].schedule_id,
+              contagions: row[key].patient_contagions,
             }
+            console.log( this.cur_drag_info)
+
           }else{
-            this.cur_drag_obj = 2
+            this.cur_drag_obj = 3
             this.cur_drag_info={
               schedule_date : '',
               schedule_type : '',
@@ -3190,13 +3194,12 @@ export default {
               mode_id : '',
               mode_name : '',
               patient_name : '',
-              patient_id : '',
-              id : '',
+              patient_id : 0,
+              id : 0,
             }
           }
         }
       }
-      console.log('this.cur_drag_info的数据',this.cur_drag_info);
     },
 
     // 拖拽
@@ -3274,7 +3277,7 @@ export default {
           this.getSchedules();
         }
       });
-      
+
     },
     // 交换位置
     changeSchTwo(){
@@ -3284,7 +3287,7 @@ export default {
           id_one:this.cur_drag_info.id,
           id_two:this.currentData.id
         }
-      
+
         ExchangeSch(params).then((response) => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
@@ -3297,12 +3300,15 @@ export default {
           }
         });
     },
-    
+
     // !在html里面的chedule-item里绑定的| "：draggable"可控制该表格能否拖动，根据实际情况进行修改async
     drop(e, day,index,name, row) {
       this.allowDrop(e)
       for (var key in row) {
         if (key == day) {
+          if(this.cur_drag_obj == 3){
+            return
+          }
           // console.log(this.cur_drag_obj)
           var week = this.weekDay(day);
           this.currentData={
@@ -3317,7 +3323,6 @@ export default {
             id : row[key].schedule_id,
             partition_type : row.zone_type,
           }
-          console.log('this.currentData的数据',this.currentData);
           // console.log('cur_drag_info的数据',this.cur_drag_info);
           // console.log('row[key]的数据',row[key]);
           // row[key].patient.length > 0 || row[key].mode_name.length > 0 ||
@@ -3342,45 +3347,48 @@ export default {
              if(this.cur_drag_obj == 2){
               if(this.cur_drag_info.schedule_date == this.currentData.schedule_date){ //同一天
                 if(row[key].patient_id == 0) { //空床位
-                  CancelScheduleTwo(this.cur_drag_info.id).then((response) => {
-                    // var response= await CancelScheduleTwo(this.cur_drag_info.id)
-                    if (response.data.state == 0) {
-                      this.$message.error(response.data.msg)
-                    } else {
+                  // CancelScheduleTwo(this.cur_drag_info.id).then((response) => {
+                  //   // var response= await CancelScheduleTwo(this.cur_drag_info.id)
+                  //   if (response.data.state == 0) {
+                  //     this.$message.error(response.data.msg)
+                  //   } else {
                       const that = this;
-                      const schedule = response.data.data.schedule;
-                      this.scheduleZone.forEach(function (zone, index) {
-                        if (
-                          zone.zone_id == schedule.partition_id &&
-                          zone.jihao_id == schedule.bed_id
-                        ) {
-                          const weekPath = that.weekPath(
-                            schedule.schedule_week,
-                            schedule.schedule_type
-                          );
-                          if (weekPath.length == 2) {
-                            const weekPathKey = weekPath[0] + "_" + weekPath[1];
-                            that.scheduleZone[index][weekPathKey] = {
-                              schedule_id: 0,
-                              mode_id: 0,
-                              patient_id: 0,
-                              patient: "",
-                              mode_name: "",
-                              dialysis_machine_name: "",
-                            };
-                            that.scheduleZone[index].total -= 1;
-                          }
-                        }
-                      });
-                      //接口提交排班数据
-                      that.currentData.mode_id = that.cur_drag_info.mode_id,
-                      that.currentData.id = 0,
-                      that.currentData.contagions = [],
-                      that.currentData.patient_id = that.cur_drag_info.patient_id,
-                      that.currentData.patient = that.cur_drag_info.patient_name,
-                      that.setSchedule();
-                    }
-                  });
+                  //     const schedule = response.data.data.schedule;
+                  //     this.scheduleZone.forEach(function (zone, index) {
+                  //       if (
+                  //         zone.zone_id == schedule.partition_id &&
+                  //         zone.jihao_id == schedule.bed_id
+                  //       ) {
+                  //         const weekPath = that.weekPath(
+                  //           schedule.schedule_week,
+                  //           schedule.schedule_type
+                  //         );
+                  //         if (weekPath.length == 2) {
+                  //           const weekPathKey = weekPath[0] + "_" + weekPath[1];
+                  //           that.scheduleZone[index][weekPathKey] = {
+                  //             schedule_id: 0,
+                  //             mode_id: 0,
+                  //             patient_id: 0,
+                  //             patient: "",
+                  //             mode_name: "",
+                  //             dialysis_machine_name: "",
+                  //           };
+                  //           that.scheduleZone[index].total -= 1;
+                  //         }
+                  //       }
+                  //     });
+                  //     //接口提交排班数据
+                      that.currentData.mode_id = that.cur_drag_info.mode_id
+                      that.currentData.id = 0
+                      that.currentData.patient_id = that.cur_drag_info.patient_id
+                      that.currentData.patient = that.cur_drag_info.patient_name
+                       that.currentData.contagions = that.cur_drag_info.contagions
+                  console.log( that.cur_drag_info.contagions)
+
+                  console.log( that.currentData.contagions)
+                  that.setScheduleTwo(this.cur_drag_info.id);
+                  //   }
+                  // });
                 }
                 // else{  //非空，替換或者交換位置
                 //     // this.tipDialogVisible = true
@@ -3406,7 +3414,7 @@ export default {
               this.currentData.patient_id = this.cur_drag_info.patient_id;
               this.currentData.patient = this.cur_drag_info.patient_name;
               this.setSchedule();
-            }    
+            }
           }
         }
       }
@@ -3811,7 +3819,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.table.doLayout();
       });
-      
+
       if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 3877 || this.$store.getters.xt_user.template_info.org_id == 10340){
 
         //表格某列全部数据
@@ -3872,8 +3880,8 @@ export default {
         var Sun_A_One = []
         var Sun_N_One= []
 
-       
-      
+
+
       for(let j in data){
         if(data[j].hasOwnProperty ('Mon_A') == true){
           Mon_A.push(data[j].Mon_A.mode_name)
@@ -3892,7 +3900,7 @@ export default {
         Mon_A_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Mon_A_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Mon_A_One.length; i < len; i+=29) {
           var strObjcet = Mon_A_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -3918,14 +3926,14 @@ export default {
         Mon_M_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Mon_M_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Mon_M_One.length; i < len; i+=29) {
           var strObjcet = Mon_M_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
           result.push(str);
       }
       sums[2]="总人数:"+ sums[2] +"\n"+result
-      
+
       for(let j in data){
         if(data[j].hasOwnProperty ('Mon_N') == true){
           Mon_N.push(data[j].Mon_N.mode_name)
@@ -3944,7 +3952,7 @@ export default {
         Mon_N_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Mon_N_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Mon_N_One.length; i < len; i+=29) {
           var strObjcet = Mon_N_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -3970,7 +3978,7 @@ export default {
         Tue_M_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Tue_M_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Tue_M_One.length; i < len; i+=29) {
           var strObjcet = Tue_M_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -3996,14 +4004,14 @@ export default {
         Tue_A_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Tue_A_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Tue_A_One.length; i < len; i+=29) {
           var strObjcet = Tue_A_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
           result.push(str);
       }
       sums[6]="总人数:"+ sums[6] +"\n"+result
-      
+
       for(let j in data){
         if(data[j].hasOwnProperty ('Tue_N') == true){
           Tue_N.push(data[j].Tue_N.mode_name)
@@ -4022,7 +4030,7 @@ export default {
         Tue_N_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Tue_N_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Tue_N_One.length; i < len; i+=29) {
           var strObjcet = Tue_N_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -4048,7 +4056,7 @@ export default {
         Wed_M_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Wed_M_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Wed_M_One.length; i < len; i+=29) {
           var strObjcet = Wed_M_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -4074,14 +4082,14 @@ export default {
         Wed_A_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Wed_A_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Wed_A_One.length; i < len; i+=29) {
           var strObjcet = Wed_A_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
           result.push(str);
       }
       sums[9]="总人数:"+ sums[9]  +"\n"+result
-      
+
       for(let j in data){
         if(data[j].hasOwnProperty ('Wed_N') == true){
           Wed_N.push(data[j].Wed_N.mode_name)
@@ -4097,11 +4105,11 @@ export default {
         }
       }
       for(let x in countNum){
-        
+
         Wed_N_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Wed_N_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Wed_N_One.length; i < len; i+=29) {
           var strObjcet = Wed_N_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -4127,7 +4135,7 @@ export default {
         Thurs_M_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Thurs_M_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Thurs_M_One.length; i < len; i+=29) {
           var strObjcet = Thurs_M_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -4153,14 +4161,14 @@ export default {
         Thurs_A_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Thurs_A_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Thurs_A_One.length; i < len; i+=29) {
           var strObjcet = Thurs_A_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
           result.push(str);
       }
       sums[12]="总人数:"+ sums[12] +"\n"+result
-      
+
       for(let j in data){
         if(data[j].hasOwnProperty ('Thurs_N') == true){
           Thurs_N.push(data[j].Thurs_N.mode_name)
@@ -4176,11 +4184,11 @@ export default {
         }
       }
       for(let x in countNum){
-        
+
         Thurs_N_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Thurs_N_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Thurs_N_One.length; i < len; i+=29) {
           var strObjcet = Thurs_N_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -4206,7 +4214,7 @@ export default {
         Fri_M_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Fri_M_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Fri_M_One.length; i < len; i+=29) {
           var strObjcet = Fri_M_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -4229,18 +4237,18 @@ export default {
         }
       }
       for(let x in countNum){
-        
+
         Fri_A_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Fri_A_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Fri_A_One.length; i < len; i+=29) {
           var strObjcet = Fri_A_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
           result.push(str);
       }
       sums[15]="总人数:"+ sums[15] +"\n"+result
-      
+
       for(let j in data){
         if(data[j].hasOwnProperty ('Fri_N') == true){
           Fri_N.push(data[j].Fri_N.mode_name)
@@ -4256,11 +4264,11 @@ export default {
         }
       }
       for(let x in countNum){
-       
+
         Fri_N_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Fri_N_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Fri_N_One.length; i < len; i+=29) {
           var strObjcet = Fri_N_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -4286,7 +4294,7 @@ export default {
         Sat_M_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Sat_M_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Sat_M_One.length; i < len; i+=29) {
           var strObjcet = Sat_M_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -4309,18 +4317,18 @@ export default {
         }
       }
       for(let x in countNum){
-       
+
         Sat_A_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Sat_A_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Sat_A_One.length; i < len; i+=29) {
           var strObjcet = Sat_A_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
           result.push(str);
       }
       sums[18]="总人数:"+ sums[18] +"\n"+result
-      
+
       for(let j in data){
         if(data[j].hasOwnProperty ('Sat_N') == true){
           Sat_N.push(data[j].Sat_N.mode_name)
@@ -4339,7 +4347,7 @@ export default {
         Sat_N_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Sat_N_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Sat_N_One.length; i < len; i+=29) {
           var strObjcet = Sat_N_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -4365,7 +4373,7 @@ export default {
         Sun_M_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Sun_M_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Sun_M_One.length; i < len; i+=29) {
           var strObjcet = Sun_M_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -4388,18 +4396,18 @@ export default {
         }
       }
       for(let x in countNum){
-       
+
         Sun_A_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Sun_A_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Sun_A_One.length; i < len; i+=29) {
           var strObjcet = Sun_A_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
           result.push(str);
       }
       sums[21]="总人数:"+ sums[21] +"\n"+result
-      
+
       for(let j in data){
         if(data[j].hasOwnProperty ('Sun_N') == true){
           Sun_N.push(data[j].Sun_N.mode_name)
@@ -4415,11 +4423,11 @@ export default {
         }
       }
       for(let x in countNum){
-        
+
         Sun_N_One.push(x + ':' + countNum[x]+"\n")
       }
       var result = [];
-      for (var i = 0,len = Sun_N_One.length; i < len; i+=29) { 
+      for (var i = 0,len = Sun_N_One.length; i < len; i+=29) {
           var strObjcet = Sun_N_One.slice(i, i+29);
           var str = strObjcet.toString();
           str = str.replace(/,/g, " "); //将所有的逗号 替换成空格
@@ -4785,11 +4793,11 @@ export default {
     //       });
     // },
     // 排班成功接口
-   
+
     async CreateSchedule(id, data) {
       this.creating_schedule = true;
       let response =await CreateSchedule(id, data)
-     
+
       if (response.data.state == 0) {
         this.$message.error(response.data.msg);
       } else {
@@ -4829,10 +4837,54 @@ export default {
       }
       this.creating_schedule = false;
     },
+    async CreateScheduleTwo(id, data,id_two) {
+      this.creating_schedule = true;
+      let response =await CreateScheduleTwo(id, data,id_two)
+
+      if (response.data.state == 0) {
+        this.$message.error(response.data.msg);
+      } else {
+        var that = this;
+        var schedule = response.data.data.schedule;
+        this.creating_schedule=false;
+        this.dialogTableVisible=false
+        this.getSchedules()
+        // this.scheduleZone.forEach(function (zone, index) {
+        //   if (
+        //     zone.zone_id == schedule.partition_id &&
+        //     zone.jihao_id == schedule.bed_id
+        //   ) {
+        //     var weekPath = that.weekPath(
+        //       schedule.schedule_week,
+        //       schedule.schedule_type
+        //     );
+        //     if (weekPath.length == 2) {
+        //       var weekPathKey = weekPath[0] + "_" + weekPath[1];
+        //       that.scheduleZone[index][weekPathKey] = {
+        //         schedule_id: schedule.id,
+        //         mode_id: schedule.mode_id,
+        //         patient_id: schedule.patient_id,
+        //         patient: schedule.patient,
+        //         dialysis_machine_name: schedule.dialysis_machine_name,
+        //
+        //         patient_contagions: that.currentData.contagions,
+        //         mode_name:
+        //           typeof that.modeOptions[schedule.mode_id] === "undefined"
+        //             ? ""
+        //             : that.modeOptions[schedule.mode_id].name,
+        //       };
+        //       that.scheduleZone[index].total += 1;
+        //     }
+        //   }
+        // });
+        // this.closePatientPanel();
+      }
+      this.creating_schedule = false;
+    },
 
     // 单击选中患者
     clickThis(row, column, cell, event) {
-      
+
         console.log('this.currentData的数据',this.currentData);
 
         if (row[column.property].schedule_id > 0) {
@@ -4891,7 +4943,7 @@ export default {
         this.currentData.patient = row[column.property].patient;
         this.currentData.contagions = row[column.property].patient_contagions;
         this.tiaoZhengType = 1;
-       
+
       }
     },
 
@@ -4932,7 +4984,7 @@ export default {
     //     }
     //   })
     // },
-    
+
     //  双击弹窗确认按钮
     submitMode(formName) {
       this.changing_mode = true;
@@ -4978,7 +5030,7 @@ export default {
             this.$message.error(err);
             this.changing_mode = false;
           });
-      
+
     },
 
     // submitTiaoZMS(formName) {
@@ -5224,7 +5276,80 @@ export default {
         default:
           break;
       }
+    },    setScheduleTwo(id_two) {
+      console.log("1112222222")
+      var that = this;
+      // var submitFlag = true;
+      // if (this.currentData.patient_id <= 0) {
+      //   this.$message.error("请先选择患者");
+      //   return false;
+      // }
+      // if (
+      //     this.currentData.schedule_date.length == 0 ||
+      //     this.currentData.schedule_type < 1 ||
+      //     this.currentData.schedule_type > 3 ||
+      //     this.currentData.bed_id < 1 ||
+      //     this.currentData.partition_id < 1 ||
+      //     this.currentData.schedule_week < 1 ||
+      //     this.currentData.schedule_week > 7
+      // ) {
+      //   this.$message.error("请先选择排班时间或机号");
+      //   return false;
+      // }
+      // 可能
+      // 患者有传染病，与选择的机器类型（传染病）不匹配
+      // 患者没有传染病，但机器是某个传染病的专用透析器
+      // 机器的透析模式与患者不匹配
+      if (this.currentData.contagions.length > 0) {
+        var cflag = false;
+        this.currentData.contagions.forEach(function (contagion) {
+          if (contagion.disease_id == that.currentData.partition_type) {
+            cflag = true;
+          }
+        });
+        if (!cflag) {
+          this.$confirm(
+            "此患者有传染病，与此透析机不匹配，确定在此排班吗?",
+            "提示",
+            {
+              confirmButtonText: "确 定",
+              cancelButtonText: "取 消",
+              type: "warning",
+            }
+          )
+            .then(() => {
+              this.CreateScheduleTwo(
+                this.currentData.patient_id,
+                this.currentData,
+                id_two
+              );
+              this.dialogTableVisible=false
+            })
+            .catch(() => {
+              this.dialogTableVisible=false
+            });
+        } else {
+          this.CreateScheduleTwo(this.currentData.patient_id, this.currentData,id_two);
+        }
+      } else if (that.currentData.partition_type > 1) {
+        this.$confirm(
+          "此患者没有传染病，与此透析机不匹配，确定在此排班吗?",
+          "提示",
+          {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }
+        )
+          .then(() => {
+            this.CreateScheduleTwo(this.currentData.patient_id, this.currentData,id_two);
+          })
+          .catch(() => {});
+      } else {
+        this.CreateScheduleTwo(this.currentData.patient_id, this.currentData,id_two);
+      }
     },
+
     // 排班成功调用的方法
     setSchedule() {
       var that = this;
@@ -5550,7 +5675,7 @@ export default {
       } else {
         return "table-row-new-class schedule-table-row infectious";
       };
-      // 
+      //
     },
     // 分区接口
     getAllZones() {
@@ -5708,7 +5833,7 @@ export default {
 .schedule-table-row td .cell {
   font-size: 12px;
   white-space: normal !important;
-  
+
 }
 
 // 动态样式