9月19日杨青

src/xt_pages/outpatientCharges/invoicePrint.vue

         type="primary"
       >打印</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375"><!---->
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 "><!---->
         <div class='dialysisPage'>
           <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387" >
             <printOne v-if="org_id != 10088 &&  org_id != 0 " :paramsObj="invoiceParams"></printOne>
-            <printThree v-if="org_id == 10088 || org_id == 0" :paramsObj="invoiceParams"></printThree>
+            <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams"></printThree>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
       </div>
     </div>
 
-    <div class="app-container" style="" v-if="org_id == 10217 ">
+    <div class="app-container" style="" v-if="org_id == 10217 || org_id == 0">
       <div class='dialysisPage'>
         <printSix :paramsObj="invoiceParams"></printSix>
       </div>

src/xt_pages/workforce/components/editTableData.vue

               min-width="60"
               align="center"
               fixed
-              
+
           ></el-table-column>
           <el-table-column
               prop="cut"
               min-width="50"
               align="center"
               fixed
-              
+
           ></el-table-column>
           <el-table-column
               :label="'周一 (' + weekTitle[0] + ')'"
           </el-option>
         </el-select>
 
-       
+
       </div>
       <span slot="footer" class="dialog-footer" style="text-align: center">
         <el-button
           <el-form-item label="" prop="mode_id">
             <span>透析模式:</span>
             <el-select
-               filterable 
+               filterable
                 v-model="changeSchedule.mode_id"
                 placeholder="请选择"
                 style="width: 100%"
               </el-option>
             </el-select>
           </el-form-item>
-          
+
           <!-- <el-form-item>
             <span>透析班次:</span>
             <el-select
-                filterable 
+                filterable
                 v-model="changeSchedule.schedule_type"
                 placeholder="请选择"
                 style="width: 100%"
               </el-option>
             </el-select>
           </el-form-item>
-        
+
           <el-form-item>
             <span>透析分区:</span>
             <el-select
-            filterable 
+            filterable
               v-model="changeSchedule.partition_id"
               placeholder="请选择"
               style="width: 100%"
           <el-form-item>
             <span>透析床位:</span>
             <el-select
-               filterable 
+               filterable
                 v-model="changeSchedule.bed_id"
                 placeholder="请选择"
                 style="width: 100%"
         <el-button @click="tipDialogVisibleThree = false">取 消</el-button>
       </span>
     </el-dialog>
-    
+
   </div>
 </template>
 
       }else{
         this.cur_info.contagions = []
       }
-     
+
       this.patient_id_hover = row.id
     },
     // 选择透析模式
               id : row[key].schedule_id,
               contagions: row[key].patient_contagions,
             }
+            console.log('4444444',row[key].schedule_id);
           }else{
             this.cur_drag_obj = 3
             this.cur_drag_info={
           this.$message.error(response.data.msg);
           this.tipDialogVisibleTwo = false
         } else {
+          console.log('11111111111',response.data);
           this.$message.success("替换成功");
           this.tipDialogVisible = false
           this.tipDialogVisibleTwo = false
           this.getSchedules();
         }
       });
+
     },
     // 交换位置
     changeSchTwo(){
             this.$message.error(response.data.msg);
             this.tipDialogVisibleThree = false
           } else {
+            console.log('22222222',response.data);
             this.$message.success("交换成功");
             this.tipDialogVisible = false
             this.tipDialogVisibleThree = false
             id : row[key].schedule_id,
             partition_type : row.zone_type,
           }
+          console.log('ffffffffffff',this.currentData);
           // let nowDate = new Date();
           // let date = {
           //       year: nowDate.getFullYear(),
           //   let Month=date.month<10 ? '0'+ date.month :  date.month
           //   let Dateday= date.date<10 ? '0'+date.date : date.date
           //   this.systemDate = date.year + '-'+ Month + '-'+ Dateday;
