yq1 пре 1 година
родитељ
комит
efca573e86

+ 6 - 3
src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue Прегледај датотеку

@@ -126,7 +126,7 @@
126 126
             <div class="under_line" style="width: 70px;text-align: left" v-else>
127 127
               {{ "/" }}
128 128
             </div>
129
-          </div>
129
+          </div>&nbsp;
130 130
           <div class="inline_block" style="flex: 1">
131 131
             本次透析日期:
132 132
             <div
@@ -135,7 +135,7 @@
135 135
             >
136 136
               {{ xtdate }}
137 137
             </div>
138
-          </div>
138
+          </div>&nbsp;
139 139
           <div class="inline_block" style="flex: 1">
140 140
             透析次数:
141 141
             <div
@@ -1235,7 +1235,10 @@
1235 1235
                       </div>
1236 1236
                       <span>h</span>
1237 1237
                     </div>
1238
-                    <div class="inline_block" style="margin-left: 20px">
1238
+                    
1239
+                  </div>
1240
+                  <div class="row" style="padding: 2px 0; line-height: 23px">
1241
+                    <div class="inline_block" style="">
1239 1242
                       透析机号:
1240 1243
                       <div
1241 1244
                         class="under_line"

+ 14 - 10
src/xt_pages/hospitalStation/components/deskPrescription.vue Прегледај датотеку

@@ -1567,8 +1567,8 @@ export default {
1567 1567
 
1568 1568
     }, searchProjectAction() {
1569 1569
       console.log('~~~~')
1570
-      console.log(this.allProject)
1571
-      console.log(this.allProject)
1570
+      
1571
+      // console.log(this.allProject)
1572 1572
 
1573 1573
 
1574 1574
       if (this.search_project_keyword.length == 0) {
@@ -1577,12 +1577,15 @@ export default {
1577 1577
       } else {
1578 1578
         let arr = []
1579 1579
         for (let i = 0; i < this.allProject.length; i++) {
1580
-          if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
1581
-            arr = arr.concat(this.allProject[i])
1580
+
1581
+          if( this.allProject[i].first_letter !=undefined){
1582
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
1583
+              this.allProject[i].first_letter.indexOf(this.search_project_keyword) != -1) {
1584
+              arr = arr.concat(this.allProject[i])
1585
+            }
1582 1586
           }
1583 1587
         }
1584 1588
         this.tabProject = arr
1585
-
1586 1589
       }
1587 1590
 
1588 1591
     }, searchProjectTeamAction() {
@@ -1606,7 +1609,10 @@ export default {
1606 1609
       } else {
1607 1610
         let arr = []
1608 1611
         for (let i = 0; i < this.drugs.length; i++) {
1609
-          if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 || this.drugs[i].wubi.indexOf(this.search_keyword) != -1 || this.drugs[i].pinyin.indexOf(this.search_keyword) != -1) {
1612
+          if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 || 
1613
+          this.drugs[i].wubi.indexOf(this.search_keyword) != -1 || 
1614
+          this.drugs[i].pinyin.indexOf(this.search_keyword) != -1 ||
1615
+          this.drugs[i].first_letter.indexOf(this.search_keyword) != -1) {
1610 1616
             arr = arr.concat(this.drugs[i])
1611 1617
           }
1612 1618
         }
@@ -3427,7 +3433,8 @@ export default {
3427 3433
               total: project[i].total,
3428 3434
               is_special_diseases: project[i].disease_directory,
3429 3435
               project: project[i],
3430
-              stock_count: 0
3436
+              stock_count: 0,
3437
+              first_letter:project[i].first_letter
3431 3438
             }
3432 3439
 
3433 3440
             this.tabProject.push(obj)
@@ -3465,9 +3472,6 @@ export default {
3465 3472
 
3466 3473
           this.allProject = this.tabProject
3467 3474
 
3468
-
3469
-
3470
-
3471 3475
         }
3472 3476
       })
3473 3477
 

+ 14 - 5
src/xt_pages/hospitalStation/doctorDesk.vue Прегледај датотеку

@@ -40,8 +40,8 @@
40 40
               </div>
41 41
 
42 42
               <div class="mainCell" style="margin-bottom:10px;">
43
-                  <el-input size="small" placeholder="请输入姓名或就诊号"
44
-                            v-model="search_input" class="filter-item"/>
43
+                  <el-input size="small" placeholder="请输入姓名或就诊号" @input="searchAction"
44
+                    @keyup.enter.native='searchAction' v-model="search_input" class="filter-item"/>
45 45
                   <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
46 46
                              @click="searchAction">
47 47
                       搜索
