3月27日杨青

src/xt_pages/workforce/appointment.vue

@@ -135,9 +135,9 @@
           <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
           <div>
             <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs">
-          <!-- <el-tab-pane name="lastWeek">
+          <el-tab-pane name="lastWeek">
             <span slot="label"><i class="el-icon-date"></i> 上周 ({{ theWeek.lastWeek }})</span>
-          </el-tab-pane> -->
+          </el-tab-pane>
           <el-tab-pane name="thisWeek">
             <span slot="label"><i class="el-icon-date"></i> 本周 ({{ theWeek.thisWeek }})</span>
           </el-tab-pane>

src/xt_pages/workforce/components/editTableData.vue

@@ -1860,7 +1860,7 @@ export default {
       modes: [],
       patientList: [],
       all_patients: [],
-
+      systemDate:'',
       mode_select: [
         {
           value: "1",
@@ -3220,8 +3220,9 @@ export default {
     },
     // 删除某一单元格内的患者透析排班
     deletePatientMode(row) {
-        if (row.schedule_id > 0) {
-          console.log('22222222');
+      console.log('12345566',this.cur_drag_info, this.systemDate);
+        if (row.schedule_id > 0 && this.cur_drag_info.schedule_date >= this.systemDate) {
+          console.log('22222222',this.cur_drag_info.schedule_date >= this.systemDate);
           this.CancelSchedule(row.schedule_id);
         }
         console.log('deletePatientMode',row);
@@ -3289,16 +3290,27 @@ export default {
             id : row[key].schedule_id,
             partition_type : row.zone_type,
           }
-          console.log('this.currentData的数据',this.currentData);
+          // let nowDate = new Date();
+          // let date = {
+          //       year: nowDate.getFullYear(),
+          //       month: nowDate.getMonth() + 1,
+          //       date: nowDate.getDate(),
+          //     }
+          //   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('123453545',this.systemDate);
           // 当表格有数据
           if ( row[key].mode_id > 0 || row[key].patient_id > 0) {
             // 且是表格数据拖拽
             if (this.cur_drag_obj == 2){
-              if(row[key].patient_id != this.cur_drag_info.patient_id){
-                console.log('row[key].patient_id',row[key].patient_id,
-                     'this.cur_drag_info.partition_id',this.cur_drag_info.patient_id);
-                this.tipDialogVisible = true
-              }else{
+              if (row[key].patient_id != this.cur_drag_info.patient_id ) {
+                if( this.currentData.schedule_date >= this.systemDate ){
+                  this.tipDialogVisible = true
+                }
+              } else {
                 this.tipDialogVisible = false
               }
             }else{
@@ -3692,7 +3704,7 @@ export default {
           ) {
             return "hover-td schedule-table-cell-disable";
           } else {
-            return "schedule-table-cell-disable";
+            return "";
           }
         }
       }
@@ -5700,6 +5712,8 @@ export default {
       day = "0" + day;
     }
     var nowDate = year + "-" + month + "-" + day;
+    this.systemDate=nowDate
+    console.log('当前时间',nowDate);
     var date = new Date(nowDate + " 00:00:00");
 
     this.now_time = date.getTime() / 1000;

src/xt_pages/workforce/components/historyWeekTable.vue

@@ -1126,11 +1126,13 @@ export default {
             // return "schedule-table-cell-disable";
           }else {
             if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover){
-              return 'hover-td'
+              return 'hover-td '
             }else {
               return ''
             }
           }
+        }else if(this.weekTime == "historyWeek"){
+          return 'schedule-table-cell-disable'
         }
       }
       return "";

src/xt_pages/workforce/components/tableData.vue

@@ -528,7 +528,6 @@
                 v-model="changeSchedule.bed_id"
                 placeholder="请选择"
                 style="width: 100%"
-               
             >
             <!--  @change="changeScheduledialyzer" -->
               <el-option
@@ -749,13 +748,14 @@ export default {
       },
 
       tiaozhengclass: "tiaozhengclass",
+      // 调整机号表单验证
       changeRules: {
         mode_id: [{ required: true, message: "请选择模式", trigger: "blur" }],
         schedule_type: [
           { required: true, message: "请选择班次", trigger: "blur" }
         ],
         partition_id: [
-          { required: true, message: "请选择病房", trigger: "blur" }
+          { required: true, message: "请选择分区", trigger: "blur" }
         ],
         bed_id: [{ required: true, message: "请选择透析机", trigger: "blur" }]
       },
@@ -1274,7 +1274,7 @@ export default {
             // return "schedule-table-cell-disable";
           }else {
             if(row[column.property].patient_id > 0 && row[column.property].patient_id == this.patient_id_hover){
-              return 'hover-td'
+              return 'hover-td '
             }else {
               return ''
             }
@@ -2531,42 +2531,9 @@ export default {
               break
             }
           }
-
-          // 可能
-          // 患者有传染病，与选择的机器类型（传染病）不匹配
-          // 患者没有传染病，但机器是某个传染病的专用透析器
-          // 机器的透析模式与患者不匹配
-
-          // if (this.currentData.contagions.length > 0) {
-          //   var cflag = false
-          //   for (var index in this.currentData.contagions) {
-          //     if (this.currentData.contagions[index].disease_id == this.changeSchedule.partition_type) {
-          //       cflag = true
-          //     }
-          //   }
-          //   if (!cflag) {
-          //     this.$confirm('此患者有传染病，与此透析机不匹配，确定在此排班吗?', '提示', { confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning' })
-          //       .then(() => {
-          //
-          //       }).catch(() => {
-          //       })
-          //   } else {
-          //     this.changeSchedule.change_action = 'change_device'
-          //     this.changeScheduleActon(formName)
-          //   }
-          // } else if (this.changeSchedule.partition_type > 1) {
-          //   this.$confirm('此患者没有传染病，与此透析机不匹配，确定在此排班吗?', '提示', { confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning' })
-          //     .then(() => {
-          //       this.changeSchedule.change_action = 'change_device'
-          //       this.changeScheduleActon(formName)
-          //     }).catch(() => {
-          //     })
-          // } else {
-          //   this.changeSchedule.change_action = 'change_device'
-          //   this.changeScheduleActon(formName)
-          // }
         }
       })
+      // this.$refs.changeSchedule.resetFields()
     },
     //  搜索弹窗操作调整模式确认按钮
     submitMode(formName) {