-          // console.log('this.currentData的数据',this.currentData);
-          // console.log('this.cur_drag_info的数据',this.cur_drag_info);
+          console.log('this.currentData的数据',row[key].patient_id);
+          console.log('this.cur_drag_info的数据',key);
           // console.log('123453545',this.systemDate);
           // 当表格有数据
           if ( row[key].mode_id > 0 || row[key].patient_id > 0) {
                       that.currentData.patient_id = that.cur_drag_info.patient_id
                       that.currentData.patient = that.cur_drag_info.patient_name
                        that.currentData.contagions = that.cur_drag_info.contagions
-                        console.log("中国hshshshshhs",that.cur_drag_info.contagions)
+                        console.log("中国hshshshshhs",that.cur_drag_info.id)
+
 
-                      
                         that.setScheduleTwo(this.cur_drag_info.id);
                 }
               }else{ // 非同一天
         }
       }
     },
-    
+
     // 左边栏选中名字和模式拖动结束后
     taskDraggerEnd(e) {},
     //move回调方法
         //
         return "table-row-new-class schedule-table-row Infectious_disease";
       }
-      // if(columnIndex==1 ){  
-      //   return 'border_bott ' 
+      // if(columnIndex==1 ){
+      //   return 'border_bott '
       // }
       // if(columnIndex==0){
       //   return 'border_left'
                 row[column.property].patient_id == this.patient_id_hover
             ) {
               return "hover-td schedule-table-cell-disable";
-            } 
+            }
             // if(column.label == '晚'){
             //   return 'evening_border schedule-table-cell-disable'
             // }
     //       // console.log('33333333333');
     //       return 'border-top: 1px solid aqua;'
     //     }
-    //   } 
+    //   }
     // },
     // 单元格的患者名称的回调方法
     patientClass({row,column, rowIndex,columnIndex}){
         this.currentData.contagions = row.contagions;
       }
     },
-    // 取消关闭弹窗
-    // closePatientPanel() {
-    //   this.dialogTableVisible = false;
-    //   this.currentData.patient_id = 0;
-    // },
+
     getSchedules() {
       var partionStr = this.partition_id;
+      console.log('66665555',partionStr);
       var arr = this.zoneIdList.join(",");
+      console.log('ccccccc',this.zoneIdList);
       var str = "";
       if (partionStr == 0) {
         str = arr;
       if (partionStr != 0) {
         str = partionStr.join(",");
       }
+      console.log('qqqqqqq',str);
       const params = {
         weekTime: this.theType,
         patitionid: str,
       getSchedulesOne(params).then((response) => {
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
-
+          console.log('999990000',response.data.data);
           this.weekDays = response.data.data.days;
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
               });
               // this.msDialogVisible = false;
               // this.getAllZones()
-             
+
             }
             this.changing_mode = false;
           }).catch((err) => {
         default:
           break;
       }
-    },    
+    },
     setScheduleTwo(id_two) {
       console.log("1112222222",this.currentData.contagions.length)
       var that = this;
             cflag = true;
           }
         });
-      
+
         if (!cflag) {
           this.$confirm(
               "此患者有传染病，与此透析机不匹配，确定在此排班吗?",
         } else {
           this.CreateSchedule(this.currentData.patient_id, this.currentData);
         }
-        
+
       } else if (that.currentData.partition_type > 1) {
         this.$confirm(
             "此患者没有传染病，与此透析机不匹配，确定在此排班吗?",
         )
             .then(() => {
               this.CreateSchedule(this.currentData.patient_id, this.currentData);
-              
+
             })
             .catch(() => {
               this.dialogTableVisible=false
     this.partitions = this.partitionsProp;
 
     var contagions = this.$store.getters.contagions;
- 
+
     if (contagions.length > 0) {
       var that = this;
       contagions.forEach(function (citem) {
 .border_left{
   border-left: 1px solid aqua !important;
 }
- 
+
 .evening_border{
   border-right: 1px solid aqua !important;
 }