3月23日杨青

src/xt_pages/workforce/components/editTableData.vue

@@ -1,25 +1,17 @@
 <template>
-  <!-- 编辑排班 -->
-  <div id="edit_table_data" v-show="schedulingTableVisible" >
-    <slot></slot>
-    <div class="table_contain"
-        v-if="
+  <!-- <div> -->
   <!-- 编辑排班 -->
   <div id="edit_table_data" v-show="schedulingTableVisible" >
     <slot></slot>
     <div class="table_contain">
       <!-- 左侧 -->
       <div class="left_contain">
-        <div
-            class="cell clearfix"
+        <div class="cell clearfix"
             v-if="
             weekTime == 'thisWeek' ||
             weekTime == 'nextWeek' ||
             weekTime == 'nextTwoWeek'
           ">
-      <!-- 左侧 -->
-      <div class="left_contain">
-        <div class="cell clearfix">
           <el-input
               size="small"
               style="width: 160px"
@@ -36,8 +28,6 @@
               @click="search"
           >搜索</el-button>
 
-          >搜索</el-button>
-
         </div>
         <div style="margin-bottom: 10px; display: flex">
           <h3 style="line-height: 45px">
@@ -215,9 +205,7 @@
                         scope.row.index,
                         scope.row.Mon_M,
                         scope.row
-                      )"
-
-                  >
+                      )" >
                   </schedule-item>
                 </div>
               </template>
@@ -1018,7 +1006,6 @@
           </el-table-column>
           <el-table-column
               :label="'周日 (' + weekTitle[6] + ')'"
-
               align="center"
               v-if="isShowSeven"
           >
@@ -1064,13 +1051,7 @@
                         scope.row.index,
                         scope.row.Sun_M,
                         scope.row
-                      )
-                    "
-                    :schedule-detail="scope.row.Sun_M"
-                      class="contitem"
-                      :style="{ cursor: scope.row.Sun_M ? 'move' : 'default' }"
-
-                  >
+                      )">
                     </schedule-item
                   >
                 </div>
@@ -1177,7 +1158,6 @@
         </el-table>
       </div>
     </div>
-
    <!-- 单击排班表格的空白单元格弹窗 -->
     <el-dialog
         title="排班"
@@ -1186,9 +1166,7 @@
         :v-model="dialog"
         v-loading="creating_schedule"
         :modal-append-to-body='false'
-
-        :modal-append-to-body='false'
-
+        :close-on-click-modal="false"
     >
       <div>
         <div class="cell clearfix">
@@ -1708,14 +1686,13 @@
         <el-button @click="tipDialogVisibleThree = false">取 消</el-button>
       </span>
     </el-dialog>
-
-
-  </div>
+    
+</div>
 </template>
 
 <script>
 import { uParseTime } from "@/utils/tools";
