杨青 před 2 roky
rodič
revize
cea250f429

+ 10 - 12
src/xt_pages/workforce/appointment.vue Zobrazit soubor

175
        
175
        
176
         <HistoryWeekTable v-show="showtable" ref="tableDataZero"  :week-time="activeName" partitions-prop="partitions"
176
         <HistoryWeekTable v-show="showtable" ref="tableDataZero"  :week-time="activeName" partitions-prop="partitions"
177
                   :schedule-zone-row-prop="scheduleZoneRow"
177
                   :schedule-zone-row-prop="scheduleZoneRow"
178
-                  :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
179
-                  @event2="changeSchedule"  @event3="changeWeekDay">
178
+                  :schedule-zone-prop="scheduleZone" title="" >
180
           </HistoryWeekTable>
179
           </HistoryWeekTable>
181
       <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
180
       <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
182
         <el-form :model="form" ref="form" label-width="90px" :rules="rules">
181
         <el-form :model="form" ref="form" label-width="90px" :rules="rules">
334
         this.showtable=true
333
         this.showtable=true
335
         this.showtableOne=false
334
         this.showtableOne=false
336
         this.$nextTick(() => {
335
         this.$nextTick(() => {
337
-          this.$refs.tableDataZero.getgetSchedules()
336
+          // this.$refs.tableData.getSchedules()
337
+          // this.$refs.tableDataZero.getgetSchedules()
338
         })
338
         })
339
-        console.log('12343545',this.$refs.tableDataZero);
339
+        // console.log('12343545',this.$refs.tableDataZero.getgetSchedules());
340
       }else{
340
       }else{
341
         this.showtable=false
341
         this.showtable=false
342
         this.showtableOne=true
342
         this.showtableOne=true
343
+        this.$nextTick(() => {
344
+          this.$refs.tableData.getSchedules()
345
+        })
343
       }
346
       }
344
-
345
-      // if(e.name == 'thisWeek'){
346
-      //    this.$refs.tableData.getWeekPanels()
347
-      // }
348
-      // console.log(getgetSchedules);
349
     },
347
     },
350
     dragstart(event, item) {
348
     dragstart(event, item) {
351
       // console.log('start的索引',item.moveIndex)
349
       // console.log('start的索引',item.moveIndex)
440
         this.theWeek.lastWeek = response.data.data.theLastWeek
438
         this.theWeek.lastWeek = response.data.data.theLastWeek
441
         this.theWeek.nextWeek = response.data.data.theNextWeek
439
         this.theWeek.nextWeek = response.data.data.theNextWeek
442
         this.theWeek.nextTwoWeek = response.data.data.theNextSecWeek
440
         this.theWeek.nextTwoWeek = response.data.data.theNextSecWeek
443
-        // this.theWeek.historyWeek = response.data.data.theWeek - 2
441
+        this.theWeek.historyWeek = response.data.data.theWeek - 2
444
         // 在控制变量改变的时候进行 强制渲染更新
442
         // 在控制变量改变的时候进行 强制渲染更新
445
         let childrenRefs = this.$refs.elTabs.$children
443
         let childrenRefs = this.$refs.elTabs.$children
446
-        this.$nextTick(() => {
444
+        // console.log('sadfasfg',this.$refs.elTabs.$children);
445
+        this.$nextTick(() => { 
447
           childrenRefs.forEach(child => child.$forceUpdate())
446
           childrenRefs.forEach(child => child.$forceUpdate())
448
         })
447
         })
449
-
450
         var that = this
448
         var that = this
451
 
449
 
452
         if (partitions.length > 0) {
450
         if (partitions.length > 0) {

+ 4 - 4
src/xt_pages/workforce/components/editTableData.vue Zobrazit soubor

5663
       this.$emit("event1", val);
5663
       this.$emit("event1", val);
5664
       this.partition_id = val;
5664
       this.partition_id = val;
5665
       this.getWeekPanels();
5665
       this.getWeekPanels();
5666
-      // this.getSchedules();
5666
+      this.getSchedules();
5667
     },
5667
     },
5668
     changeSchedule_type(val) {
5668
     changeSchedule_type(val) {
5669
       this.$emit("event2", val);
5669
       this.$emit("event2", val);
5774
     padding: 0 0px ;
5774
     padding: 0 0px ;
5775
 
5775
 
5776
 }
5776
 }
5777
-//  .el-table td .cell:hover {
5778
-//   background: #22eeddc4 !important;
5779
-// }
5777
+.el-table {
5778
+    font-size: 12px !important;
5779
+}
5780
 
5780
 
5781
 }
5781
 }
