Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/workforce/Patientshift.vue

@@ -73,12 +73,14 @@
                 </td>
                 <td>
                   <div v-for="(it,index) in numberlist" style="display: inline-block;position: relative;" >
-                    <div v-if="hidder_chuang==true ? getkongchuang(it,item.list)>0 : ' '">
-                      <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais" :style="{'height':!hidder ? '110px': '30px','line-height':hidder ? '30px':''}" @dblclick="db_click($event,it)" @drop="drop($event,item,it.number)" @dragstart="curInfoDragStart($event,item)" draggable="true"   @dragover="allowDrop"> 
+                    <div v-if="hidder_chuang==true ? getkongchuang(it,item.list)>0 : ' '"><!--'background':getcolors(item)>0?'bisque':'#30b8e394'  'background':item2.mode_id==2||item2.mode_id==3?'bisque':'#30b8e394'-->
+                      <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais" 
+                      :style="{'height':!hidder ? '110px': '45px','overflow': 'auto'}" 
+                      @dblclick="db_click($event,it)" @drop="drop($event,item,it.number)" @dragstart="curInfoDragStart($event,item)" draggable="true"   @dragover="allowDrop"> 
                         <div class="huanzhekuai">
-                          <div v-for="(item2) in item.list"   draggable="true" >
-                            <template >
-                              <div v-if="it.id==item2.bed_id" style="display: inline-block;">
+                          <div v-for="(item2) in item.list" style="width: 100%;">
+                            <template>
+                              <div v-if="it.id==item2.bed_id" :style="{'display': 'inline-block','color':item2.mode_id==2 || item2.mode_id==3 ? 'red':'black'}">
                                 <div>
                                   <span>{{nameSplit(item2.name) }}({{ getmode(item2.mode_id) }})</span><br>
                                   <span v-if="!hidder" >
@@ -308,11 +310,13 @@
                 <td>
                   <div v-for="(it,index) in numberlist" style="display: inline-block;position: relative;" >
                     <div v-if="hidder_chuang==true ? getkongchuang(it,item.list)>0 : ' '">
-                      <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais" :style="{'height':!hidder ? '110px': '30px','line-height':hidder ? '30px':''}" @dblclick="db_click($event,it)" @drop="drop($event,item,it.number)" @dragstart="curInfoDragStart($event,item)" draggable="true"   @dragover="allowDrop"> 
+                      <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais" 
+                      :style="{'height':!hidder ? '110px': '45px','overflow': 'auto'}" 
+                      @dblclick="db_click($event,it)" @drop="drop($event,item,it.number)" @dragstart="curInfoDragStart($event)" draggable="true"   @dragover="allowDrop"> 
                         <div class="huanzhekuai">
-                          <div v-for="(item2) in item.list"   draggable="true" >
+                          <div v-for="(item2) in item.list" :key="item2.bed_id"   draggable="true" >
                             <template >
-                              <div v-if="it.id==item2.bed_id" style="display: inline-block;">
+                              <div v-if="it.id==item2.bed_id" :style="{'display': 'inline-block','color':item2.mode_id==2 || item2.mode_id==3 ? 'red':'black'}">
                                 <div>
                                   <span>{{nameSplit(item2.name) }}({{ getmode(item2.mode_id) }})</span><br>
                                   <span v-if="!hidder" >
