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

src/xt_pages/workforce/appointment.vue

@@ -290,7 +290,7 @@
             return false
           }
           var partitions = response.data.data.partitions
-          console.log("分区",partitions)
+          // console.log("分区",partitions)
           this.theWeek.thisWeek = response.data.data.theWeek
           this.theWeek.lastWeek = this.theWeek.thisWeek - 1
           this.theWeek.nextWeek = this.theWeek.thisWeek + 1
@@ -510,14 +510,13 @@
             }
             i++
           }
-          console.log("listw22222222",list)
             var data = []
 
           this.tableList.map(item=>{
             data.push(Object.values(item))
 
           })
-          console.log("data",data)
+        
           
           const filename = '排班模版'
         
@@ -532,8 +531,6 @@
           }
           
           if(this.export_type == 1){
-
-            console.log("44444444",this.tableList)
             //  const multiHeader = [['区号', '机号', '周一'+"("+this.newDay[0]+")" , '', '', '周二'+"("+this.newDay[1]+")", '', '', '周三'+"("+this.newDay[2]+")" , '', '', '周四'+"("+this.newDay[3]+")" , '', '', '周五'+"("+this.newDay[4]+")" , '', '', '周六'+"("+this.newDay[5]+")" , '', '', '周日'+"("+this.newDay[6]+")" , '', '', '周一'+"("+this.days[7]+")" , '', '', '周二'+"("+this.days[8]+")" , '', '', '周三'+"("+this.days[9]+")" , '', '', '周四'+"("+this.days[10]+")" , '', '', '周五'+"("+this.days[11]+")" , '', '', '周六'+"("+this.days[12]+")" , '', '', '周日'+"("+this.days[13]+")", '', '', '周一'+"("+this.days[14]+")", '', '', '周二'+"("+this.days[15]+")", '', '', '周三'+"("+this.days[16]+")", '', '', '周四'+"("+this.days[17]+")", '', '', '周五'+"("+this.days[18]+")", '', '', '周六'+"("+this.days[19]+")", '', '', '周日'+"("+this.days[20]+")", '', '']]
             //  const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
             //  const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
@@ -569,7 +566,7 @@
               data.push(Object.values(item))
 
             })
-            console.log("data",data)
+            // console.log("data",data)
             
             const filename = '排班模版'
            
@@ -596,7 +593,7 @@
           const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
 
           var data = []
