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

src/router/modules/dialysis.js

       is_menu: false,
       noCache: true
     },
+    // 透析记录2
+    {
+      path: '/dialysis/details/indexs',
+      component: () => import('@/xt_pages/dialysis/details/indexs'),
+      name: 'details',
+      meta: {
+        title: 'details'
+      },
+      hidden: true,
+      is_menu: false,
+      noCache: true
+    },
 
     {
       path: '/dialysis/print/batch',

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                     </table>
                   </td>
                 </tr>
-                <tr v-if="org_id!=10402 && org_id!=10206 && org_id!=0">
+                <tr v-if="org_id!=10402 && org_id!=10206">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
                   </td>
                 </tr>
 
-                 <tr v-if="org_id == 10402 || org_id == 0 || org_id == 10206">
+                 <tr v-if="org_id == 10402 || org_id == 10206">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
             var delghTwo = 0;
             if (
               this.records[recordIndex].advices &&
-              this.records[recordIndex].advices.length < 10
+              this.records[recordIndex].advices.length < 12
             ) {
-              delghTwo = 10 - this.records[recordIndex].advices.length;
+              delghTwo = 12 - this.records[recordIndex].advices.length;
             } else {
               delghTwo = 0;
             }
 
 
           
-            if(this.org_id == 0 || this.org_id == 10206){
+            if(this.org_id == 10206){
               console.log("this.records[recordIndex].his_project", this.records[recordIndex].his_project)
               var delghThree = 0 
              let his_project = []
                 rightIndex in advices ? advices[i + halfLen] : []
               );
             }
-            if (halfLen < 5) {
-              var nl = 5 - leftAdvice.length;
+            if (halfLen < 6) {
+              var nl = 6 - leftAdvice.length;
               for (let index = 0; index < nl; index++) {
                 leftAdvice.push([]);
               }
-              var nl = 5 - rightAdvice.length;
+              var nl = 6 - rightAdvice.length;
               for (let index = 0; index < nl; index++) {
                 rightAdvice.push([]);
               }
               this.records[recordIndex].advices.push(item);
             }
           }
-          console.log(this.records, "this.records");
+          console.log("数据我哦我我", this.records);
           // this.records.forEach(o => {
           //   console.log(o,'jj')
           //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                     </td> -->
                         <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
                         <td height="32px">
-                          <span
-                            v-if="setAdminUserES(advice.advice_doctor) == ''"
-                            >{{ getAdminUser(advice.advice_doctor) }}</span
-                          >
-                          <img
-                            style="height: 30px"
-                            :src="setAdminUserES(advice.advice_doctor)"
-                            alt=""
-                            srcset=""
-                            v-else
-                          />
+                          <span v-if="advice!=null && advice.advice_doctor>0">
+                              <span
+                              v-if="setAdminUserES(advice.advice_doctor) == ''"
+                              >{{ getAdminUser(advice.advice_doctor) }}
+                            </span>
+                            <img
+                              style="height: 30px"
+                              :src="setAdminUserES(advice.advice_doctor)"
+                              alt=""
+                              srcset=""
+                              v-else
+                            />
+                          </span>
+                         
                         </td>
                         <!-- <td height="35px">
                       <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
                       <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
                     </td> -->
                         <td height="32px">
-                          <span
-                            v-if="setAdminUserES(advice.execution_staff) == ''"
-                            >{{ getAdminUser(advice.execution_staff) }}</span
-                          >
-                          <img
-                            style="height: 30px"
-                            :src="setAdminUserES(advice.execution_staff)"
-                            alt=""
-                            srcset=""
-                            v-else
-                          />
+                          <span v-if="advice!=null && advice.execution_staff>0">
+                            <span
+                              v-if="setAdminUserES(advice.execution_staff) == ''"
+                              >{{ getAdminUser(advice.execution_staff) }}</span
+                            >
+                            <img
+                              style="height: 30px"
+                              :src="setAdminUserES(advice.execution_staff)"
+                              alt=""
+                              srcset=""
+                              v-else
+                            />
+                        </span>
                         </td>
                         <td height="32px">
                           <span v-if="advice.execution_time">{{
                           }}</span>
                         </td>
                         <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375">
-                          <span v-if="setAdminUserES(advice.checker) == ''">{{
-                            getAdminUser(advice.checker)
-                          }}</span>
-                          <img
-                            style="height: 30px"
-                            :src="setAdminUserES(advice.checker)"
-                            alt=""
-                            srcset=""
-                            v-else
-                          />
+                          <span v-if="advice!=null && advice.checker>0">
+                            <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker)}}</span>
+                            <img
+                              style="height: 30px"
+                              :src="setAdminUserES(advice.checker)"
+                              alt=""
+                              srcset=""
+                              v-else
+                            />
+                        </span>
                         </td>
                       </tr>
                       <!-- </template> -->

