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

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1567,8 +1567,8 @@ export default {
 
     }, searchProjectAction() {
       console.log('~~~~')
-      console.log(this.allProject)
-      console.log(this.allProject)
+      
+      // console.log(this.allProject)
 
 
       if (this.search_project_keyword.length == 0) {
@@ -1577,12 +1577,15 @@ export default {
       } else {
         let arr = []
         for (let i = 0; i < this.allProject.length; i++) {
-          if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
-            arr = arr.concat(this.allProject[i])
+
+          if( this.allProject[i].first_letter !=undefined){
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
+              this.allProject[i].first_letter.indexOf(this.search_project_keyword) != -1) {
+              arr = arr.concat(this.allProject[i])
+            }
           }
         }
         this.tabProject = arr
-
       }
 
     }, searchProjectTeamAction() {
@@ -1606,7 +1609,10 @@ export default {
       } else {
         let arr = []
         for (let i = 0; i < this.drugs.length; i++) {
-          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) {
+          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 ||
+          this.drugs[i].first_letter.indexOf(this.search_keyword) != -1) {
             arr = arr.concat(this.drugs[i])
           }
         }
@@ -3427,7 +3433,8 @@ export default {
               total: project[i].total,
               is_special_diseases: project[i].disease_directory,
               project: project[i],
-              stock_count: 0
+              stock_count: 0,
+              first_letter:project[i].first_letter
             }
 
             this.tabProject.push(obj)
@@ -3465,9 +3472,6 @@ export default {
 
           this.allProject = this.tabProject
 
-
-
-
         }
       })
 

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -40,8 +40,8 @@
               </div>
 
               <div class="mainCell" style="margin-bottom:10px;">
-                  <el-input size="small" placeholder="请输入姓名或就诊号"
-                            v-model="search_input" class="filter-item"/>
+                  <el-input size="small" placeholder="请输入姓名或就诊号" @input="searchAction"
+                    @keyup.enter.native='searchAction' v-model="search_input" class="filter-item"/>
                   <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"
                              @click="searchAction">
                       搜索
@@ -556,8 +556,11 @@ export default {
         switch (this.radio) {
           case 0:
             let arr4 = []
+            // console.log('3333',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
+              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
+              this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
+              this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
                 arr4 = arr4.concat(this.all_data[i])
               }
             }
@@ -565,8 +568,11 @@ export default {
             break
           case 2:
             let arr2 = []
+            // console.log('4444',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
+              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
+                  this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
+                  this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
                 arr2 = arr2.concat(this.all_data[i])
               }
             }
@@ -575,8 +581,11 @@ export default {
             break
           case 1:
             let arr3 = []
+            // console.log('5555',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || this.all_data[i].his_patient.number.indexOf(this.search_input) != -1) {
+              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
+              this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 || 
+              this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
                 arr3 = arr3.concat(this.all_data[i])
               }
             }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1588,21 +1588,26 @@ export default {
       this.$refs.additionalCharges.hide()
 
     }, searchProjectAction() {
-      console.log('~~~~')
-      console.log(this.allProject)
-
+      console.log('~~~~',this.search_project_keyword)
+      // console.log(this.allProject)
       if (this.search_project_keyword.length == 0) {
         this.tabProject = this.allProject
 
       } else {
         let arr = []
         for (let i = 0; i < this.allProject.length; i++) {
-          if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
-            arr = arr.concat(this.allProject[i])
+          console.log('wwww',(this.allProject[i].first_letter))
+          if(this.allProject[i].first_letter !=undefined){
+            if (
+            this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
+            this.allProject[i].first_letter.indexOf(this.search_project_keyword) != -1
+            ) {
+              arr = arr.concat(this.allProject[i])
+            }
           }
         }
         this.tabProject = arr
-
+        console.log('kkkk',this.tabProject);
       }
 
     }, searchProjectTeamAction() {
@@ -1626,7 +1631,11 @@ export default {
       } else {
         let arr = []
         for (let i = 0; i < this.drugs.length; i++) {
-          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) {
+          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 ||
+           this.drugs[i].first_letter.indexOf(this.search_keyword) != -1
+           ) {
             arr = arr.concat(this.drugs[i])
           }
         }
@@ -3531,8 +3540,9 @@ export default {
               is_special_diseases: project[i].disease_directory,
               project: project[i],
               stock_count:0,
+              first_letter:project[i].first_letter
             }
-
+            // console.log('hhhhh',obj);
             this.tabProject.push(obj)
           }
 