@@ -556,8 +556,11 @@ export default {
556 556
         switch (this.radio) {
557 557
           case 0:
558 558
             let arr4 = []
559
+            // console.log('3333',this.all_data);
559 560
             for (let i = 0; i < this.all_data.length; i++) {
560
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
561
+              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
562
+              this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
563
+              this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
561 564
                 arr4 = arr4.concat(this.all_data[i])
562 565
               }
563 566
             }
@@ -565,8 +568,11 @@ export default {
565 568
             break
566 569
           case 2:
567 570
             let arr2 = []
571
+            // console.log('4444',this.all_data);
568 572
             for (let i = 0; i < this.all_data.length; i++) {
569
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
573
+              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
574
+                  this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
575
+                  this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
570 576
                 arr2 = arr2.concat(this.all_data[i])
571 577
               }
572 578
             }
@@ -575,8 +581,11 @@ export default {
575 581
             break
576 582
           case 1:
577 583
             let arr3 = []
584
+            // console.log('5555',this.all_data);
578 585
             for (let i = 0; i < this.all_data.length; i++) {
579
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
586
+              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
587
+              this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 || 
588
+              this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
580 589
                 arr3 = arr3.concat(this.all_data[i])
581 590
               }
582 591
             }

+ 19 - 9
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Прегледај датотеку

@@ -1588,21 +1588,26 @@ export default {
1588 1588
       this.$refs.additionalCharges.hide()
1589 1589
 
1590 1590
     }, searchProjectAction() {
1591
-      console.log('~~~~')
1592
-      console.log(this.allProject)
1593
-
1591
+      console.log('~~~~',this.search_project_keyword)
1592
+      // console.log(this.allProject)
1594 1593
       if (this.search_project_keyword.length == 0) {
1595 1594
         this.tabProject = this.allProject
1596 1595
 
1597 1596
       } else {
1598 1597
         let arr = []
1599 1598
         for (let i = 0; i < this.allProject.length; i++) {
1600
-          if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
1601
-            arr = arr.concat(this.allProject[i])
1599
+          console.log('wwww',(this.allProject[i].first_letter))
1600
+          if(this.allProject[i].first_letter !=undefined){
1601
+            if (
1602
+            this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
1603
+            this.allProject[i].first_letter.indexOf(this.search_project_keyword) != -1
1604
+            ) {
1605
+              arr = arr.concat(this.allProject[i])
1606
+            }
1602 1607
           }
1603 1608
         }
1604 1609
         this.tabProject = arr
1605
-
1610
+        console.log('kkkk',this.tabProject);
1606 1611
       }
1607 1612
 
1608 1613
     }, searchProjectTeamAction() {
@@ -1626,7 +1631,11 @@ export default {
1626 1631
       } else {
1627 1632
         let arr = []
1628 1633
         for (let i = 0; i < this.drugs.length; i++) {
1629
-          if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 || this.drugs[i].wubi.indexOf(this.search_keyword) != -1 || this.drugs[i].pinyin.indexOf(this.search_keyword) != -1) {
1634
+          if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 ||
1635
+           this.drugs[i].wubi.indexOf(this.search_keyword) != -1 || 
1636
+           this.drugs[i].pinyin.indexOf(this.search_keyword) != -1 ||
1637
+           this.drugs[i].first_letter.indexOf(this.search_keyword) != -1
1638
+           ) {
1630 1639
             arr = arr.concat(this.drugs[i])
1631 1640
           }
1632 1641
         }
@@ -3531,8 +3540,9 @@ export default {
3531 3540
               is_special_diseases: project[i].disease_directory,
3532 3541
               project: project[i],
3533 3542
               stock_count:0,
3543
+              first_letter:project[i].first_letter
3534 3544
             }
3535
-
3545
+            // console.log('hhhhh',obj);
3536 3546
             this.tabProject.push(obj)
3537 3547
           }
3538 3548
 
@@ -3569,7 +3579,7 @@ export default {
3569 3579
           }
3570 3580
 
3571 3581
           this.allProject = this.tabProject
3572
-
3582
+          // console.log('cccc',this.allProject);
3573 3583
         }
3574 3584
       })
3575 3585
 

+ 47 - 19
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Прегледај датотеку

@@ -830,6 +830,7 @@ export default {
830 830
     },
831 831
 
