Przeglądaj źródła

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

杨青 2 lat temu
rodzic
commit
f10ebbf552

+ 15 - 15
src/xt_pages/workforce/appointment.vue Wyświetl plik

130
                         :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone"
130
                         :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone"
131
                          title="" @event1="changePartition"
131
                          title="" @event1="changePartition"
132
                          @event2="changeSchedule" v-if="is_edit" @event3="changeWeekDay">
132
                          @event2="changeSchedule" v-if="is_edit" @event3="changeWeekDay">
133
-                      
133
+
134
         <div class="position">
134
         <div class="position">
135
           <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
135
           <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
136
           <div>
136
           <div>
161
               type="primary"
161
               type="primary"
162
               v-if="is_edit"
162
               v-if="is_edit"
163
               size="small"
163
               size="small"
164
-          >下载日志 
164
+          >下载日志
165
           </el-button>
165
           </el-button>
166
           <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
166
           <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
167
           </el-button>
167
           </el-button>
172
         </div>
172
         </div>
173
       </div>
173
       </div>
174
         </edit-table-data>
174
         </edit-table-data>
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="" >
178
                   :schedule-zone-prop="scheduleZone" title="" >
285
         nextWeek: 0,
285
         nextWeek: 0,
286
         nextTwoWeek: 0
286
         nextTwoWeek: 0
287
       },
287
       },
288
-      
288
+
289
       tableList: [],
289
       tableList: [],
290
       weekTime: "",
290
       weekTime: "",
291
       schedule_type: 0,
291
       schedule_type: 0,
333
         this.showtable=true
333
         this.showtable=true
334
         this.showtableOne=false
334
         this.showtableOne=false
335
         this.$nextTick(() => {
335
         this.$nextTick(() => {
336
-          // this.$refs.tableData.getSchedules()
337
-          // this.$refs.tableDataZero.getgetSchedules()
336
+          this.$refs.tableDataZero.getgetSchedules()
338
         })
337
         })
339
-        // console.log('12343545',this.$refs.tableDataZero.getgetSchedules());
338
+        console.log('12343545',this.$refs.tableDataZero);
340
       }else{
339
       }else{
341
         this.showtable=false
340
         this.showtable=false
342
         this.showtableOne=true
341
         this.showtableOne=true
343
-        this.$nextTick(() => {
344
-          this.$refs.tableData.getSchedules()
345
-        })
346
       }
342
       }
343
+
344
+      // if(e.name == 'thisWeek'){
345
+      //    this.$refs.tableData.getWeekPanels()
346
+      // }
347
+      // console.log(getgetSchedules);
347
     },
348
     },
348
     dragstart(event, item) {
349
     dragstart(event, item) {
349
       // console.log('start的索引',item.moveIndex)
350
       // console.log('start的索引',item.moveIndex)
438
         this.theWeek.lastWeek = response.data.data.theLastWeek
439
         this.theWeek.lastWeek = response.data.data.theLastWeek
439
         this.theWeek.nextWeek = response.data.data.theNextWeek
440
         this.theWeek.nextWeek = response.data.data.theNextWeek
440
         this.theWeek.nextTwoWeek = response.data.data.theNextSecWeek
441
         this.theWeek.nextTwoWeek = response.data.data.theNextSecWeek
441
-        this.theWeek.historyWeek = response.data.data.theWeek - 2
442
+        // this.theWeek.historyWeek = response.data.data.theWeek - 2
442
         // 在控制变量改变的时候进行 强制渲染更新
443
         // 在控制变量改变的时候进行 强制渲染更新
443
         let childrenRefs = this.$refs.elTabs.$children
444
         let childrenRefs = this.$refs.elTabs.$children
444
-        // console.log('sadfasfg',this.$refs.elTabs.$children);
445
-        this.$nextTick(() => { 
445
+        this.$nextTick(() => {
446
           childrenRefs.forEach(child => child.$forceUpdate())
446
           childrenRefs.forEach(child => child.$forceUpdate())
447
         })
447
         })
448
         var that = this
448
         var that = this
2363
 
2363
 
2364
       return next_monday
2364
       return next_monday
2365
     },
2365
     },
2366
-    // 
2366
+    //
2367
     getThreeWeekList() {
2367
     getThreeWeekList() {
2368
       var params = {
2368
       var params = {
2369
         start_time: this.start_time,
2369
         start_time: this.start_time,
3068
     },
3068
     },
3069
     getlist() {
3069
     getlist() {
3070
       getScheduleTemplate().then(response => {
3070
       getScheduleTemplate().then(response => {
3071
-        
3071
+
3072
         if (response.data.state == 1) {
3072
         if (response.data.state == 1) {
3073
           var template = response.data.data.template
3073
           var template = response.data.data.template
3074
           console.log('12243254',response.data.data);
3074
           console.log('12243254',response.data.data);

Plik diff jest za duży
+ 1471 - 578
src/xt_pages/workforce/components/historyWeekTable.vue


+ 3 - 3
src/xt_pages/workforce/components/tableData.vue Wyświetl plik

2019
           this.schedulesGroup = schedulesGroup
2019
           this.schedulesGroup = schedulesGroup
2020
 
2020
 
2021
           var that = this;
2021
           var that = this;
2022
-
2022
+          
2023
           this.scheduleZone.forEach(function (zone, index) {
2023
           this.scheduleZone.forEach(function (zone, index) {
2024
 
2024
 
2025
             that.scheduleZone[index].Mon_M = {
2025
             that.scheduleZone[index].Mon_M = {
2215
 
2215
 
2216
 
2216
 
2217
             that.scheduleZone[index].total = 0;
2217
             that.scheduleZone[index].total = 0;
2218
-
2218
+            
2219
             if (response.data.data.schdules.length > 0) {
2219
             if (response.data.data.schdules.length > 0) {
2220
               theSchedules.forEach(function (schedule, sindex) {
2220
               theSchedules.forEach(function (schedule, sindex) {
2221
 
2221
 
2250
           });
2250
           });
2251
 
2251
 
2252
           this.source_scheduleZone = this.scheduleZone
2252
           this.source_scheduleZone = this.scheduleZone
2253
-          console.log("------------aaaa", this.scheduleZone)
2253
+         
2254
         } else {
2254
         } else {
2255
           this.$message.error("网络错误");
2255
           this.$message.error("网络错误");
2256
           return false;
2256
           return false;