-          console.log("33333",this.tableList)
+          // console.log("33333",this.tableList)
          
          this.tableList.map(item=>{
            data.push(Object.values(item))
@@ -621,10 +618,7 @@
       formatJson(filterVal, jsonData) {
         return jsonData.map(v =>
           filterVal.map(j => {
-            console.log(v)
-            console.log(j)
-            console.log(v[j])
-
+        
             if (j === 'timestamp') {
               return parseTime(v[j])
             } else {
@@ -2133,11 +2127,11 @@
               partition_id:this.partition_id,
               schedule_type:this.schedule_type
             }
-           console.log("params2222",params)
+          //  console.log("params2222",params)
          getThreeWeekList(params).then(response=>{
            if(response.data.state == 1){
              var partitions =  response.data.data.partitions
-             console.log("数据22222",this.partitions)
+            //  console.log("数据22222",this.partitions)
 
              const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
               var list = []
@@ -2305,16 +2299,16 @@
               var lastWeek = []
               var next_start = this.getNextWeekOne(1)
               var nextstart = this.getTimestamp(next_start) - 28800
-              console.log("下周开始时间",nextstart)
+              // console.log("下周开始时间",nextstart)
               var next_end = this.getNextWeek(1)
               var nextend = this.getTimestamp(next_end) - 28800
-              console.log("下周结束时间",nextend)
+              // console.log("下周结束时间",nextend)
               var last_start = this.getNextWeekOne(2)
               var last_end = this.getNextWeek(2)
               var laststart = this.getTimestamp(last_start) - 28800
-              console.log("下下周数据时间",laststart)
+              // console.log("下下周数据时间",laststart)
               var lastend = this.getTimestamp(last_end) - 28800
-              console.log("下下周数据时间",lastend)
+              // console.log("下下周数据时间",lastend)
                
               if(this.export_type == 0){
                 for(let i = 0;i<scheduleList.length;i++){
@@ -2431,7 +2425,7 @@
               }
              }
 
-             console.log("list5555555555",list)
+            //  console.log("list5555555555",list)
 
              if(nextWeek.length > 0 ){
                for(let i=0;i<list.length;i++){
@@ -2534,7 +2528,7 @@
               }
              }
 
-             console.log("nextWeek",nextWeek)
+            //  console.log("nextWeek",nextWeek)
 
              if(lastWeek.length > 0 ){
                for(let i=0;i<list.length;i++){
@@ -2695,7 +2689,7 @@
       
      
 
-         console.log("33333333",this.newDay)
+        //  console.log("33333333",this.newDay)
          this.export_type = 1
          this.getThreeWeekList()
        },
@@ -2773,16 +2767,16 @@
                 let weekOfday = parseInt(moment().format('d')) 
                 start_time =  this.getTimestamp(moment().subtract(weekOfday + 6, 'days').format('YYYY-MM-DD')) -28800
                 end_time =  this.getTimestamp(moment().subtract(weekOfday, 'days').format('YYYY-MM-DD')) -28800
-                console.log("start",start_time)
-                console.log("end",end_time)
+                // console.log("start",start_time)
+                // console.log("end",end_time)
              }
             
             //本周
              if(this.form.lastweek == "2"){
                 start_time = this.getTimestamp(this.weekDayArr[0])
                 end_time = this.getTimestamp(this.weekDayArr[6])
-                console.log("start",start_time)
-                console.log("end",end_time)
+                // console.log("start",start_time)
+                // console.log("end",end_time)
              }
 
             var label = ""
@@ -2801,7 +2795,7 @@
               copy_startime:copy_startime,
               copy_endtime:copy_endtime,
             }
-           console.log("时间",params)
+         
          
            this.$refs[formName].validate(valid=>{
               if(valid){
@@ -2820,11 +2814,11 @@
     },
     created() {
      var start_time = moment().weekday(1).format('YYYY-MM-DD');
-     console.log("开始时间",start_time)
+   
      this.start_time = start_time
 
      var end_time = this.getNextWeek(2)
-     console.log("结束时间222222",end_time)
+   
      this.end_time = end_time
       this.getWeekPanels()
       this.getInitDate()

src/xt_pages/workforce/components/tableData.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="table_data">
-    <!-- <div style="margin-bottom:-30px">
+    <div style="margin-bottom:-30px;margin-left:300px">
       <span>分区：</span>
        <el-select v-model="partition_id" placeholder="请选择" @change="changePartiton">
         <el-option
@@ -10,7 +10,7 @@
           :value="item.id">
          </el-option>
         </el-select>
-       <span style="margin-left:100px">班次：</span>
+       <!-- <span style="margin-left:100px">班次：</span>
        <el-select v-model="schedule_type" placeholder="请选择" @change="changeSchedule_type">
         <el-option
           v-for="item in options"
@@ -18,8 +18,8 @@
           :label="item.name"
           :value="item.id">
          </el-option>
-       </el-select>
-    </div> -->
+       </el-select> -->
+    </div>
    
     <div class="cell clearfix" v-if="weekTime == 'thisWeek' || weekTime == 'nextWeek'  || weekTime == 'nextTwoWeek' ">
       <el-input
@@ -643,10 +643,10 @@ export default {
       type: Array,
       dafault: []
     },
-    scheduleZoneProp: {
-      type: Array,
-      dafault: []
-    },
+    // scheduleZoneProp: {
+    //   type: Array,
+    //   dafault: []
+    // },
     partitionsProp: {
       type: Object,
       dafault: {}
@@ -688,7 +688,7 @@ export default {
       tzDialogVisible: false,
       msDialogVisible: false,
       jhDialogVisible: false,
-      scheduleZone: this.scheduleZoneProp,
+     // scheduleZone: this.scheduleZoneProp,
       scheduleZoneRow: -1,
       partitions: [],
       jihaos: [],
@@ -758,17 +758,24 @@ export default {
         {id:2,name:"下午"},
         {id:3,name:"晚上"},
       ],
-      partition_id:"",
+      partition_id:0,
       schedule_type:"",
       zones:[{id:0,name:"全部"}],
-      theType:""
+      theType:"",
+      scheduleZone:[],
+      theWeek: {
+        lastWeek: 0,
+        thisWeek: 0,
+        nextWeek: 0,
+        nextTwoWeek: 0
+      },
     };
   },
 
   watch: {
     weekTime: function() {
       var theType = this.weekType(this.weekTime);
-      console.log("999999999",theType)
+      // console.log("999999999",theType)
       this.theType = theType
       this.getSchedules();
     },
@@ -789,6 +796,196 @@ export default {
     }
   },
   methods: {
+       getWeekPanels() {
+        this.scheduleZone=[]
+        getWeekPanels(1,this.partition_id).then(response => {
+          if (response.data.state == 0) {
+            return false
+          }
+          var partitions = response.data.data.partitions
+          console.log("分区",partitions)
+          console.log("scheduleZoneRow",this.scheduleZoneRow)
+          this.theWeek.thisWeek = response.data.data.theWeek
+          this.theWeek.lastWeek = this.theWeek.thisWeek - 1
+          this.theWeek.nextWeek = this.theWeek.thisWeek + 1
+          this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
+          var that = this
+          if (partitions.length > 0) {
+            partitions.forEach(function(partition) {
+              if (partition.jihaos.length == 0) {
+                return false
+              }
+              that.scheduleZoneRow.push(partition.jihaos.length)
+
+              that.partitions[partition.id] = partition
+              
+              console.log("partition",partition)
+
+             
+              partition.jihaos.forEach(function(jihao) {
+                var thisPa = {
+                  area: partition.name,
+                  zone_id: partition.id,
+                  zone_type: partition.type,
+                  cut: jihao.number,
+                  jihao_id: jihao.id,
+                  Mon_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Mon_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Mon_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Tue_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Tue_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Tue_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Wed_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Wed_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Wed_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Thurs_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Thurs_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Thurs_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Fri_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Fri_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Fri_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Sat_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Sat_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Sat_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Sun_A: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Sun_N: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  Sun_M: {
+                    schedule_id: 0,
+                    mode_id: 0,
+                    mode_name: '',
+                    patient_id: 0,
+                    patient: ''
+                  },
+                  total: 0
+                }
+                // tha.scheduleZone = []
+                that.scheduleZone.push(thisPa)
+              })
+            })
+            console.log("分区列表22222222222222",this.scheduleZone)
+          }
+        })
+     },
     cellClass({ row, column, rowIndex, columnIndex }) {
       if (columnIndex == 0 || columnIndex == 1 || columnIndex == 23) {
         return "";
@@ -910,6 +1107,7 @@ export default {
           partition_id:this.partition_id,
           schedule_type:this.schedule_type,
         }
+
       getSchedules(params).then(response => {
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
@@ -917,7 +1115,8 @@ export default {
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
           
-        
+          // console.log("分区2222222222",this.scheduleZone)
+          
         
           var that = this;
           console.log('that.scheduleZonethat.scheduleZone',that.scheduleZone)
@@ -1062,7 +1261,7 @@ export default {
                   );
 
                   if (weekPath.length == 2) {
-                    console.log(schedule);
+                   
 
                     var weekPathKey = weekPath[0] + "_" + weekPath[1];
                     that.scheduleZone[index][weekPathKey] = {
@@ -1268,9 +1467,8 @@ export default {
     },
     clickThis(row, column, cell, event) {
       // debugger
-      console.log("aaa",column.property);
       var week = this.weekDay(column.property);
-      console.log("week",week);
+  
 
       if (week[0] == -1 || week[1] == -1) {
         return false;
@@ -1291,7 +1489,6 @@ export default {
       this.currentData.bed_name = row.cut;
       this.currentData.partition_type = row.zone_type;
 
-      console.log(this.currentData);
 
       if (row[column.property].schedule_id > 0) {
         this.currentData.mode_id = row[column.property].mode_id;
@@ -1332,8 +1529,6 @@ export default {
             }
           }
 
-          // console.log(this.scheduleZone)
-
           this.changeSchedule.change_action = "change_device";
           this.changeScheduleActon(formName);
 
@@ -1521,7 +1716,7 @@ export default {
               this.current_devices = this.zone_device_map[this.zone_name];
               this.device_id = this.current_devices[0].id;
             }
-            console.log(this.current_devices);
+         
 
             this.zone_device_options = [
               { values: this.zone_names },
@@ -1529,7 +1724,6 @@ export default {
               { values: this.current_devices }
             ];
 
-            console.log(this.current_devices);
           } else {
           }
         })
@@ -1607,9 +1801,6 @@ export default {
                   if (this.zone_names.length > 0) {
                     this.zone_name = this.zone_names[0];
                     this.current_devices = this.zone_device_map[this.zone_name];
-
-                    console.log(this.zone_device_map[this.zone_name]);
-
                     this.device_id = this.current_devices[0].id;
                   }
                   this.zone_device_options = [
@@ -2009,7 +2200,9 @@ export default {
     changePartiton(val){
      this.$emit('event1', val)
       this.partition_id = val
+      this.getWeekPanels()
       this.getSchedules()
+    
     },
     changeSchedule_type(val){
      this.$emit('event2', val)
@@ -2042,6 +2235,7 @@ export default {
   //    this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
   // },
   created() {
+    this.getWeekPanels()
     this.changeScheduleType(1)
     rowNumber = 0;
     this.modeOptions = this.$store.getters.treatment_mode;