832 832
     searchAction() {
833
+      
833 834
       if (this.search_input.length == 0) {
834 835
         switch (this.radio) {
835 836
           case 0:
@@ -843,12 +844,14 @@ export default {
843 844
             break
844 845
         }
845 846
       } else {
846
-
847
+        console.log('5555',this.radio);
847 848
         switch (this.radio) {
848 849
           case 0:
849 850
             let arr = []
850 851
             for (let i = 0; i < this.all_data.length; i++) {
851
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || this.all_data[i].number.indexOf(this.search_input) != -1) {
852
+              if (this.all_data[i].name.indexOf(this.search_input) != -1 ||
853
+               this.all_data[i].number.indexOf(this.search_input) != -1 ||
854
+               this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
852 855
                 arr = arr.concat(this.all_data[i])
853 856
                 console.log(arr)
854 857
               }
@@ -858,8 +861,12 @@ export default {
858 861
             break
859 862
           case 2:
860 863
             let arr2 = []
864
+           
861 865
             for (let i = 0; i < this.cure_data.length; i++) {
862
-              if (this.cure_data[i].name.indexOf(this.search_input) != -1 || this.cure_data[i].number.indexOf(this.search_input) != -1) {
866
+              if (this.cure_data[i].name.indexOf(this.search_input) != -1 || 
867
+              this.cure_data[i].number.indexOf(this.search_input) != -1 ||
868
+              this.cure_data[i].first_letter.indexOf(this.search_input) != -1) {
869
+                console.log('2222',this.cure_data);
863 870
                 arr2 = arr2.concat(this.cure_data[i])
864 871
               }
865 872
             }
@@ -868,10 +875,16 @@ export default {
868 875
             break
869 876
           case 1:
870 877
             let arr3 = []
878
+            console.log('3333',this.un_cure_data);
871 879
             for (let i = 0; i < this.un_cure_data.length; i++) {
872
-              if (this.un_cure_data[i].name.indexOf(this.search_input) != -1 || this.un_cure_data[i].number.indexOf(this.search_input) != -1) {
873
-                arr3 = arr3.concat(this.un_cure_data[i])
880
+              if(this.un_cure_data[i].first_letter!=undefined){
881
+                if (this.un_cure_data[i].name.indexOf(this.search_input) != -1 || 
882
+                this.un_cure_data[i].number.indexOf(this.search_input) != -1 ||
883
+                this.un_cure_data[i].first_letter.indexOf(this.search_input) != -1) {
884
+                  arr3 = arr3.concat(this.un_cure_data[i])
885
+                }
874 886
               }
887
+              
875 888
             }
876 889
             this.un_cure_data = arr3
877 890
             break
@@ -902,9 +915,11 @@ export default {
902 915
                   name: response.data.data.list[i].his_patient[b].name,
903 916
                   number: response.data.data.list[i].his_patient[b].number,
904 917
                   id: response.data.data.list[i].id,
905
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
918
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
919
+                  first_letter:response.data.data.list[i].first_letter
906 920
                 }
907 921
                 this.un_cure_data.push(obj)
922
+                console.log('vvvvv',this.un_cure_data);
908 923
               }
909 924
               //已就诊
910 925
               if (response.data.data.list[i].his_patient[b].prescription.length > 0) {
@@ -912,7 +927,8 @@ export default {
912 927
                   name: response.data.data.list[i].his_patient[b].name,
913 928
                   number: response.data.data.list[i].his_patient[b].number,
914 929
                   id: response.data.data.list[i].id,
915
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
930
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
931
+                  first_letter:response.data.data.list[i].first_letter
916 932
                 }
917 933
                 this.cure_data.push(obj)
918 934
               }
@@ -927,9 +943,11 @@ export default {
927 943
                 name: response.data.data.list_two[i].name,
928 944
                 number: response.data.data.list_two[i].his_patient.number,
929 945
                 id: response.data.data.list_two[i].id,
930
-                his_patient_id: response.data.data.list_two[i].his_patient.id
946
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
947
+                first_letter:response.data.data.list_two[i].first_letter
931 948
               }
932 949
               this.un_cure_data.push(obj)
950
+              // console.log('aaaaa',this.un_cure_data);
933 951
             }
934 952
 
935 953
             //已就诊
@@ -938,12 +956,13 @@ export default {
938 956
                 name: response.data.data.list_two[i].name,
939 957
                 number: response.data.data.list_two[i].his_patient.number,
940 958
                 id: response.data.data.list_two[i].id,
941
-                his_patient_id: response.data.data.list_two[i].his_patient.id
959
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
960
+                first_letter:response.data.data.list_two[i].first_letter
942 961
               }
943 962
               this.cure_data.push(obj)
944 963
             }
945 964
           }
946
-
965
+          // console.log('gggg',this.un_cure_data);
947 966
           this.all_data = this.all_data.concat(this.cure_data)
948 967
           this.all_data = this.all_data.concat(this.un_cure_data)
949 968
 
@@ -966,7 +985,6 @@ export default {
966 985
               this.getPatientInfo(this.un_cure_data[0])
967 986
 
968 987
             } else if (this.radio == 2) {
969
-
970 988
               this.$refs.tab.setCurrentRow(this.cure_data[0])
971 989
               this.oldCurrentRow = this.cure_data[0]
972 990
               this.getPatientInfo(this.cure_data[0])
@@ -1000,7 +1018,8 @@ export default {
1000 1018
                   name: response.data.data.list[i].his_patient[b].name,
1001 1019
                   number: response.data.data.list[i].his_patient[b].number,
1002 1020
                   id: response.data.data.list[i].id,
1003
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
1021
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
1022
+                  first_letter:response.data.data.list[i].first_letter
1004 1023
                 }
1005 1024
                 this.un_cure_data.push(obj)
1006 1025
               }
@@ -1010,7 +1029,8 @@ export default {
1010 1029
                   name: response.data.data.list[i].his_patient[b].name,
1011 1030
                   number: response.data.data.list[i].his_patient[b].number,
1012 1031
                   id: response.data.data.list[i].id,
1013
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
1032
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
1033
+                  first_letter:response.data.data.list[i].first_letter
1014 1034
                 }
1015 1035
                 this.cure_data.push(obj)
1016 1036
               }
@@ -1025,7 +1045,8 @@ export default {
1025 1045
                 name: response.data.data.list_two[i].name,
1026 1046
                 number: response.data.data.list_two[i].his_patient.number,
1027 1047
                 id: response.data.data.list_two[i].id,
1028
-                his_patient_id: response.data.data.list_two[i].his_patient.id
1048
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
1049
+                first_letter:response.data.data.list_two[i].first_letter
1029 1050
               }
1030 1051
               this.un_cure_data.push(obj)
1031 1052
             }
@@ -1036,7 +1057,8 @@ export default {
1036 1057
                 name: response.data.data.list_two[i].name,
1037 1058
                 number: response.data.data.list_two[i].his_patient.number,
1038 1059
                 id: response.data.data.list_two[i].id,
1039
-                his_patient_id: response.data.data.list_two[i].his_patient.id
1060
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
1061
+                first_letter:response.data.data.list_two[i].first_letter
1040 1062
               }
1041 1063
               this.cure_data.push(obj)
1042 1064
             }
@@ -1496,8 +1518,10 @@ export default {
1496 1518
                 name: response.data.data.list_two[i].name,
1497 1519
                 number: response.data.data.list_two[i].his_patient.number,
1498 1520
                 id: response.data.data.list_two[i].id,
1499
-                his_patient_id: response.data.data.list_two[i].his_patient.id
1521
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
1522
+                first_letter:response.data.data.list_two[i].first_letter
1500 1523
               }
1524
+              console.log('6666',obj);
1501 1525
               this.un_cure_data.push(obj)
1502 1526
             }
1503 1527
 
@@ -1507,7 +1531,8 @@ export default {
1507 1531
                 name: response.data.data.list_two[i].name,
1508 1532
                 number: response.data.data.list_two[i].his_patient.number,
1509 1533
                 id: response.data.data.list_two[i].id,
1510
-                his_patient_id: response.data.data.list_two[i].his_patient.id
1534
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
1535
+                first_letter:response.data.data.list_two[i].first_letter
1511 1536
               }
1512 1537
               this.cure_data.push(obj)
1513 1538
             }
@@ -1522,8 +1547,10 @@ export default {
1522 1547
                   name: response.data.data.list[i].his_patient[b].name,
1523 1548
                   number: response.data.data.list[i].his_patient[b].number,
1524 1549
                   id: response.data.data.list[i].id,
1525
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
1550
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
1551
+                  first_letter:response.data.data.list[i].first_letter
1526 1552
                 }
1553
+                console.log('8888',obj);
1527 1554
                 this.un_cure_data.push(obj)
1528 1555
               }
1529 1556
               //已就诊
@@ -1532,7 +1559,8 @@ export default {
1532 1559
                   name: response.data.data.list[i].his_patient[b].name,
1533 1560
                   number: response.data.data.list[i].his_patient[b].number,
1534 1561
                   id: response.data.data.list[i].id,
1535
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
1562
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
1563
+                  first_letter:response.data.data.list[i].first_letter
1536 1564
                 }
1537 1565
                 this.cure_data.push(obj)
1538 1566
               }

+ 187 - 451
src/xt_pages/workforce/Patientshift.vue Прегледај датотеку

@@ -46,9 +46,15 @@
46 46
               inactive-text="OFF">
47 47
             </el-switch>
48 48
           </div>
49
-          <!-- <div style="display: inline-block;position: relative;right: -30%;">
50
-            <el-button type="primary"  @click="quan_ping">全屏</el-button>
51
-          </div> -->
49
+          <div class="content_top">隐藏空床位:
50
+            <el-switch
51
+              v-model="hidder_chuang"
52
+              active-color="#13ce66"
53
+              inactive-color="#ff4949"
54
+              active-text="ON"
55
+              inactive-text="OFF">
56
+            </el-switch>
57
+          </div>
52 58
         </div>
53 59
         <div class="table_panel"  v-for="(item, index) in tableData" :key="index">
54 60
           <table class="table">
@@ -60,30 +66,36 @@
60 66
             </thead>
61 67
             <tbody>
62 68
               <tr v-for="(ite,index) in item.zones" :key="index">