src/xt_pages/outpatientDoctorStation/components/dialysishistory.vue

 
     },
     rowclick(event){
-      this.patient_id = event.patient_id
-      this.dialysis_date = parseTime(event.dialysis_date, '{y}-{m}-{d}')
-      this.drawer =true
-      this.dialysisShow =true
+      this.$router.push({
+        path: "/dialysis/details/indexs",
+        query: { patient_id: event.patient_id, date: event.dialysis_date }
+      });
+      // this.patient_id = event.patient_id
+      // this.dialysis_date = parseTime(event.dialysis_date, '{y}-{m}-{d}')
+      // this.drawer =true
+      // this.dialysisShow =true
     },
     clickCurrent(){
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

             <el-tab-pane label="透析记录" name="透析记录">
             </el-tab-pane>
             <el-tab-pane label="电子病历" name="电子病历"></el-tab-pane>
-            <!-- <el-tab-pane label="透析历史" name="透析历史"></el-tab-pane> -->
+            <el-tab-pane label="透析历史" name="透析历史"></el-tab-pane>
 
           </el-tabs>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
         <dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'
                         :dialysisShow="dialysisShow"></dialysis-index>
 
-        <!-- <dialysishistory v-if="titleType == '透析历史'" :patientid='patientid'></dialysishistory> -->
+        <dialysishistory v-if="titleType == '透析历史'" :patientid='patientid'></dialysishistory>
       </div>
 
     </div>

src/xt_pages/user/Informed/components/Filter_informed.vue

       <div id="print_content">
           <div class="print_page_main_content">
           <div class="content">
-              <h2 style="text-align: center;">血液透析(滤过、灌流)治疗知情同意书</h2>
+              <h2 style="text-align: center;">血液透析(滤过)治疗知情同意书</h2>
 
               <div style="text-align: right;">
                 透析号：{{ patient.dialysis_no }}

src/xt_pages/user/courseOfDisease.vue

             <div class="cell clearfix">
               <label class="title"><span class="name">病程日期</span> : </label>
               <el-date-picker v-model="course_of_disease_time" prefix-icon="el-icon-date" :editable="false"
-                              style="width: 200px;"
+                              style="width: 250px;"
                               type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
                               value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
 

src/xt_pages/user/dialysisRecord.vue

           </div> -->
 
 
-          <dialysisIndextwo :record_date="dialysis_date" :patientid='patient_id' :dialysisShow="dialysisShow" :dialysis_date="dialysis_date"></dialysisIndextwo>
+          <!-- <dialysisIndextwo :record_date="dialysis_date" :patientid='patient_id' :dialysisShow="dialysisShow" :dialysis_date="dialysis_date"></dialysisIndextwo> -->
         </div>
 
       </el-drawer>
 import { uParseTime } from "@/utils/tools";
 import { parseTime } from '@/utils'
 import { fetchAllDoctorAndNurse } from "@/api/doctor";
-import dialysisIndextwo from '../outpatientDoctorStation/components/dialysisIndextwo'
 import print from "print-js";
 
 export default {
   },
   components: {
     PatientSidebar,
-    dialysisIndextwo
   },
   methods: {
     getTime(record){
       }, 1);
     },
     clickCurrent(val) {
-      
+
       this.patient_id = val.patient_id
       this.dialysis_date = val.dialysis_date
     },
     rowclick(val){
+      // console.log('kkkkkkk',val.dialysis_date);
       this.$router.push({
-        path: "/dialysis/details",
+        path: "/dialysis/details/indexs",
         query: { patient_id: val.patient_id, date: val.dialysis_date }
       });
       // console.log('kkkkkkk',event);
-      // this.patient_id = event.patient_id
-      // this.dialysis_date = parseTime(event.dialysis_date, '{y}-{m}-{d}')
+      // this.patient_id = val.patient_id
+      // this.dialysis_date = parseTime(val.dialysis_date, '{y}-{m}-{d}')
       // this.drawer =true
       // this.dialysisShow =true
     },
     exportList(){
       import('@/vendor/Export2Excel').then(excel => {
-       
+
          if(this.recordData!=null && this.recordData.length > 0){
           for(let i=0;i<this.recordData.length;i++){
             this.recordData[i].dialysis_date_one = this.getTimeOne(this.recordData[i].dialysis_date)

src/xt_pages/workforce/components/editTableData.vue

             color: '#606266',
             // border: '1px solid aqua',
           }"
+            v-loading="loading"
+            element-loading-text="拼命加载中"
+            element-loading-spinner="el-icon-loading"
+            element-loading-background="rgba(0, 0, 0, 0.8)"
             :fit="true"
             :data="scheduleZone"
             @cell-click="clickThis"
       modename_value:true,//关闭透析模式开关
       Dialysis_patient:'',
       cur_date:"",
+      loading:false,//加载
       dataloading:false,
       current_patient_data:[],
       week_zhongwens: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
       }
     },
     showSmartDialog() {
-      // this.dataloading = true
+      this.dataloading = true
       this.editableTabsValue = "1";
-      // for (let i = 0; i < this.patientList.length; i++) {
-      //   if (this.patientList[i].id == this.cur_info.patient_id) {
-      //     this.cur_smart_patient_name = this.patientList[i].name;
-      //     this.cur_smart_patient_no = this.patientList[i].dialysis_no;
-      //     this.cur_smart_patient_id = this.patientList[i].id;
-      //   }
-      // }
+      for (let i = 0; i < this.patientList.length; i++) {
+        if (this.patientList[i].id == this.cur_info.patient_id) {
+          this.cur_smart_patient_name = this.patientList[i].name;
+          this.cur_smart_patient_no = this.patientList[i].dialysis_no;
+          this.cur_smart_patient_id = this.patientList[i].id;
+        }
+      }
 
-      // let params = {
-      //   patient_id: this.cur_info.patient_id,
-      // };
+      let params = {
+        patient_id: this.cur_info.patient_id,
+      };
       let data = [
         {
           checkedWeek: [],
         },
       ];
       this.first_weeks = []
-      // getPatientSmartSch(params).then((response) => {
-      //   if (response.data.state == 0) {
-      //     return false;
-      //   }
-      //   var schedules = response.data.data.schedules;
-      //   this.dataloading = false
-      //   this.current_all_sch[0].tableWeekArrage = [];
-      //   this.current_all_sch[1].tableWeekArrage = [];
-      //   this.current_all_sch[2].tableWeekArrage = [];
-      //   this.editableTabs[0].tableWeekArrage = [];
-      //   this.editableTabs[0].checkedWeek = [];
-      //   this.editableTabs[1].tableWeekArrage = [];
-      //   this.editableTabs[1].checkedWeek = [];
-      //   this.editableTabs[2].tableWeekArrage = [];
-      //   this.editableTabs[2].checkedWeek = [];
-      //   var tempDate = new Date();
-      //   var day = tempDate.getDay();
-      //   if (day == 0) {
-      //     day = 7;
-      //   }
-      //
-      //   for (let i = 0; i < schedules.length; i++) {
-      //
-      //
-      //     var week_type = this.getWeekType(
-      //         this.getTime(schedules[i].schedule_date, "{y}-{m}-{d}")
-      //     ).toString();
-      //
-      //     switch (week_type) {
-      //       case "1":
-      //         var obj = {
-      //           mode_id: schedules[i].mode_id,
-      //           sch_type: schedules[i].schedule_type,
-      //           zone_id: schedules[i].partition_id,
-      //           jihao_id: schedules[i].bed_id,
-      //           is_edit: false,
-      //           week: this.getWeek(schedules[i].schedule_week),
-      //           schedule_date: this.getDate(schedules[i].schedule_week),
-      //           jihaos: this.partitionsProp[schedules[i].partition_id].jihaos,
-      //           sch_id: schedules[i].id,
-      //         };
-      //         let is_edit = true;
-      //         if (
-      //             schedules[i].schedule_week < day ||
-      //             schedules[i].order.id > 0
-      //         ) {
-      //           is_edit = false;
-      //         } else {
-      //           is_edit = true;
-      //         }
-      //         obj.is_edit = is_edit;
-      //         console.log("schedules[i].order.id")
-      //
-      //         console.log(schedules[i].order.id)
-      //
-      //         for (let b = 0; b < this.weeks.length; b++) {
-      //           if (schedules[i].schedule_week == this.weeks[b].week_type) {
-      //             if (
-      //                 this.weeks[b].week_type >= day &&
-      //                 schedules[i].order.id == 0
-      //             ) {
-      //               this.weeks[b].is_edit = true;
-      //             } else {
-      //               let obj = {
-      //                 week_type:this.weeks[b].week_type,
-      //                 order_id:schedules[i].order.id,
-      //               }
-      //               this.first_weeks.push(obj)
-      //               this.weeks[b].is_edit = false;
-      //             }
-      //
-      //             this.editableTabs[0].checkedWeek.push(this.weeks[b]);
-      //           }
-      //         }
-      //         data[0].tableWeekArrage.push(obj);
-      //
-      //         this.editableTabs[0].tableWeekArrage.push(obj);
-      //         break;
-      //       case "2":
-      //         var obj2 = {
-      //           mode_id: schedules[i].mode_id,
-      //           sch_type: schedules[i].schedule_type,
-      //           zone_id: schedules[i].partition_id,
-      //           jihao_id: schedules[i].bed_id,
-      //           is_edit: true,
-      //           week: this.getWeek(schedules[i].schedule_week),
-      //           schedule_date: this.getDate(schedules[i].schedule_week + 7),
-      //           jihaos: this.partitionsProp[schedules[i].partition_id].jihaos,
-      //           sch_id: schedules[i].id,
-      //         };
-      //
-      //         for (let b = 0; b < this.weeks.length; b++) {
-      //           if (schedules[i].schedule_week == this.weeks[b].week_type) {
-      //             // this.weeks[b].is_edit = true;
-      //             this.editableTabs[1].checkedWeek.push(this.weeks[b]);
-      //           }
-      //         }
-      //         data[1].tableWeekArrage.push(obj2);
-      //         this.editableTabs[1].tableWeekArrage.push(obj2);
-      //         break;
-      //
-      //       case "3":
-      //         let obj3 = {
-      //           mode_id: schedules[i].mode_id,
-      //           sch_type: schedules[i].schedule_type,
-      //           zone_id: schedules[i].partition_id,
-      //           jihao_id: schedules[i].bed_id,
-      //           is_edit: true,
-      //           week: this.getWeek(schedules[i].schedule_week),
-      //           schedule_date: this.getDate(schedules[i].schedule_week + 14),
-      //           jihaos: this.partitionsProp[schedules[i].partition_id].jihaos,
-      //           sch_id: schedules[i].id,
-      //         };
-      //         for (let b = 0; b < this.weeks.length; b++) {
-      //           if (schedules[i].schedule_week == this.weeks[b].week_type) {
-      //             // this.weeks[b].is_edit = true;
-      //             this.editableTabs[2].checkedWeek.push(this.weeks[b]);
-      //           }
-      //         }
-      //         data[2].tableWeekArrage.push(obj3);
-      //
-      //         this.editableTabs[2].tableWeekArrage.push(obj3);
-      //         break;
-      //     }
-      //   }
-      // });
+      getPatientSmartSch(params).then((response) => {
+        if (response.data.state == 0) {
+          return false;
+        }
+        var schedules = response.data.data.schedules;
+        this.dataloading = false
+        this.current_all_sch[0].tableWeekArrage = [];
+        this.current_all_sch[1].tableWeekArrage = [];
+        this.current_all_sch[2].tableWeekArrage = [];
+        this.editableTabs[0].tableWeekArrage = [];
+        this.editableTabs[0].checkedWeek = [];
+        this.editableTabs[1].tableWeekArrage = [];
+        this.editableTabs[1].checkedWeek = [];
+        this.editableTabs[2].tableWeekArrage = [];
+        this.editableTabs[2].checkedWeek = [];
+        var tempDate = new Date();
+        var day = tempDate.getDay();
+        if (day == 0) {
+          day = 7;
+        }
+
+        for (let i = 0; i < schedules.length; i++) {
+
+
+          var week_type = this.getWeekType(
+              this.getTime(schedules[i].schedule_date, "{y}-{m}-{d}")
+          ).toString();
+
+          switch (week_type) {
+            case "1":
+              var obj = {
+                mode_id: schedules[i].mode_id,
+                sch_type: schedules[i].schedule_type,
+                zone_id: schedules[i].partition_id,
+                jihao_id: schedules[i].bed_id,
+                is_edit: false,
+                week: this.getWeek(schedules[i].schedule_week),
+                schedule_date: this.getDate(schedules[i].schedule_week),
+                jihaos: this.partitionsProp[schedules[i].partition_id].jihaos,
+                sch_id: schedules[i].id,
+              };
+              let is_edit = true;
+              if (
+                  schedules[i].schedule_week < day ||
+                  schedules[i].order.id > 0
+              ) {
+                is_edit = false;
+              } else {
+                is_edit = true;
+              }
+              obj.is_edit = is_edit;
+              console.log("schedules[i].order.id")
+
+              console.log(schedules[i].order.id)
+
+              for (let b = 0; b < this.weeks.length; b++) {
+                if (schedules[i].schedule_week == this.weeks[b].week_type) {
+                  if (
+                      this.weeks[b].week_type >= day &&
+                      schedules[i].order.id == 0
+                  ) {
+                    this.weeks[b].is_edit = true;
+                  } else {
+                    let obj = {
+                      week_type:this.weeks[b].week_type,
+                      order_id:schedules[i].order.id,
+                    }
+                    this.first_weeks.push(obj)
+                    this.weeks[b].is_edit = false;
+                  }
+
+                  this.editableTabs[0].checkedWeek.push(this.weeks[b]);
+                }
+              }
+              data[0].tableWeekArrage.push(obj);
+
+              this.editableTabs[0].tableWeekArrage.push(obj);
+              break;
+            case "2":
+              var obj2 = {
+                mode_id: schedules[i].mode_id,
+                sch_type: schedules[i].schedule_type,
+                zone_id: schedules[i].partition_id,
+                jihao_id: schedules[i].bed_id,
+                is_edit: true,
+                week: this.getWeek(schedules[i].schedule_week),
+                schedule_date: this.getDate(schedules[i].schedule_week + 7),
+                jihaos: this.partitionsProp[schedules[i].partition_id].jihaos,
+                sch_id: schedules[i].id,
+              };
+
+              for (let b = 0; b < this.weeks.length; b++) {
+                if (schedules[i].schedule_week == this.weeks[b].week_type) {
+                  // this.weeks[b].is_edit = true;
+                  this.editableTabs[1].checkedWeek.push(this.weeks[b]);
+                }
+              }
+              data[1].tableWeekArrage.push(obj2);
+              this.editableTabs[1].tableWeekArrage.push(obj2);
+              break;
+
+            case "3":
+              let obj3 = {
+                mode_id: schedules[i].mode_id,
+                sch_type: schedules[i].schedule_type,
+                zone_id: schedules[i].partition_id,
+                jihao_id: schedules[i].bed_id,
+                is_edit: true,
+                week: this.getWeek(schedules[i].schedule_week),
+                schedule_date: this.getDate(schedules[i].schedule_week + 14),
+                jihaos: this.partitionsProp[schedules[i].partition_id].jihaos,
+                sch_id: schedules[i].id,
+              };
+              for (let b = 0; b < this.weeks.length; b++) {
+                if (schedules[i].schedule_week == this.weeks[b].week_type) {
+                  // this.weeks[b].is_edit = true;
+                  this.editableTabs[2].checkedWeek.push(this.weeks[b]);
+                }
+              }
+              data[2].tableWeekArrage.push(obj3);
+
+              this.editableTabs[2].tableWeekArrage.push(obj3);
+              break;
+          }
+        }
+      });
 
       if(this.editableTabsValue == "1") {
         var tempDate = new Date();
               mode_name: "",
               patient_id: 0,
               dialysis_machine_name: "",
-
               patient: "",
             };
             that.scheduleZone[index].Sat_N = {
             }
           }
         });
