杨青 1 год назад
Родитель
Сommit
106df46144

+ 1 - 0
src/xt_pages/dialysis/details/dialog/acceptsTreatmentDialog.vue Просмотреть файл

434
       infoDialogVisible:false,
434
       infoDialogVisible:false,
435
       selected_date:"",
435
       selected_date:"",
436
       remark:"",
436
       remark:"",
437
+      arr:[],
437
     };
438
     };
438
   },
439
   },
439
   methods: {
440
   methods: {

+ 4 - 3
src/xt_pages/workforce/appointment.vue Просмотреть файл

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="" >
179
           </HistoryWeekTable>
179
           </HistoryWeekTable>
333
         this.showtable=true
333
         this.showtable=true
334
         this.showtableOne=false
334
         this.showtableOne=false
335
         this.$nextTick(() => {
335
         this.$nextTick(() => {
336
-
337
           this.$refs.tableDataZero.start()
336
           this.$refs.tableDataZero.start()
338
         })
337
         })
339
         // console.log('12343545',this.$refs.tableDataZero);
338
         // console.log('12343545',this.$refs.tableDataZero);
891
 
890
 
892
     printScheduleAction: function () {
891
     printScheduleAction: function () {
893
       var date = new Date().getTime()
892
       var date = new Date().getTime()
894
-      if (this.activeName == 'lastWeek') {
893
+      if(this.activeName == 'historyWeek'){
894
+        date = date - 14 * 24 * 60 * 60 * 1000
895
+      }else if (this.activeName == 'lastWeek') {
895
         date = date - 7 * 24 * 60 * 60 * 1000
896
         date = date - 7 * 24 * 60 * 60 * 1000
896
       } else if (this.activeName == 'nextWeek') {
897
       } else if (this.activeName == 'nextWeek') {
897
         date = date + 7 * 24 * 60 * 60 * 1000
898
         date = date + 7 * 24 * 60 * 60 * 1000

+ 1 - 1
src/xt_pages/workforce/components/historyWeekTable.vue Просмотреть файл

791
     this.now_time = date.getTime()/1000
791
     this.now_time = date.getTime()/1000
792
     this.getAllZones()
792
     this.getAllZones()
793
 
793
 
794
-    this.changeScheduleType(1)
794
+    // this.changeScheduleType(1)
795
     rowNumber = 0;
795
     rowNumber = 0;
796
     this.modeOptions = this.$store.getters.treatment_mode;
796
     this.modeOptions = this.$store.getters.treatment_mode;
797
 
797
 

+ 10 - 2
src/xt_pages/workforce/scheduleTablePrint.vue Просмотреть файл

198
             scheduleZoneRow: [],
198
             scheduleZoneRow: [],
199
             partitions: {},
199
             partitions: {},
200
             theWeek: {
200
             theWeek: {
201
+              historyWeek: 0,
201
               lastWeek: 0,
202
               lastWeek: 0,
202
               thisWeek: 0,
203
               thisWeek: 0,
203
               nextWeek: 0,
204
               nextWeek: 0,
217
         this.partition_id = this.$route.query.partition_id
218
         this.partition_id = this.$route.query.partition_id
218
         var newList = []
219
         var newList = []
219
         var arr =  this.$route.query.week_date
220
         var arr =  this.$route.query.week_date
220
-
221
+        console.log('1234325431',this.$route.query);
221
         if(arr!=""){
222
         if(arr!=""){
222
           var newArr = arr.split(",")
223
           var newArr = arr.split(",")
223
 
224
 
294
                 }
295
                 }
295
                 var partitions = response.data.data.partitions
296
                 var partitions = response.data.data.partitions
296
                 console.log("分区",partitions)
297
                 console.log("分区",partitions)
298
+                this.theWeek.historyWeek = this.theWeek.thisWeek - 2 
297
                 this.theWeek.thisWeek = response.data.data.theWeek
299
                 this.theWeek.thisWeek = response.data.data.theWeek
298
                 this.theWeek.lastWeek = this.theWeek.thisWeek - 1
300
                 this.theWeek.lastWeek = this.theWeek.thisWeek - 1
299
                 this.theWeek.nextWeek = this.theWeek.thisWeek + 1
301
                 this.theWeek.nextWeek = this.theWeek.thisWeek + 1
473
         },
475
         },
474
         getSchedules() {
476
         getSchedules() {
475
             var theType = 2;
477
             var theType = 2;
478
+            if(this.$route.query.weekTime == "historyWeek"){
479
+                theType =0
480
+            }
476
             if(this.$route.query.weekTime == "lastWeek"){
481
             if(this.$route.query.weekTime == "lastWeek"){
477
                theType = 1
482
                theType = 1
478
             }
483
             }
863
         },
868
         },
864
         getPatientSheduleCount(){
869
         getPatientSheduleCount(){
865
             var theType = 2;
870
             var theType = 2;
871
+            if(this.$route.query.weekTime == "historyWeek"){
872
+                theType =0
873
+            }
866
             if(this.$route.query.weekTime == "lastWeek"){
874
             if(this.$route.query.weekTime == "lastWeek"){
867
                theType = 1
875
                theType = 1
868
             }
876
             }
894
                if(response.data.state == 1){
902
                if(response.data.state == 1){
895
                   var list = response.data.data.list
903
                   var list = response.data.data.list
896
                   console.log("list22222",list)
904
                   console.log("list22222",list)
897
-
905
+                    console.log('asdfgfffffff',response.data.data);
898
                   this.scheduleCountList = list
906
                   this.scheduleCountList = list
899
                   var total = response.data.data.total
907
                   var total = response.data.data.total
900
                   console.log("totalw222",total)
908
                   console.log("totalw222",total)