@@ -3569,7 +3579,7 @@ export default {
           }
 
           this.allProject = this.tabProject
-
+          // console.log('cccc',this.allProject);
         }
       })
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -830,6 +830,7 @@ export default {
     },
 
     searchAction() {
+      
       if (this.search_input.length == 0) {
         switch (this.radio) {
           case 0:
@@ -843,12 +844,14 @@ export default {
             break
         }
       } else {
-
+        console.log('5555',this.radio);
         switch (this.radio) {
           case 0:
             let arr = []
             for (let i = 0; i < this.all_data.length; i++) {
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || this.all_data[i].number.indexOf(this.search_input) != -1) {
+              if (this.all_data[i].name.indexOf(this.search_input) != -1 ||
+               this.all_data[i].number.indexOf(this.search_input) != -1 ||
+               this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
                 arr = arr.concat(this.all_data[i])
                 console.log(arr)
               }
@@ -858,8 +861,12 @@ export default {
             break
           case 2:
             let arr2 = []
+           
             for (let i = 0; i < this.cure_data.length; i++) {
-              if (this.cure_data[i].name.indexOf(this.search_input) != -1 || this.cure_data[i].number.indexOf(this.search_input) != -1) {
+              if (this.cure_data[i].name.indexOf(this.search_input) != -1 || 
+              this.cure_data[i].number.indexOf(this.search_input) != -1 ||
+              this.cure_data[i].first_letter.indexOf(this.search_input) != -1) {
+                console.log('2222',this.cure_data);
                 arr2 = arr2.concat(this.cure_data[i])
               }
             }
@@ -869,10 +876,16 @@ export default {
           case 1:
             console.log("wowowoowowow",this.un_cure_data)
             let arr3 = []
+            console.log('3333',this.un_cure_data);
             for (let i = 0; i < this.un_cure_data.length; i++) {
-              if (this.un_cure_data[i].name.indexOf(this.search_input) != -1 || this.un_cure_data[i].number.indexOf(this.search_input) != -1) {
-                arr3 = arr3.concat(this.un_cure_data[i])
+              if(this.un_cure_data[i].first_letter!=undefined){
+                if (this.un_cure_data[i].name.indexOf(this.search_input) != -1 || 
+                this.un_cure_data[i].number.indexOf(this.search_input) != -1 ||
+                this.un_cure_data[i].first_letter.indexOf(this.search_input) != -1) {
+                  arr3 = arr3.concat(this.un_cure_data[i])
+                }
               }
+              
             }
             this.un_cure_data = arr3
             break
@@ -903,9 +916,11 @@ export default {
                   name: response.data.data.list[i].his_patient[b].name,
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  first_letter:response.data.data.list[i].first_letter
                 }
                 this.un_cure_data.push(obj)
+                console.log('vvvvv',this.un_cure_data);
               }
               //已就诊
               if (response.data.data.list[i].his_patient[b].prescription.length > 0) {
@@ -913,7 +928,8 @@ export default {
                   name: response.data.data.list[i].his_patient[b].name,
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  first_letter:response.data.data.list[i].first_letter
                 }
                 this.cure_data.push(obj)
               }
@@ -929,9 +945,11 @@ export default {
                 name: response.data.data.list_two[i].name,
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
-                his_patient_id: response.data.data.list_two[i].his_patient.id
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
+                first_letter:response.data.data.list_two[i].first_letter
               }
               this.un_cure_data.push(obj)
+              // console.log('aaaaa',this.un_cure_data);
             }
 
             //已就诊
@@ -940,12 +958,13 @@ export default {
                 name: response.data.data.list_two[i].name,
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
-                his_patient_id: response.data.data.list_two[i].his_patient.id
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
+                first_letter:response.data.data.list_two[i].first_letter
               }
               this.cure_data.push(obj)
             }
           }
-
+          // console.log('gggg',this.un_cure_data);
           this.all_data = this.all_data.concat(this.cure_data)
           this.all_data = this.all_data.concat(this.un_cure_data)
 
@@ -968,7 +987,6 @@ export default {
               this.getPatientInfo(this.un_cure_data[0])
 
             } else if (this.radio == 2) {
-
               this.$refs.tab.setCurrentRow(this.cure_data[0])
               this.oldCurrentRow = this.cure_data[0]
               this.getPatientInfo(this.cure_data[0])
@@ -1002,7 +1020,8 @@ export default {
                   name: response.data.data.list[i].his_patient[b].name,
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  first_letter:response.data.data.list[i].first_letter
                 }
                 this.un_cure_data.push(obj)
               }
@@ -1012,7 +1031,8 @@ export default {
                   name: response.data.data.list[i].his_patient[b].name,
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  first_letter:response.data.data.list[i].first_letter
                 }
                 this.cure_data.push(obj)
               }
@@ -1027,7 +1047,8 @@ export default {
                 name: response.data.data.list_two[i].name,
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
-                his_patient_id: response.data.data.list_two[i].his_patient.id
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
+                first_letter:response.data.data.list_two[i].first_letter
               }
               this.un_cure_data.push(obj)
             }
@@ -1038,7 +1059,8 @@ export default {
                 name: response.data.data.list_two[i].name,
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
-                his_patient_id: response.data.data.list_two[i].his_patient.id
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
+                first_letter:response.data.data.list_two[i].first_letter
               }
               this.cure_data.push(obj)
             }
@@ -1499,8 +1521,10 @@ export default {
                 name: response.data.data.list_two[i].name,
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
-                his_patient_id: response.data.data.list_two[i].his_patient.id
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
+                first_letter:response.data.data.list_two[i].first_letter
               }
+              console.log('6666',obj);
               this.un_cure_data.push(obj)
             }
 
@@ -1510,7 +1534,8 @@ export default {
                 name: response.data.data.list_two[i].name,
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
-                his_patient_id: response.data.data.list_two[i].his_patient.id
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
+                first_letter:response.data.data.list_two[i].first_letter
               }
               this.cure_data.push(obj)
             }
