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>
@@ -336,7 +336,7 @@ export default {
 
           this.$refs.tableDataZero.start()
         })
-        console.log('12343545',this.$refs.tableDataZero);
+        // console.log('12343545',this.$refs.tableDataZero);
       }else{
         this.showtable=false
         this.showtableOne=true

src/xt_pages/workforce/components/editTableData.vue

@@ -149,14 +149,14 @@
           <el-table-column
               prop="area"
               label="分区"
-              min-width="50"
+              min-width="60"
               align="center"
               fixed
           ></el-table-column>
           <el-table-column
               prop="cut"
               label="机号"
-              min-width="40"
+              min-width="50"
               align="center"
               fixed
           >
@@ -166,7 +166,7 @@
               v-if="isShowOne"
               align="center"
           >
-            <el-table-column prop="Mon_M" label="上" width="110" align="center">
+            <el-table-column prop="Mon_M" label="上" min-width="50" align="center">
               <template slot-scope="scope">
                 <div class="del_table_btn">
                   <!-- 排班表取消排班按钮  v-if="showclickIcon==true&&scope.row.id==rowid"-->
@@ -210,7 +210,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="Mon_A" label="下" min-width="40" align="center">
+            <el-table-column prop="Mon_A" label="下" min-width="50" align="center">
               <template slot-scope="scope">
                 <div class="del_table_btn">
                   <el-button
@@ -256,7 +256,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="Mon_N" label="晚" min-width="40" align="center">
+            <el-table-column prop="Mon_N" label="晚" min-width="50" align="center">
               <template slot-scope="scope">
                 <div class="del_table_btn">
                   <el-button
@@ -308,7 +308,7 @@
               v-if="isShowTwo"
               align="center"
           >
-            <el-table-column prop="Tue_M" label="上" min-width="40" align="center">
+            <el-table-column prop="Tue_M" label="上" min-width="50" align="center">
               <template slot-scope="scope">
                 <div class="del_table_btn">
                   <el-button
@@ -353,7 +353,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="Tue_A" label="下" min-width="40" align="center">
+            <el-table-column prop="Tue_A" label="下" min-width="50" align="center">
               <template slot-scope="scope">
                 <div class="del_table_btn">
                   <el-button
@@ -397,7 +397,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="Tue_N" label="晚" min-width="40" align="center">
+            <el-table-column prop="Tue_N" label="晚" min-width="50" align="center">
               <template slot-scope="scope">
                 <div class="del_table_btn">
                   <el-button
@@ -448,7 +448,7 @@
               v-if="isShowThree"
               align="center"
           >
-            <el-table-column prop="Wed_M" label="上" min-width="40" align="center">
+            <el-table-column prop="Wed_M" label="上" min-width="50" align="center">
               <template slot-scope="scope">
                 <div class="del_table_btn">
                   <el-button
@@ -492,7 +492,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="Wed_A" label="下" min-width="40" align="center">
+            <el-table-column prop="Wed_A" label="下" min-width="50" align="center">
               <template slot-scope="scope">
                 <div class="del_table_btn">
                   <el-button
@@ -536,7 +536,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="Wed_N" label="晚" min-width="40" align="center">
+            <el-table-column prop="Wed_N" label="晚" min-width="50" align="center">
               <template slot-scope="scope">
                 <div class="del_table_btn">
                   <el-button
@@ -586,7 +586,7 @@
               align="center"
               v-if="isShowFour"
           >
-            <el-table-column prop="Thurs_M"  label="上" min-width="40" align="center"
+            <el-table-column prop="Thurs_M"  label="上" min-width="50" align="center"
             >
               <template slot-scope="scope">
                 <div class="del_table_btn">
@@ -634,7 +634,7 @@
             <el-table-column
                 prop="Thurs_A"
                 label="下"
-                min-width="40"
+                min-width="50"
                 align="center"
             >
               <template slot-scope="scope">
@@ -684,7 +684,7 @@
             <el-table-column
                 prop="Thurs_N"
                 label="晚"
-                min-width="40"
+                min-width="50"
                 align="center"
             >
               <template slot-scope="scope">
@@ -733,11 +733,10 @@
           </el-table-column>
           <el-table-column
               :label="'周五 (' + weekTitle[4] + ')'"
-
               align="center"
               v-if="isShowFive"
           >
-            <el-table-column prop="Fri_M" label="上" min-width="40" align="center"
+            <el-table-column prop="Fri_M" label="上" min-width="50" align="center"
 >
               <template slot-scope="scope">
                 <div class="del_table_btn">
@@ -780,7 +779,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="Fri_A" label="下" min-width="40" align="center">
+            <el-table-column prop="Fri_A" label="下" min-width="50" align="center">
               <template slot-scope="scope">
                 <div class="del_table_btn">
                   <el-button
@@ -820,7 +819,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="Fri_N" label="晚" min-width="40" align="center">
+            <el-table-column prop="Fri_N" label="晚" min-width="50" align="center">
               <template slot-scope="scope">
                 <div class="del_table_btn">
                   <el-button
@@ -871,7 +870,7 @@
               align="center"
               v-if="isShowSix"
           >
-            <el-table-column prop="Sat_M" label="上" min-width="40" align="center">
+            <el-table-column prop="Sat_M" label="上" min-width="50" align="center">
               <template slot-scope="scope">
                 <div class="del_table_btn">
                   <el-button
@@ -915,7 +914,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="Sat_A" label="下" min-width="40" align="center">
+            <el-table-column prop="Sat_A" label="下" min-width="50" align="center">
               <template slot-scope="scope">
                 <div class="del_table_btn">
                   <el-button
@@ -959,7 +958,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="Sat_N" label="晚" min-width="40" align="center">
+            <el-table-column prop="Sat_N" label="晚" min-width="50" align="center">
               <template slot-scope="scope">
                 <div class="del_table_btn">
                   <el-button
@@ -1012,7 +1011,7 @@
             <el-table-column
                 prop="Sun_M"
                 label="上"
-                min-width="40"
+                min-width="50"
                 align="center"
             >
               <template slot-scope="scope">
@@ -1060,7 +1059,7 @@
             <el-table-column
                 prop="Sun_A"
                 label="下"
-                min-width="40"
+                min-width="50"
                 align="center"
             >
               <template slot-scope="scope">
@@ -1108,7 +1107,7 @@
             <el-table-column
                 prop="Sun_N"
                 label="晚"
-                min-width="40"
+                min-width="50"
                 align="center"
             >
               <template slot-scope="scope">
@@ -3221,14 +3220,8 @@ export default {
     },
     // 删除某一单元格内的患者透析排班
     deletePatientMode(row) {
-      var week = this.weekDay(column.property);
-        if (week[0] == -1 || week[1] == -1) {
-          return false;
-        }
-        if (this.toDay > this.weekDays[week[0] - 1]) {
-          return false;
-        }
         if (row.schedule_id > 0) {
+          console.log('22222222');
           this.CancelSchedule(row.schedule_id);
         }
         console.log('deletePatientMode',row);
@@ -3652,9 +3645,8 @@ export default {
 
     // 单元格的 className 的回调方法
     cellClass({ row, column, rowIndex, columnIndex }) {
-      // console.log('cellClass戴护具',row);
       // 传染病区机器橙色背景
-      if(columnIndex==1&&row.zone_type==2){
+      if(columnIndex==1&&row.zone_type!=1){
         //
         return "table-row-new-class schedule-table-row Infectious_disease";
       }
@@ -5659,7 +5651,6 @@ export default {
     },
     // 分区选择框
     changePartiton(val) {
-
       this.$emit("event1", val);
       this.partition_id = val;
       this.getWeekPanels();
@@ -5885,7 +5876,7 @@ textarea{
   color: red !important;
 }
 .Infectious_disease{
-  background-color: orange !important;
+  background-color: red !important;
   color: white;
 }
 .del_table_btn {

src/xt_pages/workforce/components/historyWeekTable.vue

@@ -842,7 +842,7 @@ export default {
          }
         // 第几周，星期几
         getWeekPanelsOne(1,str).then(response => {
-          console.log('wertwetr',response.data.data);
+          // console.log('wertwetr',response.data.data);
           if (response.data.state == 0) {
             return false
           }
@@ -1092,14 +1092,14 @@ export default {
 
           this.scheduleZone.sort(this.compare('sort'))
           this.source_scheduleZone = this.scheduleZone
-          console.log("34455555566666",this.source_scheduleZone)
+          // console.log("34455555566666",this.source_scheduleZone)
           this.getSchedules()
         })
      },
 
     cellClass({ row, column, rowIndex, columnIndex }) {
 
-      if(columnIndex==1&&row.zone_type==2){
+      if(columnIndex==1&&row.zone_type!=1){
         // console.log(columnIndex,row.zone_type);
         return "table-row-new-class schedule-table-row Infectious_disease";
       }
@@ -2807,8 +2807,6 @@ export default {
 
       // this.getSchedules()
       // this.getWeekPanels()
-
-     
     },
     changeSchedule_type(val) {
       this.$emit('event2', val)
@@ -2838,11 +2836,12 @@ export default {
 
       this.newDay.push(this.start_time)
       this.newDay.push(this.end_time)
-
-      console.log('44444',this.start_time)
-      console.log('555555',this.end_time )
-      console.log('666666',this.newDay);
-      this.getSchedules()
+      
+      // this.$nextTick(() => {
+        this.getSchedules()
+        // this.source_scheduleZone=[]
+      // })
+      
     },
     // 选择周次
     start(){
@@ -2855,14 +2854,13 @@ export default {
     // 本周日的日期
       date.setDate(date.getDate() + 6);
       thisweek.end_day = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
-      console.log('asdfgdsafg',thisweek.start_day,thisweek.end_day);
+      // console.log('asdfgdsafg',thisweek.start_day,thisweek.end_day);
 
       var date = new Date();
       // 上上周一的日期
       date.setDate(date.getDate()-14 - date.getDay() + 1);
       var month=(date.getMonth() + 1)<10 ? "0"+(date.getMonth()+1):(date.getMonth()+1)
       var day=(date.getDate())<10 ? "0"+(date.getDate()):(date.getDate())
-      console.log('wqertwetwe',month);
       this.start_time = date.getFullYear() + "-" + month + "-" + day + " 00:00:00";
 
       // 上上周日的日期
@@ -2870,12 +2868,11 @@ export default {
       var month=(date.getMonth() + 1)<10 ? "0"+(date.getMonth()+1):(date.getMonth()+1)
       var day=(date.getDate())<10 ? "0"+(date.getDate()):(date.getDate())
       this.end_time = date.getFullYear() + "-" + month + "-" + day + ' 23:59:59';
-      console.log('1234566',this.lastweek.start_day,this.lastweek.end_day) ;
-      this.getAllZones()
-      // this.getSchedules()
+      // console.log('1234566',this.lastweek.start_day,this.lastweek.end_day) ;
+      // this.getAllZones()
+      this.getSchedules()
     },
     getSchedules(){
-
       var partionStr = this.partition_id
       var arr = this.zoneIdList.join(',')
       var str = ""
@@ -2889,27 +2886,21 @@ export default {
         is_before:1,
         start_time: this.start_time  ,
         end_time:this.end_time  ,
-        // start_time: this.lastweek.start_day + " 00:00:00",
-        // end_time: this.lastweek.end_day + ' 23:59:59',
         weekTime: this.theType,
         patitionid: str,
         schedule_type: this.schedule_type,
       }
-     console.log("str--------",str)
+    //  console.log("str--------",str)
       getSchedulesOne(params).then(response => {
-        console.log('getSchedulesOne',response.data.data);
+        // console.log('getSchedulesOne',response.data.data);
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
           this.weekTitle = []
 
-
-
-
           var first = this.getTimestamp(this.start_time)
           var first_day =  this.getTime(first, "{y}-{m}-{d}")
           this.weekTitle.push(first_day)
 
-
           var second = this.getTimestamp(this.start_time) + 86400
           var soncond_day =  this.getTime(second, "{y}-{m}-{d}")
            this.weekTitle.push(soncond_day)
@@ -2918,34 +2909,23 @@ export default {
           var three_day =  this.getTime(three, "{y}-{m}-{d}")
           this.weekTitle.push(three_day)
 
-
           var four = this.getTimestamp(this.start_time) + 259200
           var four_day =  this.getTime(four, "{y}-{m}-{d}")
-
            this.weekTitle.push(four_day)
 
           var five = this.getTimestamp(this.start_time) + 345600
           var five_day =  this.getTime(five, "{y}-{m}-{d}")
-
           this.weekTitle.push(five_day)
 
           var six = this.getTimestamp(this.start_time) + 432000
           var six_day =  this.getTime(six, "{y}-{m}-{d}")
-
           this.weekTitle.push(six_day)
 
-
           var seven = this.getTimestamp(this.start_time) + 518400
           var seven_day =  this.getTime(seven, "{y}-{m}-{d}")
-
           this.weekTitle.push(seven_day)
 
-
-
-
-          console.log("this.weekTitle",this.weekTitle)
-
-
+          // console.log("this.weekTitle",this.weekTitle)
 
           this.weekDays = response.data.data.days;
 
@@ -2956,9 +2936,6 @@ export default {
 
           var that = this;
 
-       
-
-
          this.scheduleZone.forEach(function (zone, index) {
 
             that.scheduleZone[index].Mon_M = {
@@ -3188,7 +3165,7 @@ export default {
           });
 
           this.source_scheduleZone = this.scheduleZone
-          console.log("历史aaaa", this.scheduleZone)
+          // console.log("历史aaaa", this.scheduleZone)
         } else {
           this.$message.error("网络错误");
           return false;
@@ -3197,7 +3174,7 @@ export default {
     },
     getTimestamp(time) {
       //把时间日期转成时间戳
-      console.log("日期", new Date(time));
+      // console.log("日期", new Date(time));
       return new Date(time).getTime() / 1000;
     },
 
@@ -3336,7 +3313,7 @@ textarea{
     color: #fff;
   }
   .Infectious_disease{
-    background-color: #f78930 !important;
+    background-color: red !important;
     color: white;
   }
 }

src/xt_pages/workforce/components/tableData.vue

@@ -528,7 +528,9 @@
                 v-model="device_id"
                 placeholder="请选择"
                 style="width: 100%"
+               
             >
+            <!--  @change="changeScheduledialyzer" -->
               <el-option
                   v-for="item in current_devices"
                   :key="item.id"
@@ -1247,8 +1249,7 @@ export default {
 
     cellClass({ row, column, rowIndex, columnIndex }) {
 
-      if(columnIndex==1&&row.zone_type==2){
-        // console.log(columnIndex,row.zone_type);
+      if(columnIndex==1&&row.zone_type!=1){
         return "table-row-new-class schedule-table-row Infectious_disease";
       }
 
@@ -2662,7 +2663,7 @@ export default {
         }
       });
     },
-
+    // 调整机号/选择分区
     changePartition(value) {
       let params = {
         zone_id: value,
@@ -2672,6 +2673,7 @@ export default {
       };
       //进行网络请求，获取空排班机位
       getSmartDevices(params).then((response) => {
+        console.log('getSmartDevices',response.data.data);
         if (response.data.state == 0) {
           return false;
         } else {
@@ -2684,6 +2686,7 @@ export default {
         }
       });
     },
+    // 调整机号/选择班次
     changeScheduleType(schedule_type) {
       this.currentData.schedule_type = schedule_type
       let params = {
@@ -2705,57 +2708,6 @@ export default {
 
         }
       });
-      // const params = {
-      //   type: schedule_type,
-      //   date: this.currentData.schedule_date
-      // };
-      // getUrgentScheduleInitData(params)
-      //   .then(rs => {
-      //     if (rs.data.state == 1) {
-      //       this.origin_schedules = rs.data.data.schedules;
-      //       this.origin_device_numbers = rs.data.data.device_numbers;
-      //
-      //       var zone_device_map = {};
-      //       for (
-      //         let index = 0;
-      //         index < this.origin_device_numbers.length;
-      //         index++
-      //       ) {
-      //         const device_number = this.origin_device_numbers[index];
-      //         if (
-      //           zone_device_map[device_number.zone_name] == null ||
-      //           zone_device_map[device_number.zone_name] == undefined
-      //         ) {
-      //           zone_device_map[device_number.zone_name] = [];
-      //         }
-      //         zone_device_map[device_number.zone_name].push(device_number);
-      //       }
-      //       this.zone_device_map = zone_device_map;
-      //
-      //       this.zone_names = Object.keys(this.zone_device_map);
-      //       // console.log('8989898989898989',this.zone_names)
-      //
-      //       // console.log(this.current_devices);
-      //
-      //       if (this.zone_names.length > 0) {
-      //         this.zone_name = this.zone_names[0];
-      //         this.current_devices = this.zone_device_map[this.zone_name];
-      //         this.device_id = this.current_devices[0].id;
-      //       }
-      //
-      //
-      //       this.zone_device_options = [
-      //         { values: this.zone_names },
-      //         // { values: this.getDeviceNumberNames(this.current_devices) },
-      //         { values: this.current_devices }
-      //       ];
-      //
-      //     } else {
-      //     }
-      //   })
-      //   .catch(err => {
-      //     this.loading = false;
-      //   });
     },
     submitTiaoX() {
       if (this.tiaoZhengType == 1) {
@@ -2831,7 +2783,6 @@ export default {
                   }
                   this.zone_device_options = [
                     { values: this.zone_names },
-                    // { values: this.getDeviceNumberNames(this.current_devices) },
                     { values: this.current_devices }
                   ];
 
@@ -3404,7 +3355,7 @@ textarea{
     color: #fff;
   }
   .Infectious_disease{
-    background-color: #f78930 !important;
+    background-color: red !important;
     color: white;
   }
 }

src/xt_pages/workforce/components/template_table.vue

@@ -4487,7 +4487,7 @@ export default {
     // 右侧表格的列回调
     cellClass({row,column, rowIndex, columnIndex}){
       // console.log('cellClass数据',row);
-      if(columnIndex==1&&row.zone.type==2){
+      if(columnIndex==1&&row.zone.type!=1){
         //
         return "table-row-new-class schedule-table-row Infectious_disease";
       }
@@ -4574,7 +4574,7 @@ export default {
     padding: 0 0px !important;
   }
   .Infectious_disease{
-  background-color: orange !important;
+  background-color: red !important;
   color: white;
 }
   .el-table--medium td, .el-table--medium th {