@@ -382,6 +386,8 @@ export default {
         quhao:'',
         chaung:'',
         patient_id:'',
+        schedule_remark:'',
+        blood_access_id:'',
       },
       currentData:{
         currentData_id:'',
@@ -470,11 +476,11 @@ export default {
    console.log('dsafas',this.date);
     this.getAllZones()
     this.getlist()
+    // this.getcolors()
   },
   mounted(){
     // console.log('8888',this.huanzhe.order.DeviceNumber.zone.name);
   },
-
   methods:{
     quan_ping(){
       if(this.quanping==false){
@@ -495,6 +501,7 @@ export default {
       }
       return arr
     },
+    
     drop(e,val,value){
       this.allowDrop(e)
       var bedid = ''
@@ -513,6 +520,7 @@ export default {
             patient_id:val.list[i].patient_id,
             bed_id:val.list[i].bed_id
           }
+          console.log('kkkk',this.currentData);
         }
       }
       for(let x=0;x<this.numberlist.length;x++){
@@ -529,7 +537,6 @@ export default {
       }
       
       if(e.target.innerText == ''){
-        console.log('3333',e.target.innerText);
         this.schedule={
           schedule_date:this.date,
           schedule_type:this.classes,
@@ -552,7 +559,7 @@ export default {
           currentData_quhao:this.cur_drag_info.quhao,
           currentData_chaung:this.cur_drag_info.chaung,
           patient_id:this.cur_drag_info.patient_id,
-          
+
         }
         console.log('8888',this.currentData);
         this.setScheduleTwo(this.cur_drag_info.id)
@@ -582,27 +589,130 @@ export default {
         id_one:this.cur_drag_info.id,
         id_two:this.currentData.currentData_id
       }
+      console.log('3333',this.list);
         CoverSch(params).then((response) => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           this.tipDialogVisibleTwo = false
         } else {
-          console.log('888888888888',response.data);
+          console.log('888888888888',response.data.data);
           this.$message.success("替换成功");
           this.tipDialogVisible = false
           this.tipDialogVisibleTwo = false
-          // const listl=this.list
+          const listl=this.list
+          // console.log('jjjj',this.list);
+          for(let i=0;i<listl.length;i++){
+            if(this.cur_drag_info.patient_id== listl[i].patient_id){
+              listl[i].bed_id = ''
+              this.list.splice(i,1)
+              // console.log('0000',i,this.list);
+            }
+            if(this.currentData.patient_id== listl[i].patient_id){
+              listl[i].bed_id = this.currentData.bed_id
+              listl[i].id = response.data.data.new_sch.id
+              listl[i].name = this.cur_drag_info.name
+              listl[i].new_name=this.cur_drag_info.name
+              listl[i].partition_id =this.cur_drag_info.partition_id
+              
+              listl[i].mode_id = this.cur_drag_info.mode_id
+              listl[i].patient_id = this.cur_drag_info.patient_id
+              listl[i].schedule_date=this.cur_drag_info.schedule_date
+              listl[i].schedule_type =this.cur_drag_info.schedule_type
+
+              listl[i].schedule_week = this.cur_drag_info.schedule_week
+              listl[i].order.DeviceNumber.number = this.cur_drag_info.chaung
+              listl[i].order.DeviceNumber.zone.name=this.cur_drag_info.quhao
+              listl[i].order.schedule_remark=this.cur_drag_info.schedule_remark
+              listl[i].order.blood_access_id=this.cur_drag_info.blood_access_id
+              // console.log('nnnn',listl[i],this.list);
+            }
+          }
+          return this.list
+          // this.getlist()
+          // for(let i=0;i<this.list.length;i++){
+          //   if(this.currentData.bed_id==this.list[i].bed_id){
+          //     this.list[i].patient_id=this.cur_drag_info.patient_id
+          //     this.list[i].id= response.data.new_sch.id
+          //     // console.log('3333',this.list);
+          //     // listl.splice(i,1)
+          //   }
+          // }
+          // console.log('6666',this.list);
+          // return this.list
+          // 
+          // for(let i=0;i<listl.length;i++){
+          //   if(this.currentData.bed_id==listl[i].bed_id){
+          //     listl[i].patient_id= this.cur_drag_info.patient_id
+          //     console.log('bbbb',this.currentData);
+          //   }
+          //   if(this.cur_drag_info.bed_id==listl[i].bed_id){
+          //    listl.splice(i,1)
+          //     console.log('bbbb',listl);
+          //   }
+          // }
+
           // for(let i=0;i<listl.length;i++){
           //   if(this.cur_drag_info.name== listl[i].name){
-          //     listl[i].bed_id = this.cur_drag_info.bed_id
+          //     listl[i].bed_id = ''
               
           //   }
           //   if(this.currentData.currentData_name== listl[i].name){
-          //     listl[i].bed_id = this.cur_drag_info.bed_id
-          //     console.log('nnnn',this.ent_index,this.cur_drag_info.bed_id);
+          //     listl[i].bed_id = this.currentData.bed_id
+          //     listl[i].id = response.data.data.new_sch.id
+          //     console.log('nnnn',listl[i],this.cur_drag_info.bed_id);
+          //   }
+          // }
+
+          // for(let i=0;i<listl.length;i++){
+          //   if(this.currentData.bed_id== listl[i].bed_id){
+          //     // listl.splice(i,1)
+          //     listl[i].id=response.data.data.new_sch.id
+          //     // listl[i].bed_id = this.currentData.bed_id
+          //     listl[i].name = this.cur_drag_info.name
+          //     listl[i].new_name=this.cur_drag_info.name
+          //     listl[i].partition_id =this.cur_drag_info.partition_id
+              
+          //     listl[i].mode_id = this.cur_drag_info.mode_id
+          //     listl[i].patient_id = this.cur_drag_info.patient_id
+          //     listl[i].schedule_date=this.cur_drag_info.schedule_date
+          //     listl[i].schedule_type =this.cur_drag_info.schedule_type
+
+          //     listl[i].schedule_week = this.cur_drag_info.schedule_week
+          //     listl[i].order.DeviceNumber.number = this.cur_drag_info.chaung
+          //     listl[i].order.DeviceNumber.zone.name=this.cur_drag_info.quhao
+          //     listl[i].order.schedule_remark=this.cur_drag_info.schedule_remark
+          //     listl[i].order.blood_access_id=this.cur_drag_info.blood_access_id
+          //     // listl.splice(i,1)
+          //     console.log('vvvv',listl[i]);
+          //     // return listl
+          //   }
+          //   console.log('cur_drag_info.bed_id',this.cur_drag_info.bed_id);
+          //   if(this.cur_drag_info.bed_id== listl[i].bed_id){
+          //     this.list.splice(i,1)
+          //     // listl[i].name=''
+          //     // listl[i].bed_id=''
+          //     // listl[i].new_name=''
+          //     // listl[i].mode_id=''
+          //     // listl[i].patient_id=''
+          //     // listl[i].order.DeviceNumber.number = ''
+          //     // listl[i].order.DeviceNumber.zone.name= ''
+          //     // listl[i].order.schedule_remark=''
+          //     // listl[i].order.blood_access_id=''
+          //     listl.splice(i,1)
+          //     console.log('this.list',listl[i],this.list);
+          //     // return listl
           //   }
+          //   // if(this.cur_drag_info.patient_id== listl[i].patient_id){
+          //   //   // listl[i].bed_id = this.currentData.bed_id
+          //   //   this.lsit=listl.splice(i,1)
+          //   //   console.log('nnnn',listl,this.currentData.bed_id);
+          //   //   return this.list
+          //   // }
+           
           // }
-          this.getlist();
+          // console.log('pppp',this.list);
+          // return this.list
+          // this.getlist();
         }
       });
     },
@@ -610,25 +720,6 @@ export default {
     changeSchTwo(){
       // this.tipDialogVisible=false
       this.tipDialogVisible=false
-      // this.tipDialogVisibleThree = false
-      // const listl=this.list
-      // for(let i=0;i<listl.length;i++){
-      //   if(this.cur_drag_info.name== listl[i].name){
-      //     // drag_index=i
-      //     // this.drag_index=listl[i].bed_id
-      //     this.currentData.bed_id =listl[i].bed_id
-      //     console.log('mmmm',this.drag_index,this.currentData);
-          
-      //   }
-      //   if(this.currentData.currentData_name== listl[i].name){
-      //     // this.ent_index=listl[i].bed_id
-      //     this.cur_drag_info.bed_id=listl[i].bed_id
-      //     console.log('nnnn',this.ent_index,this.cur_drag_info.bed_id);
-      //   }
-      // }
-      // // listl.splice(drag_index, 1, ...listl.splice(ent_index, 1, listl[drag_index]))
-      // console.log('zzzzz',this.cur_drag_info);
-      // console.log('xxxxx', this.currentData);
       let params={
         id_one:this.cur_drag_info.id,
         id_two:this.currentData.currentData_id
@@ -644,18 +735,17 @@ export default {
           this.tipDialogVisible = false
           this.tipDialogVisibleThree = false
           
-          // const listl=this.list
-          // for(let i=0;i<listl.length;i++){
-          //   if(this.cur_drag_info.name== listl[i].name){
-          //     listl[i].bed_id = this.currentData.bed_id 
-          //     console.log('mmmm',listl,this.currentData);
-          //   }
-          //   if(this.currentData.currentData_name== listl[i].name){
-          //     // this.ent_index=listl[i].bed_id
-          //     listl[i].bed_id =this.cur_drag_info.bed_id
-          //   }
-          // }
-           this.getlist();
+          const listl=this.list
+          for(let i=0;i<listl.length;i++){
+            if(this.cur_drag_info.patient_id== listl[i].patient_id){
+              listl[i].bed_id = this.currentData.bed_id 
+              console.log('mmmm',listl,this.currentData);
+            }
+            if(this.currentData.patient_id== listl[i].patient_id){
+              listl[i].bed_id =this.cur_drag_info.bed_id
+            }
+          }
+          // this.getlist();
         }
       });
       
@@ -674,36 +764,38 @@ export default {
       if (response.data.state == 0) {
         this.$message.error(response.data.msg);
       } else {
-        // var schedule = response.data.data.schedule;
-        // console.log('ddddd',schedule);
-        // this.list
-        // const listl=this.list
-        // for(let i=0;i<listl.length;i++){
-        //   if(this.schedule.patient== listl[i].name){
-        //     listl[i].bed_id = this.schedule.bed_id 
-        //     console.log('mmmm',listl);
-        //   }
-        // }
-         this.getlist()
+        var schedule = response.data.data.schedule;
+        console.log('ddddd',schedule);
+        const listl=this.list
+        for(let i=0;i<listl.length;i++){
+          if(schedule.patient_id== listl[i].patient_id){
+            listl[i].bed_id = schedule.bed_id 
+            listl[i].id = schedule.id
+            console.log('mmmm',listl[i].id);
+            // console.log('kkkk',this.currentData);
+          }
+        }
       }
     },
     // 需要拖动的
-    curInfoDragStart(e,val){
+    curInfoDragStart(e){
       const inntext2= e.target.innerText.split('(')[0]
-      for(let i=0;i<val.list.length;i++){
-        if(inntext2 == val.list[i].new_name){
+      for(let i=0;i<this.list.length;i++){
+        if(inntext2 == this.list[i].new_name){
           this.cur_drag_info={
-            id:val.list[i].id,
-            name:val.list[i].name,
-            quhao:val.list[i].order.DeviceNumber.zone.name,
-            chaung:val.list[i].order.DeviceNumber.number,
-            patient_id:val.list[i].patient_id,
-            bed_id:val.list[i].bed_id,
-            mode_id:val.list[i].mode_id,
-            partition_id:val.list[i].partition_id,
+            id:this.list[i].id,
+            name:this.list[i].name,
+            quhao:this.list[i].order.DeviceNumber.zone.name,
+            chaung:this.list[i].order.DeviceNumber.number,
+            patient_id:this.list[i].patient_id,
+            bed_id:this.list[i].bed_id,
+            mode_id:this.list[i].mode_id,
+            partition_id:this.list[i].partition_id,
             schedule_date:this.date,
             schedule_type:this.classes,
-            schedule_week: val.list[i].schedule_week,
+            schedule_week: this.list[i].schedule_week,
+            schedule_remark:this.list[i].order.schedule_remark,
+            blood_access_id:this.list[i].order.blood_access_id,
           }
         }
       }
@@ -764,7 +856,7 @@ export default {
       }
       this.loading = true
       this.tableData = []
-      console.log('111111111',params);
+      // console.log('111111111',params);
       getSchedualPrintList(params).then((response) => {
         if (response.data.state == 1) {
           this.loading = false
@@ -781,7 +873,7 @@ export default {
            list[i][new_name]=this.nameSplit(list[i].name)
            
           }
-          console.log('9999',list);
+          // console.log('9999',list);
           if (list != null && list.length > 0) {
             const dataInfo = {}
             list.forEach((item, index) => {
@@ -814,7 +906,7 @@ export default {
             // console.log('排班数据------------------', arr)
 
             this.tableData = arr
-            console.log('22222222',this.tableData);
+            // console.log('22222222',this.tableData);
           }
 
           this.numberList = response.data.data.numberList
@@ -857,9 +949,9 @@ export default {
     //   return str
     // },
     // 透析模式
-    getmode(id){
+    getmode(ids){
       for(let i=0;i<this.mode.length;i++){
-        if(id=this.mode[i].id){
+        if(ids==this.mode[i].id){
           return this.mode[i].name
         }
       }
@@ -1122,18 +1214,18 @@ export default {
                 this.$message.success("交换成功");
                 this.tipDialogVisible = false
                 this.tipDialogVisibleThree = false
-                this.getlist();
-                // const listl=this.list
-                // for(let i=0;i<listl.length;i++){
-                //   if(this.huanzhe.name== listl[i].name){
-                //     listl[i].bed_id = this.chuangwei 
-                //     console.log('mmmm',listl,this.currentData);
-                //   }
-                //   if(this.genghuan.name== listl[i].name){
-                //     // this.ent_index=listl[i].bed_id
-                //     listl[i].bed_id =this.huanzhe.bed_id
-                //   }
-                // }
+                // this.getlist();
+                const listl=this.list
+                for(let i=0;i<listl.length;i++){
+                  if(this.huanzhe.name== listl[i].name){
+                    listl[i].bed_id = this.chuangwei 
+                    console.log('mmmm',listl,this.currentData);
+                  }
+                  if(this.genghuan.name== listl[i].name){
+                    // this.ent_index=listl[i].bed_id
+                    listl[i].bed_id =this.huanzhe.bed_id
+                  }
+                }
               }
             });
             return this.genghuan
@@ -1173,6 +1265,12 @@ export default {
       // }
     }
   },
+  // watch:{
+  //   list(val){
+  //     console.log('wwwww',val);
+  //     return this.list=val
+  //   }
+  // }
 }
 </script>