@@ -1525,8 +1550,10 @@ export default {
                   name: response.data.data.list[i].his_patient[b].name,
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  first_letter:response.data.data.list[i].first_letter
                 }
+                console.log('8888',obj);
                 this.un_cure_data.push(obj)
               }
               //已就诊
@@ -1535,7 +1562,8 @@ export default {
                   name: response.data.data.list[i].his_patient[b].name,
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  first_letter:response.data.data.list[i].first_letter
                 }
                 this.cure_data.push(obj)
               }

src/xt_pages/workforce/Patientshift.vue

@@ -46,9 +46,15 @@
               inactive-text="OFF">
             </el-switch>
           </div>
-          <!-- <div style="display: inline-block;position: relative;right: -30%;">
-            <el-button type="primary"  @click="quan_ping">全屏</el-button>
-          </div> -->
+          <div class="content_top">隐藏空床位：
+            <el-switch
+              v-model="hidder_chuang"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              active-text="ON"
+              inactive-text="OFF">
+            </el-switch>
+          </div>
         </div>
         <div class="table_panel"  v-for="(item, index) in tableData" :key="index">
           <table class="table">
@@ -60,30 +66,36 @@
             </thead>
             <tbody>
               <tr v-for="(ite,index) in item.zones" :key="index">
-                <td style="text-align: center;">{{ getZoneName(ite.partition_id) }}</td>
+                <td style="text-align: center;">
+                  <span>{{ getZoneName(ite.partition_id) }}</span><br>
+                  <span>总人数：{{ getZonePatient(ite.partition_id,item.schedule_type) }}</span>
+                  <span v-if="getZonePatient(ite.partition_id,item.schedule_type)>0">人</span>
+                </td>
                 <td>
                   <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 ? '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 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>
-                                <span>{{nameSplit(item2.name) }}({{ getmode(item2.mode_id) }})</span><br>
-                                <span v-if="!hidder" >
-                                  <span style="font-size: 14px;margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
-                                  <span style="font-size: 14px;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
-                                  <span style="font-size: 13px;;margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
-                                </span> 
+                    <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 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>
+                                  <span>{{nameSplit(item2.name) }}({{ getmode(item2.mode_id) }})</span><br>
+                                  <span v-if="!hidder" >
+                                    <span style="font-size: 14px;margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
+                                    <span style="font-size: 14px;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
+                                    <span style="font-size: 13px;;margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
+                                  </span> 
+                                </div>
                               </div>
-                            </div>
-                          </template> 
-                        </div>
-                      </div> 
-                                        
-                    </div>
-                    <div v-if="ite.partition_id==it.zone_id" style="display: inline-block;width: 125px;text-align: center;">
-                      {{ it.number }}
+                            </template> 
+                          </div>
+                        </div> 
+                                          
+                      </div>
+                      <div v-if="ite.partition_id==it.zone_id" style="display: inline-block;width: 125px;text-align: center;">
+                        {{ it.number }}
+                      </div>
                     </div>
                   </div>
                 </td>
