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

src/api/schedule.js

@@ -297,6 +297,7 @@ export function  postScheduleConfig(params) {
 
 
 export function CreateScheduleTwo(id, schedule,id_two) {
+  console.log("schedule",schedule)
   return request({
     url: '/api/schedule/create_two?patient_id=' + id+"&id_two="+id_two,
     method: 'Post',

src/xt_pages/workforce/Patientshift.vue

@@ -56,16 +56,15 @@
               <tr v-for="(ite,index) in item.zones" :key="index">
                 <td style="text-align: center;">{{ getZoneName(ite.partition_id) }}</td>
                 <td>
-                  <div v-for="(it,index) in numberlist" style="display: inline-block;position: relative;" @dblclick="db_click($event,it)">
-                    <!-- <template> -->
-                    <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais"  style="" @drop="drop($event,item)" draggable="true"   @dragover="allowDrop"> 
+                  <div v-for="(it,index) in numberlist" style="display: inline-block;position: relative;" >
+                    <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais" :style="{'height':hidder ? '30px': '110px','line-height':hidder ? '30px':''}" @dblclick="db_click($event,it)" @drop="drop($event,item,it.number)" draggable="true"   @dragover="allowDrop"> 
                       <div class="huanzhekuai">
                         <div v-for="(item2) in item.list"  draggable="true" @dragstart.self="curInfoDragStart($event,item2)">
                           <template >
                             <div v-if="it.id==item2.bed_id" style="display: inline-block;">
                               <div>
-                                <span>{{ item2.name }}({{ getmode(item2.mode_id) }})</span><br>
-                                <div v-if="hidder" >
+                                <span>{{nameSplit(item2.name) }}({{ getmode(item2.mode_id) }})</span><br>
+                                <div v-if="!hidder" >
                                   <span style="font-size: 14px;color: rgb(19, 241, 175);margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
                                   <span style="font-size: 14px;color:orange;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
                                   <span style="font-size: 13px;color:rgb(102, 13, 161);margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
@@ -76,18 +75,6 @@
                         </div>
                       </div> 
                                         
-                      <!-- <div v-if="ite.partition_id==it.partition_id" style="max-height: 110px; margin-top: 10px;margin-bottom: 5px;background: rgb(74 197 235);" >
-                        <span>{{ it.name }}({{ getmode(it.mode_id) }})</span><br>
-                        <div v-if="value" >
-                          <span style="font-size: 14px;color: rgb(12, 185, 50);margin-bottom: 5px;">{{it.order.DeviceNumber.zone.name}}-{{it.order.DeviceNumber.number}}</span><br>
-                          <span style="font-size: 14px;color:orange;margin-bottom: 5px;">{{getBloodAccess(it.order.blood_access_id)}}</span><br>
-                          <span style="font-size: 13px;color:rgb(102, 13, 161);margin-bottom: 5px;">{{it.order.schedule_remark}}</span>
-                        </div> 
-                      </div> -->
-                      <!-- <div  
-                      style="display: inline-block;width: 125px;text-align: center;position: absolute;">
-                      {{ it.number }}
-                    </div> -->
                     </div>
                     <div v-if="ite.partition_id==it.zone_id" style="display: inline-block;width: 125px;text-align: center;">
                       {{ it.number }}
@@ -132,8 +119,8 @@
               <div style="width:350px">
                 <div style="display: flex;">
                   <div>
-                    <div style="margin: 10px 30px 10px 10px;background: rgb(74 197 235);height: 110px;width: 125px;text-align: center;">
-                      <span >{{ huanzhe.name }}({{getmode(huanzhe.mode_id)}})</span><br>
+                    <div style="margin: 10px 30px 10px 10px;background: rgb(74 211 235 / 51%);height: 110px;width: 125px;text-align: center;">
+                      <span >{{ huanzhe.name}}({{getmode(huanzhe.mode_id)}})</span><br>
                       <span style="font-size: 14px;color: rgb(12, 185, 50);margin-bottom: 5px;">
                         {{ huanzhe.zeng_fenqu }}-{{ huanzhe.zeng_chuang }}
                       </span><br>
@@ -279,6 +266,29 @@ export default {
         currentData_quhao:'',
         currentData_chaung:'',
         patient_id:'',
+        bed_id:'',
+        mode_id:'',
+        partition_id:'',
+        schedule_date:'',
+        schedule_type:'',
+        schedule_week: '',
+      },
+      // 交换空白时数据
+      schedule:{
+        schedule_date:'',
+        schedule_type:'',
+        bed_id:'',
+        partition_id:'',
+        schedule_week:'',
+        mode_id:'',
+        bed_name:'',
+        contagions:'',
+        id:0,
+        partition_type:'',
+        patient:'',
+        patient_id:'',
+        type_name:'',
+        zone_name:''
       },
       schedulArr: [
         { value: 1, label: "上午" },
@@ -610,6 +620,9 @@ export default {
         zeng_chuang:'',
         boolen_id:'',
         schedule_remark:'',
+        patient_id:'',
+        partition_id:'',
+        schedule_week: '',
       },
       xian_fenqu:'',
       g_xian_fenqu:'',
@@ -621,6 +634,7 @@ export default {
         genghuan_chuang:'',
         g_boolen_id:'',
         genghuan_remark:'',
+        patient_id:'',
       },
     }
   },
@@ -638,13 +652,16 @@ export default {
   },
   methods:{
    
-    drop(e,val){
+    drop(e,val,value){
       this.allowDrop(e)
-      
-      console.log('6666',val);
+      var bedid = ''
+      var bedname=''
+      var zonename=''
+      var zoneid=''
+      console.log('6666',val,value);
       console.log('7777',this.numberlist);
       const inntext= e.target.innerText.split('(')[0]
-      console.log('3333',inntext);
+     
       for(let i=0;i<val.list.length;i++){
         if(inntext == val.list[i].name){
           this.tipDialogVisible=true
@@ -657,13 +674,43 @@ export default {
           }
         }
       }
+      for(let x=0;x<this.numberlist.length;x++){
+        if(value==this.numberlist[x].number){
+          bedid = this.numberlist[x].id
+          bedname=this.numberlist[x].number
+          zoneid =this.numberlist[x].zone_id
+        }
+      }
+      for(let y=0;y<this.partitionArr.length;y++){
+        if(zoneid == this.partitionArr[y].id){
+          zonename = this.partitionArr[y].name
+        }
+      }
+      console.log('3333',bedid);
       if(e.target.innerText == ''){
+        this.schedule={
+          schedule_date:this.date,
+          schedule_type:this.classes,
+          bed_id:bedid,
+          partition_id:zoneid,
+          schedule_week:this.cur_drag_info.schedule_week,
+          mode_id:this.cur_drag_info.mode_id,
+          bed_name:bedname,
+          contagions:'',
+          id:0,
+          partition_type:'',
+          patient:this.cur_drag_info.name,
+          patient_id:this.cur_drag_info.patient_id,
+          type_name:'',
+          zone_name:zonename
+        }
         this.currentData={
           currentData_id:0,
           currentData_name:this.cur_drag_info.name,
           currentData_quhao:this.cur_drag_info.quhao,
           currentData_chaung:this.cur_drag_info.chaung,
-          patient_id:this.cur_drag_info.patient_id
+          patient_id:this.cur_drag_info.patient_id,
+          
         }
         console.log('8888',this.currentData.currentData_id);
         this.setScheduleTwo(this.cur_drag_info.id)
@@ -752,7 +799,11 @@ export default {
     },
     // 交换空白
     setScheduleTwo(id_two){
-      this.CreateScheduleTwo(this.currentData.patient_id, this.currentData,id_two);
+      this.CreateScheduleTwo(this.currentData.patient_id, this.schedule,id_two);
+    },
+    // 双击弹窗交换空白
+    setSchedulethree(id_two){
+      this.CreateScheduleTwo(this.huanzhe.patient_id, this.schedule,id_two);
     },
     async CreateScheduleTwo(id, data,id_two) {
       let response =await CreateScheduleTwo(id, data,id_two)
@@ -772,7 +823,12 @@ export default {
         quhao:val.order.DeviceNumber.zone.name,
         chaung:val.order.DeviceNumber.number,
         patient_id:val.patient_id,
-      
+        bed_id:val.bed_id,
+        mode_id:val.mode_id,
+        partition_id:val.partition_id,
+        schedule_date:this.date,
+        schedule_type:this.classes,
+        schedule_week: val.schedule_week,
       }
       console.log('4444',val);
       console.log('5555',this.cur_drag_info);
@@ -891,30 +947,30 @@ export default {
       }
     },
    
-    getPatientName(schedule_type, partition_id) {
-      var str = ''
-      var arr = []
-      if (this.list != null && this.list.length > 0) {
-        for (let i = 0; i < this.list.length; i++) {
-          if (this.list[i].schedule_type == schedule_type && this.list[i].partition_id == partition_id) {
-            arr.push(this.list[i])
-          }
-        }
-      }
-      if (arr.length > 0) {
-        for (let i = 0; i < arr.length; i++) {
-          arr[i].name = this.nameSplit(arr[i].name)
-          console.log('666666',arr[i].name);
-          if (this.hiddenFlag) {
-            str+= arr[i].name + '&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp '
-          } else {
-            str+=arr[i].name
-          }
-        }
-      }
-      // console.log(str, 'strstrstr')
-      return str
-    },
+    // getPatientName(schedule_type, partition_id) {
+    //   var str = ''
+    //   var arr = []
+    //   if (this.list != null && this.list.length > 0) {
+    //     for (let i = 0; i < this.list.length; i++) {
+    //       if (this.list[i].schedule_type == schedule_type && this.list[i].partition_id == partition_id) {
+    //         arr.push(this.list[i])
+    //       }
+    //     }
+    //   }
+    //   if (arr.length > 0) {
+    //     for (let i = 0; i < arr.length; i++) {
+    //       arr[i].name = this.nameSplit(arr[i].name)
+    //       console.log('666666',arr[i].name);
+    //       if (this.hiddenFlag) {
+    //         str+= arr[i].name + '&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp '
+    //       } else {
+    //         str+=arr[i].name
+    //       }
+    //     }
+    //   }
+    //   // console.log(str, 'strstrstr')
+    //   return str
+    // },
     // 透析模式
     getmode(id){
       for(let i=0;i<this.mode.length;i++){
@@ -968,9 +1024,11 @@ export default {
       if(e.target.innerText !=''){
         this.centerDialogVisible=true
         this.xian_fenqu=val
+        console.log('qqqqq',this.chuangwei,'val',val);
         for(let i=0;i<this.list.length;i++){
           // 双击弹窗的右侧第一个数据
           if(val.id==this.list[i].bed_id){
+            console.log('zzzzz',this.list[i]);
             this.huanzhe.id=this.list[i].id
             this.huanzhe.name=this.list[i].name
             this.huanzhe.mode_id=this.list[i].mode_id
@@ -978,10 +1036,15 @@ export default {
             this.huanzhe.zeng_chuang = this.list[i].order.DeviceNumber.number
             this.huanzhe.boolen_id = this.list[i].order.blood_access_id
             this.huanzhe.schedule_remark = this.list[i].order.schedule_remark
-            console.log('55555',this.huanzhe);
-          }
+            this.huanzhe.patient_id = this.list[i].patient_id
+            this.huanzhe.partition_id = this.list[i].partition_id
+            this.huanzhe.schedule_week= this.list[i].schedule_week
+            // return this.huanzhe
+          //   console.log('55555',this.huanzhe);
+          }     
           // 双击弹窗的右侧第二个默认数据
           if(this.chuangwei==this.list[i].bed_id){
+            console.log('xxxxx',this.chuangwei);
             this.genghuan.id = this.list[i].id
             this.genghuan.name=this.list[i].name
             this.genghuan.mode_id=this.list[i].mode_id
@@ -989,18 +1052,16 @@ export default {
             this.genghuan.genghuan_chuang = this.list[i].order.DeviceNumber.number
             this.genghuan.g_boolen_id = this.list[i].order.blood_access_id
             this.genghuan.genghuan_remark = this.list[i].order.schedule_remark
-            console.log('99999',this.genghuan);
-            console.log('000000',this.list[i].bed_id);
-            return this.genghuan
-          }else{
-            this.genghuan.id = null
-            this.genghuan.name=''
-            this.genghuan.mode_id=''
-            this.genghuan.genghuan_fenqu=''
-            this.genghuan.genghuan_chuang = ''
-            this.genghuan.g_boolen_id = ''
-            this.genghuan.genghuan_remark =''
+            this.genghuan.patient_id = this.list[i].patient_id
+            // console.log('99999',this.genghuan);
+            // console.log('000000',this.list[i].bed_id);
+            // return this.genghuan
           }
+        // // 第二的床位
+        // for(let y=0;y<this.numberlist.length;y++){
+        //   if(this.chuangwei==this.numberlist[y].id){
+        //     this.g_xian_fenqu=this.numberlist[y]
+        //   }
         }
         // 第二的床位
         for(let y=0;y<this.numberlist.length;y++){
@@ -1008,12 +1069,13 @@ export default {
             this.g_xian_fenqu=this.numberlist[y]
           }
         }
+        return this.genghuan
       }else{
         this.centerDialogVisible=false
       }
       
-      console.log('双击弹窗',this.zeng_fenqu);
-      console.log('双击弹窗33',e);
+      // console.log('双击弹窗',this.zeng_fenqu);
+      // console.log('双击弹窗33',e);
       // console.log('双击弹窗333',value);
     },
     // 双击弹窗分区
@@ -1023,19 +1085,6 @@ export default {
           this.fenqu_dialog=e
         }
       }
-      // if(this.fenqu_dialog==0){
-      //   this.chuangwei=519
-      // }else if(this.fenqu_dialog==375){
-      //   this.chuangwei=519
-      // }else if(this.fenqu_dialog==376){
-      //   this.chuangwei=520
-      // }else if(this.fenqu_dialog==384){
-      //   this.chuangwei=556
-      // }else if(this.fenqu_dialog==424){
-      //   this.chuangwei=672
-      // }else if(this.fenqu_dialog==425){
-      //   this.chuangwei=521
-      // }
       var params = {
         schedule_date: this.date,
         schedule_type: this.classes,
@@ -1056,8 +1105,8 @@ export default {
           for(let i=0;i<numberlist.length;i++){
             if(this.fenqu_dialog==0){
               this.subzone = numberlist
-              this.chuangwei = numberlist[0].id
-              this.g_xian_fenqu = numberlist[0]
+              this.chuangwei = numberlist[0].id//默认被交换的床位
+              this.g_xian_fenqu = numberlist[0]//被交换的分区床位对象
             }
             if(this.fenqu_dialog==numberlist[i].zone_id){
               const obj={id:null,number:'',zone_id:null}
@@ -1130,7 +1179,6 @@ export default {
       for (let i = 0; i < this.subzone.length; i++) {
         if(e==this.subzone[i].id){
           this.chuangwei=e
-          console.log('77777',this.chuangwei);
         }
       }
       for(let i=0;i<this.list.length;i++){
@@ -1142,6 +1190,13 @@ export default {
           this.genghuan.genghuan_chuang = this.list[i].order.DeviceNumber.number
           this.genghuan.g_boolen_id = this.list[i].order.blood_access_id
           this.genghuan.genghuan_remark = this.list[i].order.schedule_remark
+
+          for(let y=0;y<this.subzone.length;y++){
+            if(this.chuangwei==this.subzone[y].id){
+              this.g_xian_fenqu=this.subzone[y]
+              console.log('cccc',this.g_xian_fenqu);
+            }
+          }
           console.log('99999',this.genghuan);
           console.log('000000',this.list[i].bed_id);
           return this.genghuan
@@ -1163,29 +1218,101 @@ export default {
       for(let y=0;y<this.subzone.length;y++){
         if(this.chuangwei==this.subzone[y].id){
           this.g_xian_fenqu=this.subzone[y]
+          console.log('cccc',this.g_xian_fenqu);
         }
       }
     },
+    // 双击弹窗确定
     verify_dialog(){
       this.centerDialogVisible=false
-      console.log('444444444',this.huanzhe.id,this.genghuan.id);
-      let params={
-        id_one:this.huanzhe.id,
-        id_two:this.genghuan.id
+      console.log('mmmmm',this.genghuan.id);
+      if(this.genghuan.id != ''){
+        for(let i=0;i<this.list.length;i++){
+          if(this.chuangwei==this.list[i].bed_id){
+            console.log('hhhhh',this.chuangwei);
+            let params={
+              id_one:this.huanzhe.id,
+              id_two:this.genghuan.id
 
+            }
+            ExchangeSch(params).then((response) => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg);
+                this.tipDialogVisibleThree = false
+              } else {
+                console.log('22222222',response.data);
+                this.$message.success("交换成功");
+                this.tipDialogVisible = false
+                this.tipDialogVisibleThree = false
+                this.getlist();
+              }
+            });
+            return this.genghuan
+          }
+      //     // else{
+      //     //   var zonename=''
+      //     //   var bedname=''
+      //     //   var zoneid=''
+      //     //   console.log('6666',this.chuangwei);
+      //     //   for(let y=0;y<this.subzone.length;y++){
+      //     //     if(this.chuangwei == this.subzone[y].id){
+      //     //       bedname=this.subzone[y].number
+      //     //       zoneid=this.subzone[y].zone_id
+      //     //       console.log('aaaa',this.chuangwei,this.subzone[y].id,this.subzone[y].number);
+      //     //       this.schedule={
+      //     //         schedule_date:this.date,
+      //     //         schedule_type:this.classes,
+      //     //         bed_id:this.chuangwei,
+      //     //         partition_id:zoneid,
+      //     //         schedule_week:this.huanzhe.schedule_week,
+      //     //         mode_id:this.huanzhe.mode_id,
+      //     //         bed_name:bedname,
+      //     //         contagions:'',
+      //     //         id:0,
+      //     //         partition_type:'',
+      //     //         patient:this.huanzhe.name,
+      //     //         patient_id:this.huanzhe.patient_id,
+      //     //         type_name:'',
+      //     //         zone_name:zonename
+      //     //       }
+      //     //       this.setSchedulethree(this.huanzhe.id)
+      //     //       return ''
+      //     //     }
+      //     //   }
+      //     // }
+        }
       }
-      ExchangeSch(params).then((response) => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          this.tipDialogVisibleThree = false
-        } else {
-          console.log('22222222',response.data);
-          this.$message.success("交换成功");
-          this.tipDialogVisible = false
-          this.tipDialogVisibleThree = false
-          this.getlist();
+      // else if(this.genghuan.id == 'null'){
+        var zonename=''
+        var bedname=''
+        var zoneid=''
+        console.log('6666',this.chuangwei);
+        for(let y=0;y<this.subzone.length;y++){
+          if(this.chuangwei == this.subzone[y].id){
+            bedname=this.subzone[y].number
+            zoneid=this.subzone[y].zone_id
+            console.log('aaaa',this.chuangwei,this.subzone[y].id,this.subzone[y].number);
+            this.schedule={
+              schedule_date:this.date,
+              schedule_type:this.classes,
+              bed_id:this.chuangwei,
+              partition_id:zoneid,
+              schedule_week:this.huanzhe.schedule_week,
+              mode_id:this.huanzhe.mode_id,
+              bed_name:bedname,
+              contagions:'',
+              id:0,
+              partition_type:'',
+              patient:this.huanzhe.name,
+              patient_id:this.huanzhe.patient_id,
+              type_name:'',
+              zone_name:zonename
+            }
+            this.setSchedulethree(this.huanzhe.id)
+            return ''
+          }
         }
-      });
+      // }
     }
   }
 }
@@ -1244,7 +1371,7 @@ export default {
             text-align: center;
             margin:0 10px;
             // line-height: 110px;
-            background: #30b8e3;
+            background: #30b8e394;
            }
            
           }