63
-                <td style="text-align: center;">{{ getZoneName(ite.partition_id) }}</td>
69
+                <td style="text-align: center;">
70
+                  <span>{{ getZoneName(ite.partition_id) }}</span><br>
71
+                  <span>总人数:{{ getZonePatient(ite.partition_id,item.schedule_type) }}</span>
72
+                  <span v-if="getZonePatient(ite.partition_id,item.schedule_type)>0">人</span>
73
+                </td>
64 74
                 <td>
65 75
                   <div v-for="(it,index) in numberlist" style="display: inline-block;position: relative;" >
66
-                    <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"> 
67
-                      <div class="huanzhekuai">
68
-                        <div v-for="(item2) in item.list"   draggable="true" >
69
-                          <template >
70
-                            <div v-if="it.id==item2.bed_id" style="display: inline-block;">
71
-                              <div>
72
-                                <span>{{nameSplit(item2.name) }}({{ getmode(item2.mode_id) }})</span><br>
73
-                                <span v-if="!hidder" >
74
-                                  <span style="font-size: 14px;margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
75
-                                  <span style="font-size: 14px;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
76
-                                  <span style="font-size: 13px;;margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
77
-                                </span> 
76
+                    <div v-if="hidder_chuang==true ? getkongchuang(it,item.list)>0 : ' '">
77
+                      <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"> 
78
+                        <div class="huanzhekuai">
79
+                          <div v-for="(item2) in item.list"   draggable="true" >
80
+                            <template >
81
+                              <div v-if="it.id==item2.bed_id" style="display: inline-block;">
82
+                                <div>
83
+                                  <span>{{nameSplit(item2.name) }}({{ getmode(item2.mode_id) }})</span><br>
84
+                                  <span v-if="!hidder" >
85
+                                    <span style="font-size: 14px;margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
86
+                                    <span style="font-size: 14px;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
87
+                                    <span style="font-size: 13px;;margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
88
+                                  </span> 
89
+                                </div>
78 90
                               </div>
79
-                            </div>
80
-                          </template> 
81
-                        </div>
82
-                      </div> 
83
-                                        
84
-                    </div>
85
-                    <div v-if="ite.partition_id==it.zone_id" style="display: inline-block;width: 125px;text-align: center;">
86
-                      {{ it.number }}
91
+                            </template> 
92
+                          </div>
93
+                        </div> 
94
+                                          
95
+                      </div>
96
+                      <div v-if="ite.partition_id==it.zone_id" style="display: inline-block;width: 125px;text-align: center;">
97
+                        {{ it.number }}
98
+                      </div>
87 99
                     </div>
88 100
                   </div>
89 101
                 </td>
@@ -271,6 +283,15 @@
271 283
               inactive-text="OFF">
272 284
             </el-switch>
273 285
           </div>
286
+          <div class="content_top">隐藏空床位:
287
+            <el-switch
288
+              v-model="hidder_chuang"
289
+              active-color="#13ce66"
290
+              inactive-color="#ff4949"
291
+              active-text="ON"
292
+              inactive-text="OFF">
293
+            </el-switch>
294
+          </div>
274 295
          
275 296
         </div>
276 297
         <div class="table_panel"  v-for="(item, index) in tableData" :key="index">
@@ -286,27 +307,29 @@
286 307
                 <td style="text-align: center;">{{ getZoneName(ite.partition_id) }}</td>
287 308
                 <td>
288 309
                   <div v-for="(it,index) in numberlist" style="display: inline-block;position: relative;" >
289
-                    <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"> 
290
-                      <div class="huanzhekuai">
291
-                        <div v-for="(item2) in item.list"   draggable="true" >
292
-                          <template >
293
-                            <div v-if="it.id==item2.bed_id" style="display: inline-block;">
294
-                              <div>
295
-                                <span>{{nameSplit(item2.name) }}({{ getmode(item2.mode_id) }})</span><br>
296
-                                <span v-if="!hidder" >
297
-                                  <span style="font-size: 14px;margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
298
-                                  <span style="font-size: 14px;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
299
-                                  <span style="font-size: 13px;;margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
300
-                                </span> 
310
+                    <div v-if="hidder_chuang==true ? getkongchuang(it,item.list)>0 : ' '">
311
+                      <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"> 
312
+                        <div class="huanzhekuai">
313
+                          <div v-for="(item2) in item.list"   draggable="true" >
314
+                            <template >
315
+                              <div v-if="it.id==item2.bed_id" style="display: inline-block;">
316
+                                <div>
317
+                                  <span>{{nameSplit(item2.name) }}({{ getmode(item2.mode_id) }})</span><br>
318
+                                  <span v-if="!hidder" >
319
+                                    <span style="font-size: 14px;margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
320
+                                    <span style="font-size: 14px;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
321
+                                    <span style="font-size: 13px;;margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
322
+                                  </span> 
323
+                                </div>
301 324
                               </div>
302
-                            </div>
303
-                          </template> 
304
-                        </div>
305
-                      </div> 
306
-                                        
307
-                    </div>
308
-                    <div v-if="ite.partition_id==it.zone_id" style="display: inline-block;width: 125px;text-align: center;">
309
-                      {{ it.number }}
325
+                            </template> 
326
+                          </div>
327
+                        </div> 
328
+                                          
329
+                      </div>
330
+                      <div v-if="ite.partition_id==it.zone_id" style="display: inline-block;width: 125px;text-align: center;">
331
+                        {{ it.number }}
332
+                      </div>
310 333
                     </div>
311 334
                   </div>
312 335
                 </td>