@@ -271,6 +283,15 @@
               inactive-text="OFF">
             </el-switch>
           </div>
+          <div class="content_top">隐藏空床位：
+            <el-switch
+              v-model="hidder_chuang"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              active-text="ON"
+              inactive-text="OFF">
+            </el-switch>
+          </div>
          
         </div>
         <div class="table_panel"  v-for="(item, index) in tableData" :key="index">
@@ -286,27 +307,29 @@
                 <td style="text-align: center;">{{ getZoneName(ite.partition_id) }}</td>
                 <td>
                   <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 ? '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 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>
-                                <span>{{nameSplit(item2.name) }}({{ getmode(item2.mode_id) }})</span><br>
-                                <span v-if="!hidder" >
-                                  <span style="font-size: 14px;margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
-                                  <span style="font-size: 14px;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
-                                  <span style="font-size: 13px;;margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
-                                </span> 
+                    <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 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>
+                                  <span>{{nameSplit(item2.name) }}({{ getmode(item2.mode_id) }})</span><br>
+                                  <span v-if="!hidder" >
+                                    <span style="font-size: 14px;margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
+                                    <span style="font-size: 14px;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
+                                    <span style="font-size: 13px;;margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
+                                  </span> 
+                                </div>
                               </div>
-                            </div>
-                          </template> 
-                        </div>
-                      </div> 
-                                        
-                    </div>
-                    <div v-if="ite.partition_id==it.zone_id" style="display: inline-block;width: 125px;text-align: center;">
-                      {{ it.number }}
+                            </template> 
+                          </div>
+                        </div> 
+                                          
+                      </div>
+                      <div v-if="ite.partition_id==it.zone_id" style="display: inline-block;width: 125px;text-align: center;">
+                        {{ it.number }}
+                      </div>
                     </div>
                   </div>
                 </td>
@@ -342,6 +365,7 @@ export default {
       tipDialogVisibleTwo:false,
       tipDialogVisibleThree:false,
       hidder: false,
+      hidder_chuang:false,
       quanping:false,
       td_1_width: '8%',
       td_3_width: '90%',
@@ -395,310 +419,7 @@ export default {
         { value: 3, label: "晚上" }
       ],
       zones:[],
-      schedules: [
-        {
-          day: 1,
-          weekday: '星期一',
-          all: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          },
-          hdf: [
-            /* schedule, ... */
-          ],
-          hd_hp: [
-            /* schedule, ... */
-          ],
-
-          new_hdf: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          },
-          new_hd_hp: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          }
-        },
-        {
-          day: 2,
-          weekday: '星期二',
-          all: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          },
-          hdf: [
-            /* schedule, ... */
-          ],
-          hd_hp: [
-            /* schedule, ... */
-          ],
-          new_hdf: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          },
-          new_hd_hp: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          }
-        },
-        {
-          day: 3,
-          weekday: '星期三',
-          all: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          },
-          hdf: [
-            /* schedule, ... */
-          ],
-          hd_hp: [
-            /* schedule, ... */
-          ],
-          new_hdf: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          },
-          new_hd_hp: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          }
-        },
-        {
-          day: 4,
-          weekday: '星期四',
-          all: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          },
-          hdf: [
-            /* schedule, ... */
-          ],
-          hd_hp: [
-            /* schedule, ... */
-          ],
-          new_hdf: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          },
-          new_hd_hp: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          }
-        },
-        {
-          day: 5,
-          weekday: '星期五',
-          all: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          },
-          hdf: [
-            /* schedule, ... */
-          ],
-          hd_hp: [
-            /* schedule, ... */
-          ],
-          new_hdf: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          },
-          new_hd_hp: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          }
-        },
-        {
-          day: 6,
-          weekday: '星期六',
-          all: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          },
-          hdf: [
-            /* schedule, ... */
-          ],
-          hd_hp: [
-            /* schedule, ... */
-          ],
-          new_hdf: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          },
-          new_hd_hp: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          }
-        },
-        {
-          day: 7,
-          weekday: '星期日',
-          all: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          },
-          hdf: [
-            /* schedule, ... */
-          ],
-          hd_hp: [
-            /* schedule, ... */
-          ],
-          new_hdf: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          },
-          new_hd_hp: {
-            am: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            pm: {
-              /* zone_name: [ schedule, ... ] */
-            },
-            evening: {
-              /* zone_name: [ schedule, ... ] */
-            }
-          }
-        }
-      ],
+     
       total: [],
       list: [],
       loading: false,