-import print from "print-js";
+// import print from "print-js";
 import draggable from "vuedraggable";
 const moment = require("moment");
 import {
@@ -1792,10 +1769,6 @@ export default {
       type: Array,
       dafault: [],
     },
-    // scheduleZoneProp: {
-    //   type: Array,
-    //   dafault: []
-    // },
     partitionsProp: {
       type: Object,
       dafault: {},
@@ -2221,9 +2194,6 @@ export default {
 
           }
         }
-
-
-
       } else {
         for (let i = 0; i < this.weeks.length; i++) {
           this.weeks[i].is_edit = true;
@@ -2764,8 +2734,6 @@ export default {
       }
     },
     getWeekType(date) {
-
-
       let index = 0;
       for (let i = 0; i < this.days.length; i++) {
         if (date == this.days[i]) {
@@ -3068,10 +3036,6 @@ export default {
       }
 
       this.current_all_sch = this.editableTabs
-
-
-
-
     },
     // 左侧的拖拽内容
     curInfoDragStart(){
@@ -3111,7 +3075,6 @@ export default {
       var date = new Date(nowDate + " 00:00:00")
       this.cur_date = date.getTime()/1000
 
-
       this.days = days;
       this.all_zones = zones;
       this.patientList = patients;
@@ -3168,21 +3131,6 @@ export default {
           if(row[key].patient_id > 0){
             this.cur_drag_obj = 2
             var week = this.weekDay(day);
-            this.cur_drag_info={
-              schedule_date : this.weekDays[week[0] - 1],
-              schedule_type : week[1],
-              bed_id : row.jihao_id,
-              partition_id : row.zone_id,
-              schedule_week : week[0],
-              type_name : this.dayType(week[1]),
-              zone_name : row.area,
-              bed_name : row.cut,
-              mode_id : row[key].mode_id,
-              mode_name : row[key].mode_name,
-              patient_name : row[key].patient,
-              patient_id : row[key].patient_id,
-              id : row[key].schedule_id
-            }
             this.cur_drag_info={
               schedule_date : this.weekDays[week[0] - 1],
               schedule_type : week[1],
@@ -3199,8 +3147,6 @@ export default {
               id : row[key].schedule_id,
               contagions: row[key].patient_contagions,
             }
-            console.log( this.cur_drag_info)
-
           }else{
             this.cur_drag_obj = 3
             this.cur_drag_info={
@@ -3287,60 +3233,6 @@ export default {
         }
         console.log('deletePatientMode',row);
     },
-    // 替换
-     // 取消排班
-     CancelSchedule(id) {
-      this.$confirm("确定要取消当前排班?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-            CancelSchedule(id).then((response) => {
-              if (response.data.state == 0) {
-                this.$message.error(response.data.msg);
-              } else {
-                this.$message({
-                  type: "success",
-                  message: "排班已取消!",
-                });
-                var that = this;
-                var schedule = response.data.data.schedule;
-                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: 0,
-                        mode_id: 0,
-                        patient_id: 0,
-                        patient: "",
-                        mode_name: "",
-                        dialysis_machine_name: "",
-                      };
-
-                      that.scheduleZone[index].total -= 1;
-                    }
-                  }
-                });
-              }
-            });
-          })
-          .catch(() => {});
-    },
-    // 删除某一单元格内的患者透析排班
-    deletePatientMode(row) {
-      if (row.schedule_id > 0) {
-        this.CancelSchedule(row.schedule_id);
-      }
-      console.log('deletePatientMode',row);
-    },
     // 替换
     coverSch(){
       this.tipDialogVisible=false
@@ -3378,7 +3270,6 @@ export default {
             this.tipDialogVisible = false
             this.tipDialogVisibleThree = false
             this.getSchedules();
-
           }
         });
     },