@@ -342,6 +365,7 @@ export default {
342 365
       tipDialogVisibleTwo:false,
343 366
       tipDialogVisibleThree:false,
344 367
       hidder: false,
368
+      hidder_chuang:false,
345 369
       quanping:false,
346 370
       td_1_width: '8%',
347 371
       td_3_width: '90%',
@@ -395,310 +419,7 @@ export default {
395 419
         { value: 3, label: "晚上" }
396 420
       ],
397 421
       zones:[],
398
-      schedules: [
399
-        {
400
-          day: 1,
401
-          weekday: '星期一',
402
-          all: {
403
-            am: {
404
-              /* zone_name: [ schedule, ... ] */
405
-            },
406
-            pm: {
407
-              /* zone_name: [ schedule, ... ] */
408
-            },
409
-            evening: {
410
-              /* zone_name: [ schedule, ... ] */
411
-            }
412
-          },
413
-          hdf: [
414
-            /* schedule, ... */
415
-          ],
416
-          hd_hp: [
417
-            /* schedule, ... */
418
-          ],
419
-
420
-          new_hdf: {
421
-            am: {
422
-              /* zone_name: [ schedule, ... ] */
423
-            },
424
-            pm: {
425
-              /* zone_name: [ schedule, ... ] */
426
-            },
427
-            evening: {
428
-              /* zone_name: [ schedule, ... ] */
429
-            }
430
-          },
431
-          new_hd_hp: {
432
-            am: {
433
-              /* zone_name: [ schedule, ... ] */
434
-            },
435
-            pm: {
436
-              /* zone_name: [ schedule, ... ] */
437
-            },
438
-            evening: {
439
-              /* zone_name: [ schedule, ... ] */
440
-            }
441
-          }
442
-        },
443
-        {
444
-          day: 2,
445
-          weekday: '星期二',
446
-          all: {
447
-            am: {
448
-              /* zone_name: [ schedule, ... ] */
449
-            },
450
-            pm: {
451
-              /* zone_name: [ schedule, ... ] */
452
-            },
453
-            evening: {
454
-              /* zone_name: [ schedule, ... ] */
455
-            }
456
-          },
457
-          hdf: [
458
-            /* schedule, ... */
459
-          ],
460
-          hd_hp: [
461
-            /* schedule, ... */
462
-          ],
463
-          new_hdf: {
464
-            am: {
465
-              /* zone_name: [ schedule, ... ] */
466
-            },
467
-            pm: {
468
-              /* zone_name: [ schedule, ... ] */
469
-            },
470
-            evening: {
471
-              /* zone_name: [ schedule, ... ] */
472
-            }
473
-          },
474
-          new_hd_hp: {
475
-            am: {
476
-              /* zone_name: [ schedule, ... ] */
477
-            },
478
-            pm: {
479
-              /* zone_name: [ schedule, ... ] */
480
-            },
481
-            evening: {
482
-              /* zone_name: [ schedule, ... ] */
483
-            }
484
-          }
485
-        },
486
-        {
487
-          day: 3,
488
-          weekday: '星期三',
489
-          all: {
490
-            am: {
491
-              /* zone_name: [ schedule, ... ] */
492
-            },
493
-            pm: {
494
-              /* zone_name: [ schedule, ... ] */
495
-            },
496
-            evening: {
497
-              /* zone_name: [ schedule, ... ] */
498
-            }
499
-          },
500
-          hdf: [
501
-            /* schedule, ... */
502
-          ],
503
-          hd_hp: [
504
-            /* schedule, ... */
505
-          ],
506
-          new_hdf: {
507
-            am: {
508
-              /* zone_name: [ schedule, ... ] */
509
-            },
510
-            pm: {
511
-              /* zone_name: [ schedule, ... ] */
512
-            },
513
-            evening: {
514
-              /* zone_name: [ schedule, ... ] */
515
-            }
516
-          },
517
-          new_hd_hp: {
518
-            am: {
519
-              /* zone_name: [ schedule, ... ] */
520
-            },
521
-            pm: {
522
-              /* zone_name: [ schedule, ... ] */
523
-            },
524
-            evening: {
525
-              /* zone_name: [ schedule, ... ] */
526
-            }
527
-          }
528
-        },
529
-        {
530
-          day: 4,
531
-          weekday: '星期四',
532
-          all: {
533
-            am: {
534
-              /* zone_name: [ schedule, ... ] */
535
-            },
536
-            pm: {
537
-              /* zone_name: [ schedule, ... ] */
538
-            },
539
-            evening: {
540
-              /* zone_name: [ schedule, ... ] */
541
-            }
542
-          },
543
-          hdf: [
544
-            /* schedule, ... */
545
-          ],
546
-          hd_hp: [
547
-            /* schedule, ... */
548
-          ],
549
-          new_hdf: {
550
-            am: {
551
-              /* zone_name: [ schedule, ... ] */
552
-            },
553
-            pm: {
554
-              /* zone_name: [ schedule, ... ] */
555
-            },
556
-            evening: {
557
-              /* zone_name: [ schedule, ... ] */
558
-            }
559
-          },
560
-          new_hd_hp: {
561
-            am: {
562
-              /* zone_name: [ schedule, ... ] */
563
-            },
564
-            pm: {
565
-              /* zone_name: [ schedule, ... ] */
566
-            },
567
-            evening: {
568
-              /* zone_name: [ schedule, ... ] */
569
-            }
570
-          }
571
-        },
572
-        {
573
-          day: 5,
574
-          weekday: '星期五',
575
-          all: {
576
-            am: {
577
-              /* zone_name: [ schedule, ... ] */
578
-            },
579
-            pm: {
580
-              /* zone_name: [ schedule, ... ] */
581
-            },
582
-            evening: {
583
-              /* zone_name: [ schedule, ... ] */
584
-            }
585
-          },
586
-          hdf: [
587
-            /* schedule, ... */
588
-          ],
589
-          hd_hp: [
590
-            /* schedule, ... */
591
-          ],
592
-          new_hdf: {
593
-            am: {
594
-              /* zone_name: [ schedule, ... ] */
595
-            },
596
-            pm: {
597
-              /* zone_name: [ schedule, ... ] */
598
-            },
599
-            evening: {
600
-              /* zone_name: [ schedule, ... ] */
601
-            }
602
-          },
603
-          new_hd_hp: {
604
-            am: {
605
-              /* zone_name: [ schedule, ... ] */
606
-            },
607
-            pm: {
608
-              /* zone_name: [ schedule, ... ] */
609
-            },
610
-            evening: {
611
-              /* zone_name: [ schedule, ... ] */
612
-            }
613
-          }
614
-        },
615
-        {
616
-          day: 6,
617
-          weekday: '星期六',
618
-          all: {
619
-            am: {
620
-              /* zone_name: [ schedule, ... ] */
621
-            },
622
-            pm: {
623
-              /* zone_name: [ schedule, ... ] */
624
-            },
625
-            evening: {
626
-              /* zone_name: [ schedule, ... ] */
627
-            }
628
-          },
629
-          hdf: [
630
-            /* schedule, ... */
631
-          ],
632
-          hd_hp: [
633
-            /* schedule, ... */
634
-          ],
635
-          new_hdf: {
636
-            am: {
637
-              /* zone_name: [ schedule, ... ] */
638
-            },
639
-            pm: {
640
-              /* zone_name: [ schedule, ... ] */
641
-            },
642
-            evening: {
643
-              /* zone_name: [ schedule, ... ] */
644
-            }
645
-          },
646
-          new_hd_hp: {
647
-            am: {
648
-              /* zone_name: [ schedule, ... ] */
649
-            },
650
-            pm: {
651
-              /* zone_name: [ schedule, ... ] */
652
-            },
653
-            evening: {
654
-              /* zone_name: [ schedule, ... ] */
655
-            }
656
-          }
657
-        },
658
-        {
659
-          day: 7,
660
-          weekday: '星期日',
661
-          all: {
662
-            am: {
663
-              /* zone_name: [ schedule, ... ] */
664
-            },
665
-            pm: {
666
-              /* zone_name: [ schedule, ... ] */
667
-            },
668
-            evening: {
669
-              /* zone_name: [ schedule, ... ] */
670
-            }
671
-          },
672
-          hdf: [
673
-            /* schedule, ... */
674
-          ],
675
-          hd_hp: [
676
-            /* schedule, ... */
677
-          ],
678
-          new_hdf: {
679
-            am: {
680
-              /* zone_name: [ schedule, ... ] */
681
-            },
682
-            pm: {
683
-              /* zone_name: [ schedule, ... ] */
684
-            },
685
-            evening: {
686
-              /* zone_name: [ schedule, ... ] */
687
-            }
688
-          },
689
-          new_hd_hp: {
690
-            am: {
691
-              /* zone_name: [ schedule, ... ] */
692
-            },
693
-            pm: {
694
-              /* zone_name: [ schedule, ... ] */
695
-            },
696
-            evening: {
697
-              /* zone_name: [ schedule, ... ] */
698
-            }
699
-          }
700
-        }
701
-      ],
422
+     
702 423
       total: [],
703 424
       list: [],
704 425
       loading: false,
@@ -722,6 +443,7 @@ export default {
722 443
         patient_id:'',
723 444
         partition_id:'',
724 445
         schedule_week: '',
446
+        bed_id:'',
725 447
       },
726 448
       xian_fenqu:'',
727 449
       g_xian_fenqu:'',
@@ -734,7 +456,10 @@ export default {
734 456
         g_boolen_id:'',
735 457
         genghuan_remark:'',
736 458
         patient_id:'',
459
+        bed_id:''
737 460
       },
461
+      drag_index:'',
462
+      ent_index:'',
738 463
     }