@@ -722,6 +443,7 @@ export default {
         patient_id:'',
         partition_id:'',
         schedule_week: '',
+        bed_id:'',
       },
       xian_fenqu:'',
       g_xian_fenqu:'',
@@ -734,7 +456,10 @@ export default {
         g_boolen_id:'',
         genghuan_remark:'',
         patient_id:'',
+        bed_id:''
       },
+      drag_index:'',
+      ent_index:'',
     }
   },
   components: {
@@ -749,6 +474,7 @@ export default {
   mounted(){
     // console.log('8888',this.huanzhe.order.DeviceNumber.zone.name);
   },
+
   methods:{
     quan_ping(){
       if(this.quanping==false){
@@ -759,26 +485,33 @@ export default {
         return this.quanping=false
       }
     },
+    // 隐藏空床位
+    getkongchuang(a,b){
+      const arr=[]
+      for(let i=0;i<b.length;i++){
+        if(a.id==b[i].bed_id){
+          arr.push(a.id)
+        }
+      }
+      return arr
+    },
     drop(e,val,value){
       this.allowDrop(e)
       var bedid = ''
       var bedname=''
       var zonename=''
       var zoneid=''
-      console.log('kkkkk',e.target.innerText);
       const inntext= e.target.innerText.split('(')[0]
-      console.log('vvvv',inntext,val.list[0].new_name);
       for(let i=0;i<val.list.length;i++){
         if(inntext == val.list[i].new_name){
-          console.log('6666',val,value);
-          console.log('7777',this.numberlist);
           this.tipDialogVisible=true
           this.currentData={
             currentData_id:val.list[i].id,
             currentData_name:val.list[i].name,
             currentData_quhao:val.list[i].order.DeviceNumber.zone.name,
             currentData_chaung:val.list[i].order.DeviceNumber.number,
-            patient_id:val.list[i].patient_id
+            patient_id:val.list[i].patient_id,
+            bed_id:val.list[i].bed_id
           }
         }
       }
@@ -821,7 +554,7 @@ export default {
           patient_id:this.cur_drag_info.patient_id,
           
         }
-        console.log('8888',this.currentData.currentData_id);
+        console.log('8888',this.currentData);
         this.setScheduleTwo(this.cur_drag_info.id)
         // var params={
         //   patient_id:this.currentData.patient_id,
@@ -838,29 +571,6 @@ export default {
         // })
         // this.CreateScheduleTwo(this.currentData.patient_id,this.currentData,this.currentData.currentData_id)
       }
-      
-      // for(let i=0;i<this.numberlist.length;i++){
-      //   for(let j=0;j<val.list.length;j++){
-      //     if(this.numberlist[i].id==val.list[y].bed_id){
-
-      //     }
-      //   }
-      // }
-      // this.currentData={
-      //   currentData_id:val.id,
-      //   currentData_name:val.name,
-      //   currentData_quhao:val.order.DeviceNumber.zone.name,
-      //   currentData_chaung:val.order.DeviceNumber.number,
-      // },
-     
-      // this.currentData={
-      //   currentData_id:this.cur_drag_info.id,
-      //   currentData_name:this.cur_drag_info.name,
-      //   currentData_quhao:this.cur_drag_info.quhao,
-      //   currentData_chaung:this.cur_drag_info.chaung,
-      // },
-
-      
     },
     allowDrop(e) {
       e.preventDefault();
@@ -881,13 +591,44 @@ export default {
           this.$message.success("替换成功");
           this.tipDialogVisible = false
           this.tipDialogVisibleTwo = false
-          this.getlist();
+          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.cur_drag_info.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);
+            }
+          }
+          // this.getlist();
         }
       });
     },
     // 交换
     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
@@ -902,9 +643,22 @@ 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.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();
         }
       });
+      
     },
     // 交换空白
     setScheduleTwo(id_two){
@@ -920,8 +674,17 @@ export default {
       if (response.data.state == 0) {
         this.$message.error(response.data.msg);
       } else {
-        var schedule = response.data.data.schedule;
-        this.getlist()
+        // 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()
       }
     },
     // 需要拖动的
@@ -945,8 +708,8 @@ export default {
         }
       }
      
-      console.log('bbbb',e.target.innerText);
-      console.log('4444',val);
+      // console.log('bbbb',e.target.innerText);
+      // console.log('4444',val);
       console.log('5555',this.cur_drag_info);
     },
      // 选中日期