-        // this.closePatientPanel();
       }
       this.creating_schedule = false;
     },
     async CreateScheduleTwo(id, data,id_two) {
+      this.loading =true
       this.creating_schedule = true;
       let response =await CreateScheduleTwo(id, data,id_two)
 
         var schedule = response.data.data.schedule;
         this.creating_schedule=false;
         this.dialogTableVisible=false
-        this.getSchedules()
-        // this.scheduleZone.forEach(function (zone, index) {
-        //   if (
-        //     zone.zone_id == schedule.partition_id &&
-        //     zone.jihao_id == schedule.bed_id
-        //   ) {
-        //     var weekPath = that.weekPath(
-        //       schedule.schedule_week,
-        //       schedule.schedule_type
-        //     );
-        //     if (weekPath.length == 2) {
-        //       var weekPathKey = weekPath[0] + "_" + weekPath[1];
-        //       that.scheduleZone[index][weekPathKey] = {
-        //         schedule_id: schedule.id,
-        //         mode_id: schedule.mode_id,
-        //         patient_id: schedule.patient_id,
-        //         patient: schedule.patient,
-        //         dialysis_machine_name: schedule.dialysis_machine_name,
-        //
-        //         patient_contagions: that.currentData.contagions,
-        //         mode_name:
-        //           typeof that.modeOptions[schedule.mode_id] === "undefined"
-        //             ? ""
-        //             : that.modeOptions[schedule.mode_id].name,
-        //       };
-        //       that.scheduleZone[index].total += 1;
-        //     }
-        //   }
-        // });
+        // this.getSchedules()
+        console.log('cccccc',this.cur_drag_info);
+         const curdrag = this.cur_drag_info
+        if(curdrag.bed_id!=''){
+
+          this.scheduleZone.forEach(function (zone, index) {
+            if (
+              zone.zone_id == schedule.partition_id &&
+              zone.jihao_id == schedule.bed_id
+            ) {
+              // console.log('111111',zone.zone_id,zone.jihao_id);
+              var weekPath = that.weekPath(
+                schedule.schedule_week,
+                schedule.schedule_type
+              );
+              console.log('22222',weekPath);
+              if (weekPath.length == 2) {
+                var weekPathKey = weekPath[0] + "_" + weekPath[1];
+                that.scheduleZone[index][weekPathKey] = {
+                  schedule_id: schedule.id,
+                  mode_id: schedule.mode_id,
+                  patient_id: schedule.patient_id,
+                  patient: schedule.patient,
+                  dialysis_machine_name: schedule.dialysis_machine_name,
+                  patient_contagions: that.currentData.contagions,
+                  mode_name:
+                    typeof that.modeOptions[schedule.mode_id] === "undefined"
+                      ? ""
+                      : that.modeOptions[schedule.mode_id].name,
+                };
+                // console.log('3333',that.scheduleZone[index][weekPathKey]);
+                that.scheduleZone[index].total += 1;
+              }
+            }
+
+            if(zone.zone_id == curdrag.partition_id &&
+                zone.jihao_id == curdrag.bed_id
+              ){
+                // console.log('aaaaaa',curdrag);
+                var weekPath = that.weekPath(
+                  curdrag.schedule_week,
+                  curdrag.schedule_type
+                );
+                console.log('aaaaaa',weekPath);
+                if(weekPath.length == 2){
+                  var weekPathKey = weekPath[0] + "_" + weekPath[1];
+                  that.scheduleZone[index][weekPathKey] ={
+                    schedule_id: '',
+                    mode_id: '',
+                    patient_id: '',
+                    patient: '',
+                    dialysis_machine_name: '',
+                    patient_contagions: '',
+                    mode_name:''
+                  };
+                  that.scheduleZone[index].total += 1;
+                  }
+              }
+          });
+        }else{
+          this.getSchedules()
+        }
+        // return that.scheduleZone()
         // this.closePatientPanel();
       }
       this.creating_schedule = false;
+      this.loading=false
     },
     // 单击选中患者
     clickThis(row, column, cell, event) {