739 464
   },
740 465
   components: {
@@ -749,6 +474,7 @@ export default {
749 474
   mounted(){
750 475
     // console.log('8888',this.huanzhe.order.DeviceNumber.zone.name);
751 476
   },
477
+
752 478
   methods:{
753 479
     quan_ping(){
754 480
       if(this.quanping==false){
@@ -759,26 +485,33 @@ export default {
759 485
         return this.quanping=false
760 486
       }
761 487
     },
488
+    // 隐藏空床位
489
+    getkongchuang(a,b){
490
+      const arr=[]
491
+      for(let i=0;i<b.length;i++){
492
+        if(a.id==b[i].bed_id){
493
+          arr.push(a.id)
494
+        }
495
+      }
496
+      return arr
497
+    },
762 498
     drop(e,val,value){
763 499
       this.allowDrop(e)
764 500
       var bedid = ''
765 501
       var bedname=''
766 502
       var zonename=''
767 503
       var zoneid=''
768
-      console.log('kkkkk',e.target.innerText);
769 504
       const inntext= e.target.innerText.split('(')[0]
770
-      console.log('vvvv',inntext,val.list[0].new_name);
771 505
       for(let i=0;i<val.list.length;i++){
772 506
         if(inntext == val.list[i].new_name){
773
-          console.log('6666',val,value);
774
-          console.log('7777',this.numberlist);
775 507
           this.tipDialogVisible=true
776 508
           this.currentData={
777 509
             currentData_id:val.list[i].id,
778 510
             currentData_name:val.list[i].name,
779 511
             currentData_quhao:val.list[i].order.DeviceNumber.zone.name,
780 512
             currentData_chaung:val.list[i].order.DeviceNumber.number,
781
-            patient_id:val.list[i].patient_id
513
+            patient_id:val.list[i].patient_id,
514
+            bed_id:val.list[i].bed_id
782 515
           }
783 516
         }
784 517
       }
@@ -821,7 +554,7 @@ export default {
821 554
           patient_id:this.cur_drag_info.patient_id,
822 555
           
823 556
         }
824
-        console.log('8888',this.currentData.currentData_id);
557
+        console.log('8888',this.currentData);
825 558
         this.setScheduleTwo(this.cur_drag_info.id)
826 559
         // var params={
827 560
         //   patient_id:this.currentData.patient_id,
@@ -838,29 +571,6 @@ export default {
838 571
         // })
839 572
         // this.CreateScheduleTwo(this.currentData.patient_id,this.currentData,this.currentData.currentData_id)
840 573
       }
841
-      
842
-      // for(let i=0;i<this.numberlist.length;i++){
843
-      //   for(let j=0;j<val.list.length;j++){
844
-      //     if(this.numberlist[i].id==val.list[y].bed_id){
845
-
846
-      //     }
847
-      //   }
848
-      // }
849
-      // this.currentData={
850
-      //   currentData_id:val.id,
851
-      //   currentData_name:val.name,
852
-      //   currentData_quhao:val.order.DeviceNumber.zone.name,
853
-      //   currentData_chaung:val.order.DeviceNumber.number,
854
-      // },
855
-     
856
-      // this.currentData={
857
-      //   currentData_id:this.cur_drag_info.id,
858
-      //   currentData_name:this.cur_drag_info.name,
859
-      //   currentData_quhao:this.cur_drag_info.quhao,
860
-      //   currentData_chaung:this.cur_drag_info.chaung,
861
-      // },
862
-
863
-      
864 574
     },
865 575
     allowDrop(e) {
866 576
       e.preventDefault();
@@ -881,13 +591,44 @@ export default {
881 591
           this.$message.success("替换成功");
882 592
           this.tipDialogVisible = false
883 593
           this.tipDialogVisibleTwo = false
884
-          this.getlist();
594
+          const listl=this.list
595
+          for(let i=0;i<listl.length;i++){
596
+            if(this.cur_drag_info.name== listl[i].name){
597
+              listl[i].bed_id = this.cur_drag_info.bed_id
598
+              
599
+            }
600
+            if(this.currentData.currentData_name== listl[i].name){
601
+              listl[i].bed_id = this.cur_drag_info.bed_id
602
+              console.log('nnnn',this.ent_index,this.cur_drag_info.bed_id);
603
+            }
604
+          }
605
+          // this.getlist();
885 606
         }
886 607
       });
887 608
     },
888 609
     // 交换
889 610
     changeSchTwo(){
611
+      // this.tipDialogVisible=false
890 612
       this.tipDialogVisible=false
613
+      // this.tipDialogVisibleThree = false
614
+      // const listl=this.list
615
+      // for(let i=0;i<listl.length;i++){
616
+      //   if(this.cur_drag_info.name== listl[i].name){
617
+      //     // drag_index=i
618
+      //     // this.drag_index=listl[i].bed_id
619
+      //     this.currentData.bed_id =listl[i].bed_id
620
+      //     console.log('mmmm',this.drag_index,this.currentData);
621
+          
622
+      //   }
623
+      //   if(this.currentData.currentData_name== listl[i].name){
624
+      //     // this.ent_index=listl[i].bed_id
625
+      //     this.cur_drag_info.bed_id=listl[i].bed_id
626
+      //     console.log('nnnn',this.ent_index,this.cur_drag_info.bed_id);
627
+      //   }
628
+      // }
629
+      // // listl.splice(drag_index, 1, ...listl.splice(ent_index, 1, listl[drag_index]))
630
+      // console.log('zzzzz',this.cur_drag_info);
631
+      // console.log('xxxxx', this.currentData);
891 632
       let params={
892 633
         id_one:this.cur_drag_info.id,
893 634
         id_two:this.currentData.currentData_id
@@ -902,9 +643,22 @@ export default {
902 643
           this.$message.success("交换成功");
903 644
           this.tipDialogVisible = false
904 645
           this.tipDialogVisibleThree = false
905
-          this.getlist();
646
+          
647
+          const listl=this.list
648
+          for(let i=0;i<listl.length;i++){
649
+            if(this.cur_drag_info.name== listl[i].name){
650
+              listl[i].bed_id = this.currentData.bed_id 
651
+              console.log('mmmm',listl,this.currentData);
652
+            }
653
+            if(this.currentData.currentData_name== listl[i].name){
654
+              // this.ent_index=listl[i].bed_id
655
+              listl[i].bed_id =this.cur_drag_info.bed_id
656
+            }
657
+          }
658
+          // this.getlist();
906 659
         }
907 660
       });
661
+      
908 662
     },
909 663
     // 交换空白
910 664
     setScheduleTwo(id_two){
@@ -920,8 +674,17 @@ export default {
920 674
       if (response.data.state == 0) {
921 675
         this.$message.error(response.data.msg);
922 676
       } else {
923
-        var schedule = response.data.data.schedule;
924
-        this.getlist()
677
+        // var schedule = response.data.data.schedule;
678
+        // console.log('ddddd',schedule);
679
+        // this.list
680
+        const listl=this.list
681
+        for(let i=0;i<listl.length;i++){
682
+          if(this.schedule.patient== listl[i].name){
683
+            listl[i].bed_id = this.schedule.bed_id 
684
+            console.log('mmmm',listl);
685
+          }
686
+        }
687
+        // this.getlist()
925 688
       }
926 689
     },
927 690
     // 需要拖动的
@@ -945,8 +708,8 @@ export default {
945 708
         }
946 709
       }
947 710
      
948
-      console.log('bbbb',e.target.innerText);
949
-      console.log('4444',val);
711
+      // console.log('bbbb',e.target.innerText);
712
+      // console.log('4444',val);
950 713
       console.log('5555',this.cur_drag_info);
951 714
     },