@@ -1141,6 +904,24 @@ export default {
       }
       return name
     },
+    getZonePatient(partition_id,schedule_type){
+       
+       var arr = []
+       if(this.list!=null && this.list.length >0){
+         for(let i=0;i<this.list.length;i++){
+            if(partition_id == this.list[i].partition_id && schedule_type == this.list[i].schedule_type){
+                arr.push(this.list[i])
+            }
+         }
+       }
+ 
+       if(arr.length >0){
+          return arr.length
+       }else{
+         return ""
+       }
+ 
+    },
     // 双击打开弹窗
     db_click(e,val){
       if(e.target.innerText !=''){
@@ -1161,8 +942,9 @@ export default {
             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
+            this.huanzhe.bed_id = this.list[i].bed_id
             // return this.huanzhe
-          //   console.log('55555',this.huanzhe);
+            console.log('kkkk',this.huanzhe);
           }     
           // 双击弹窗的右侧第二个默认数据
           if(this.chuangwei==this.list[i].bed_id){
@@ -1174,8 +956,9 @@ 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
-            this.genghuan.patient_id = this.list[i].patient_id
-            // console.log('99999',this.genghuan);
+            this.genghuan.patient_id = this.list[i].patient_id,
+            this.genghuan.bed_id = this.list[i].bed_id
+            console.log('99999',this.genghuan);
             // console.log('000000',this.list[i].bed_id);
             // return this.genghuan
           }
@@ -1196,9 +979,6 @@ export default {
         this.centerDialogVisible=false
       }
       
-      // console.log('双击弹窗',this.zeng_fenqu);
-      // console.log('双击弹窗33',e);
-      // console.log('双击弹窗333',value);
     },
     // 双击弹窗分区
     dialogfenqu(e){
@@ -1250,6 +1030,7 @@ 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
+              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
@@ -1266,34 +1047,8 @@ export default {
             }
             
           }
-          // this.numberlist= numberlist
         }
       })
-      // console.log('77777',this.chuangwei);
-      // for(let i=0;i<list.length;i++){
-      //   if(this.chuangwei==list[i].bed_id){
-      //     this.genghuan.name=list[i].name
-      //     this.genghuan.mode_id=list[i].mode_id
-      //     this.genghuan.genghuan_fenqu=list[i].order.DeviceNumber.zone.name
-      //     this.genghuan.genghuan_chuang = list[i].order.DeviceNumber.number
-      //     this.genghuan.g_boolen_id =list[i].order.blood_access_id
-      //     this.genghuan.genghuan_remark = list[i].order.schedule_remark
-      //     console.log('99999',this.genghuan);
-      //     console.log('000000',list[i].bed_id);
-      //     return this.genghuan
-      //   }else{
-      //     console.log('eeeeee');
-      //     this.genghuan.name=''
-      //     this.genghuan.mode_id=''
-      //     this.genghuan.genghuan_fenqu=''
-      //     this.genghuan.genghuan_chuang = ''
-      //     this.genghuan.g_boolen_id = ''
-      //     this.genghuan.genghuan_remark =''
-      //     // return this.genghuan
-      //     // console.log('qqqqqq',this.list[i].bed_id);
-      //   }
-        
-      // }
     },
     // 双击弹窗床位
     dialogchuangwei(e){
@@ -1312,7 +1067,7 @@ 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
-
+          // this.genghuan.bed_id = this.list[i].bed_id
           for(let y=0;y<this.subzone.length;y++){
             if(this.chuangwei==this.subzone[y].id){
               this.g_xian_fenqu=this.subzone[y]
@@ -1332,8 +1087,9 @@ export default {
           this.genghuan.genghuan_chuang = ''
           this.genghuan.g_boolen_id = ''
           this.genghuan.genghuan_remark =''
-          // return this.genghuan
-          // console.log('qqqqqq',this.list[i].bed_id);
+          this.genghuan.bed_id = ''
+          this.genghuan.patient_id = ''
+          
         }
       }
       // 更换的床位置
@@ -1366,42 +1122,22 @@ export default {
                 this.$message.success("交换成功");
                 this.tipDialogVisible = false
                 this.tipDialogVisibleThree = false
-                this.getlist();
+                // 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
           }
-      //     // 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 ''
-      //     //     }
-      //     //   }
-      //     // }
         }
       }
       // else if(this.genghuan.id == 'null'){
@@ -1436,7 +1172,7 @@ export default {
         }
       // }
     }
-  }
+  },
 }
 </script>