5782
 .right_contain {
5782
 .right_contain {

Diff nebyl zobrazen, protože je příliš veliký
+ 573 - 1468
src/xt_pages/workforce/components/historyWeekTable.vue


+ 11 - 8
src/xt_pages/workforce/components/tableData.vue Zobrazit soubor

878
     },
878
     },
879
     weekTime: function() {
879
     weekTime: function() {
880
       // 
880
       // 
881
-      // if(this.weekTime != 'historyWeek'){
881
+      if(this.weekTime != 'historyWeek'){
882
         console.log('12343455',this.weekTime);
882
         console.log('12343455',this.weekTime);
883
         var theType = this.weekType(this.weekTime);
883
         var theType = this.weekType(this.weekTime);
884
         this.theType = theType
884
         this.theType = theType
885
         this.getSchedules();
885
         this.getSchedules();
886
-      // }
886
+      }
887
       
887
       
888
     },
888
     },
889
     scheduleZoneRow: function() {
889
     scheduleZoneRow: function() {
992
           if (response.data.state == 0) {
992
           if (response.data.state == 0) {
993
             return false
993
             return false
994
           }
994
           }
995
+          console.log("触发232332323232",response.data.data)
995
           var partitions = response.data.data.partitions
996
           var partitions = response.data.data.partitions
996
           console.log("partitions",partitions)
997
           console.log("partitions",partitions)
997
           this.theWeek.thisWeek = response.data.data.theWeek
998
           this.theWeek.thisWeek = response.data.data.theWeek
998
-
999
+          // this.theWeek.historyWeek=this.theWeek.thisWeek - 2
999
           this.theWeek.lastWeek = this.theWeek.thisWeek - 1
1000
           this.theWeek.lastWeek = this.theWeek.thisWeek - 1
1000
           this.theWeek.nextWeek = this.theWeek.thisWeek + 1
1001
           this.theWeek.nextWeek = this.theWeek.thisWeek + 1
1001
           this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
1002
           this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
2967
     weekType(weekTime) {
2968
     weekType(weekTime) {
2968
       var theType = 2;
2969
       var theType = 2;
2969
       switch (weekTime) {
2970
       switch (weekTime) {
2970
-        case "historyWeek":
2971
-          theType = 0;
2972
-          break;
2971
+        // case "historyWeek":
2972
+        //   theType = 0;
2973
+        //   break;
2973
         case "lastWeek":
2974
         case "lastWeek":
2974
           theType = 1;
2975
           theType = 1;
2975
           break;
2976
           break;
3345
 .schedule-table-row td:hover {
3346
 .schedule-table-row td:hover {
3346
   background: rgb(88, 162, 236) !important;
3347
   background: rgb(88, 162, 236) !important;
3347
 }
3348
 }
3348
-
3349
+.el-table {
3350
+    font-size: 12px !important;
3351
+}
3349
 .schedule-table-row td .cell {
3352
 .schedule-table-row td .cell {
3350
-  font-size: 12px;
3353
+  font-size: 10px;
3351
   white-space:normal  !important;
3354
   white-space:normal  !important;
3352
   // normal
3355
   // normal
3353
 }
3356
 }