952 715
      // 选中日期
@@ -1141,6 +904,24 @@ export default {
1141 904
       }
1142 905
       return name
1143 906
     },
907
+    getZonePatient(partition_id,schedule_type){
908
+       
909
+       var arr = []
910
+       if(this.list!=null && this.list.length >0){
911
+         for(let i=0;i<this.list.length;i++){
912
+            if(partition_id == this.list[i].partition_id && schedule_type == this.list[i].schedule_type){
913
+                arr.push(this.list[i])
914
+            }
915
+         }
916
+       }
917
+ 
918
+       if(arr.length >0){
919
+          return arr.length
920
+       }else{
921
+         return ""
922
+       }
923
+ 
924
+    },
1144 925
     // 双击打开弹窗
1145 926
     db_click(e,val){
1146 927
       if(e.target.innerText !=''){
@@ -1161,8 +942,9 @@ export default {
1161 942
             this.huanzhe.patient_id = this.list[i].patient_id
1162 943
             this.huanzhe.partition_id = this.list[i].partition_id
1163 944
             this.huanzhe.schedule_week= this.list[i].schedule_week
945
+            this.huanzhe.bed_id = this.list[i].bed_id
1164 946
             // return this.huanzhe
1165
-          //   console.log('55555',this.huanzhe);
947
+            console.log('kkkk',this.huanzhe);
1166 948
           }     
1167 949
           // 双击弹窗的右侧第二个默认数据
1168 950
           if(this.chuangwei==this.list[i].bed_id){
@@ -1174,8 +956,9 @@ export default {
1174 956
             this.genghuan.genghuan_chuang = this.list[i].order.DeviceNumber.number
1175 957
             this.genghuan.g_boolen_id = this.list[i].order.blood_access_id
1176 958
             this.genghuan.genghuan_remark = this.list[i].order.schedule_remark
1177
-            this.genghuan.patient_id = this.list[i].patient_id
1178
-            // console.log('99999',this.genghuan);
959
+            this.genghuan.patient_id = this.list[i].patient_id,
960
+            this.genghuan.bed_id = this.list[i].bed_id
961
+            console.log('99999',this.genghuan);
1179 962
             // console.log('000000',this.list[i].bed_id);
1180 963
             // return this.genghuan
1181 964
           }
@@ -1196,9 +979,6 @@ export default {
1196 979
         this.centerDialogVisible=false
1197 980
       }
1198 981
       
1199
-      // console.log('双击弹窗',this.zeng_fenqu);
1200
-      // console.log('双击弹窗33',e);
1201
-      // console.log('双击弹窗333',value);
1202 982
     },
1203 983
     // 双击弹窗分区
1204 984
     dialogfenqu(e){
@@ -1250,6 +1030,7 @@ export default {
1250 1030
               this.genghuan.genghuan_chuang = this.list[i].order.DeviceNumber.number
1251 1031
               this.genghuan.g_boolen_id =this.list[i].order.blood_access_id
1252 1032
               this.genghuan.genghuan_remark = this.list[i].order.schedule_remark
1033
+              this.genghuan.patient_id = this.list[i].patient_id,
1253 1034
               console.log('99999',this.genghuan);
1254 1035
               console.log('000000',this.list[i].bed_id);
1255 1036
               return this.genghuan
@@ -1266,34 +1047,8 @@ export default {
1266 1047
             }
1267 1048
             
1268 1049
           }
1269
-          // this.numberlist= numberlist
1270 1050
         }
1271 1051
       })