@@ -3388,7 +3279,6 @@ export default {
       this.allowDrop(e)
       for (var key in row) {
         if (key == day) {
-          // console.log(this.cur_drag_obj)
           if(this.cur_drag_obj == 3){
             return
           }
@@ -3407,31 +3297,8 @@ export default {
             partition_type : row.zone_type,
           }
           console.log('this.currentData的数据',this.currentData);
-          // console.log('cur_drag_info的数据',this.cur_drag_info);
-          // console.log('row[key]的数据',row[key]);
-          // row[key].patient.length > 0 || row[key].mode_name.length > 0 ||
-          // 当表格有数据
-          if ( row[key].mode_id > 0 || row[key].patient_id > 0) {
-            console.log('row[key]的数据',row[key],this.cur_drag_obj);
-            // 且是表格数据拖拽
-          this.currentData={
-            schedule_date : this.weekDays[week[0] - 1],
-            schedule_type : week[1],
-            bed_id : row.jihao_id,
-            partition_id : row.zone_id,
-            schedule_week : week[0],
-            type_name : this.dayType(week[1]),
-            zone_name : row.area,
-            bed_name : row.cut,
-            id : row[key].schedule_id,
-            partition_type : row.zone_type,
-          }
-          // console.log('cur_drag_info的数据',this.cur_drag_info);
-          // console.log('row[key]的数据',row[key]);
-          // row[key].patient.length > 0 || row[key].mode_name.length > 0 ||
           // 当表格有数据
           if ( row[key].mode_id > 0 || row[key].patient_id > 0) {
-            // console.log('row[key]的数据',row[key],this.cur_drag_obj);
             // 且是表格数据拖拽
             if (this.cur_drag_obj == 2){
               if(row[key].patient_id != this.cur_drag_info.patient_id){
@@ -3441,11 +3308,6 @@ export default {
               }else{
                 this.tipDialogVisible = false
               }
-              if(row[key].patient_id != this.cur_drag_info.patient_id){
-                this.tipDialogVisible = true
-              }else{
-                this.tipDialogVisible = false
-              }
             }else{
               return this.$message.error("当前机号已有排班");
             }
@@ -3455,49 +3317,18 @@ export default {
              if(this.cur_drag_obj == 2){
               if(this.cur_drag_info.schedule_date == this.currentData.schedule_date){ //同一天
                 if(row[key].patient_id == 0) { //空床位
-                  console.log('this.cur_drag_info.id的数据',this.cur_drag_info.id);
-                  CancelScheduleTwo(this.cur_drag_info.id).then((response) => {
-                    console.log('CancelScheduleTwo的数据',response.data.data);
-                    // var response= await CancelScheduleTwo(this.cur_drag_info.id)
-                    if (response.data.state == 0) {
-                      this.$message.error(response.data.msg)
-                    } else {
-                      var that = this;
-                      var schedule = response.data.data.schedule;
-                      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: 0,
-                              mode_id: 0,
-                              patient_id: 0,
-                              patient: "",
-                              mode_name: "",
-                              dialysis_machine_name: "",
-                            };
-                            that.scheduleZone[index].total -= 1;
-                          }
-                        }
-                      });
+                      const that = this;
                       //接口提交排班数据
-                      that.currentData.mode_id = that.cur_drag_info.mode_id,
-                      that.currentData.id = 0,
-                      that.currentData.contagions = [],
-                      that.currentData.patient_id = that.cur_drag_info.patient_id,
-                      that.currentData.patient = that.cur_drag_info.patient_name,
-                      that.setSchedule();
-                    }
-                  });
+                      that.currentData.mode_id = that.cur_drag_info.mode_id
+                      that.currentData.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( that.cur_drag_info.contagions)
+
+                        console.log( that.currentData.contagions)
+                        that.setScheduleTwo(this.cur_drag_info.id);
                 }
-
               }else{ // 非同一天
                 if(row[key].patient_id == 0) { //空床位
                   this.currentData.mode_id = this.cur_drag_info.mode_id;
@@ -3507,10 +3338,8 @@ export default {
                   this.currentData.patient = this.cur_drag_info.patient_name;
                   this.setSchedule();
                 }
-
               }
             }else{
-
               //接口提交排班数据
               this.currentData.mode_id = this.cur_drag_info.mode_id;
               this.currentData.id = 0;
@@ -3523,6 +3352,7 @@ export default {
         }
       }
     },
+    
     // 左边栏选中名字和模式拖动结束后
     taskDraggerEnd(e) {},
     //move回调方法
@@ -3874,9 +3704,8 @@ export default {
           }
         }
       }
-      // return "";
+      return "";
     },
-    // 单击排班表格的空白单元格弹窗搜索
     // 单元格的患者名称的回调方法
     patientClass({row,column, rowIndex,columnIndex}){
       if(this.cur_info.patient_id == row.id){
@@ -4968,7 +4797,50 @@ export default {
       }
       this.creating_schedule = false;
     },
+    async CreateScheduleTwo(id, data,id_two) {
+      this.creating_schedule = true;
+      let response =await CreateScheduleTwo(id, data,id_two)
 
+      if (response.data.state == 0) {
+        this.$message.error(response.data.msg);
+      } else {
+        var that = this;
+        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.closePatientPanel();
+      }
+      this.creating_schedule = false;
+    },
     // 单击选中患者
     clickThis(row, column, cell, event) {
         if (row[column.property].schedule_id > 0) {
@@ -5367,7 +5239,8 @@ export default {
         default:
           break;
       }
-    },    setScheduleTwo(id_two) {
+    },    
+    setScheduleTwo(id_two) {
       console.log("1112222222")
       var that = this;
       // var submitFlag = true;
@@ -5863,6 +5736,7 @@ export default {
       this.weekday = 7;
     }
   },
+
 };
 </script>