1272
-      // console.log('77777',this.chuangwei);
1273
-      // for(let i=0;i<list.length;i++){
1274
-      //   if(this.chuangwei==list[i].bed_id){
1275
-      //     this.genghuan.name=list[i].name
1276
-      //     this.genghuan.mode_id=list[i].mode_id
1277
-      //     this.genghuan.genghuan_fenqu=list[i].order.DeviceNumber.zone.name
1278
-      //     this.genghuan.genghuan_chuang = list[i].order.DeviceNumber.number
1279
-      //     this.genghuan.g_boolen_id =list[i].order.blood_access_id
1280
-      //     this.genghuan.genghuan_remark = list[i].order.schedule_remark
1281
-      //     console.log('99999',this.genghuan);
1282
-      //     console.log('000000',list[i].bed_id);
1283
-      //     return this.genghuan
1284
-      //   }else{
1285
-      //     console.log('eeeeee');
1286
-      //     this.genghuan.name=''
1287
-      //     this.genghuan.mode_id=''
1288
-      //     this.genghuan.genghuan_fenqu=''
1289
-      //     this.genghuan.genghuan_chuang = ''
1290
-      //     this.genghuan.g_boolen_id = ''
1291
-      //     this.genghuan.genghuan_remark =''
1292
-      //     // return this.genghuan
1293
-      //     // console.log('qqqqqq',this.list[i].bed_id);
1294
-      //   }
1295
-        
1296
-      // }
1297 1052
     },
1298 1053
     // 双击弹窗床位
1299 1054
     dialogchuangwei(e){
@@ -1312,7 +1067,7 @@ export default {
1312 1067
           this.genghuan.genghuan_chuang = this.list[i].order.DeviceNumber.number
1313 1068
           this.genghuan.g_boolen_id = this.list[i].order.blood_access_id
1314 1069
           this.genghuan.genghuan_remark = this.list[i].order.schedule_remark
1315
-
1070
+          // this.genghuan.bed_id = this.list[i].bed_id
1316 1071
           for(let y=0;y<this.subzone.length;y++){
1317 1072
             if(this.chuangwei==this.subzone[y].id){
1318 1073
               this.g_xian_fenqu=this.subzone[y]
@@ -1332,8 +1087,9 @@ export default {
1332 1087
           this.genghuan.genghuan_chuang = ''
1333 1088
           this.genghuan.g_boolen_id = ''
1334 1089
           this.genghuan.genghuan_remark =''
1335
-          // return this.genghuan
1336
-          // console.log('qqqqqq',this.list[i].bed_id);
1090
+          this.genghuan.bed_id = ''
1091
+          this.genghuan.patient_id = ''
1092
+          
1337 1093
         }
1338 1094
       }
1339 1095
       // 更换的床位置
@@ -1366,42 +1122,22 @@ export default {
1366 1122
                 this.$message.success("交换成功");
1367 1123
                 this.tipDialogVisible = false
1368 1124
                 this.tipDialogVisibleThree = false
1369
-                this.getlist();
1125
+                // this.getlist();
1126
+                const listl=this.list
1127
+                for(let i=0;i<listl.length;i++){
1128
+                  if(this.huanzhe.name== listl[i].name){
1129
+                    listl[i].bed_id = this.chuangwei 
1130
+                    console.log('mmmm',listl,this.currentData);
1131
+                  }
1132
+                  if(this.genghuan.name== listl[i].name){
1133
+                    // this.ent_index=listl[i].bed_id
1134
+                    listl[i].bed_id =this.huanzhe.bed_id
1135
+                  }
1136
+                }
1370 1137
               }
1371 1138
             });
1372 1139
             return this.genghuan
1373 1140
           }
1374
-      //     // else{
1375
-      //     //   var zonename=''
1376
-      //     //   var bedname=''
1377
-      //     //   var zoneid=''
1378
-      //     //   console.log('6666',this.chuangwei);
1379
-      //     //   for(let y=0;y<this.subzone.length;y++){
1380
-      //     //     if(this.chuangwei == this.subzone[y].id){
1381
-      //     //       bedname=this.subzone[y].number
1382
-      //     //       zoneid=this.subzone[y].zone_id
1383
-      //     //       console.log('aaaa',this.chuangwei,this.subzone[y].id,this.subzone[y].number);
1384
-      //     //       this.schedule={
1385
-      //     //         schedule_date:this.date,
1386
-      //     //         schedule_type:this.classes,
1387
-      //     //         bed_id:this.chuangwei,
1388
-      //     //         partition_id:zoneid,
1389
-      //     //         schedule_week:this.huanzhe.schedule_week,
1390
-      //     //         mode_id:this.huanzhe.mode_id,
1391
-      //     //         bed_name:bedname,
1392
-      //     //         contagions:'',
1393
-      //     //         id:0,
1394
-      //     //         partition_type:'',
1395
-      //     //         patient:this.huanzhe.name,
1396
-      //     //         patient_id:this.huanzhe.patient_id,
1397
-      //     //         type_name:'',
1398
-      //     //         zone_name:zonename
1399
-      //     //       }
1400
-      //     //       this.setSchedulethree(this.huanzhe.id)
1401
-      //     //       return ''
1402
-      //     //     }
1403
-      //     //   }
1404
-      //     // }
1405 1141
         }
1406 1142
       }
1407 1143
       // else if(this.genghuan.id == 'null'){
@@ -1436,7 +1172,7 @@ export default {
1436 1172
         }
1437 1173
       // }
1438 1174
     }
1439
-  }
1175
+  },
1440 1176
 }
1441 1177
 </script>
1442 1178