5月25日杨青

src/xt_pages/dialysis/details/dialog/acceptsTreatmentDialog.vue

@@ -434,6 +434,7 @@ export default {
       infoDialogVisible:false,
       selected_date:"",
       remark:"",
+      arr:[],
     };
   },
   methods: {

src/xt_pages/workforce/appointment.vue

@@ -173,7 +173,7 @@
       </div>
         </edit-table-data>
 
-        <HistoryWeekTable v-show="showtable" ref="tableDataZero"  :week-time="activeName" partitions-prop="partitions"
+        <HistoryWeekTable v-show="showtable" ref="tableDataZero"  :week-time="activeName" :partitions-prop="partitions"
                   :schedule-zone-row-prop="scheduleZoneRow"
                   :schedule-zone-prop="scheduleZone" title="" >
           </HistoryWeekTable>
@@ -333,7 +333,6 @@ export default {
         this.showtable=true
         this.showtableOne=false
         this.$nextTick(() => {
-
           this.$refs.tableDataZero.start()
         })
         // console.log('12343545',this.$refs.tableDataZero);
@@ -891,7 +890,9 @@ export default {
 
     printScheduleAction: function () {
       var date = new Date().getTime()
-      if (this.activeName == 'lastWeek') {
+      if(this.activeName == 'historyWeek'){
+        date = date - 14 * 24 * 60 * 60 * 1000
+      }else if (this.activeName == 'lastWeek') {
         date = date - 7 * 24 * 60 * 60 * 1000
       } else if (this.activeName == 'nextWeek') {
         date = date + 7 * 24 * 60 * 60 * 1000

src/xt_pages/workforce/components/historyWeekTable.vue

@@ -791,7 +791,7 @@ export default {
     this.now_time = date.getTime()/1000
     this.getAllZones()
 
-    this.changeScheduleType(1)
+    // this.changeScheduleType(1)
     rowNumber = 0;
     this.modeOptions = this.$store.getters.treatment_mode;
 

src/xt_pages/workforce/scheduleTablePrint.vue

@@ -198,6 +198,7 @@ export default {
             scheduleZoneRow: [],
             partitions: {},
             theWeek: {
+              historyWeek: 0,
               lastWeek: 0,
               thisWeek: 0,
               nextWeek: 0,
@@ -217,7 +218,7 @@ export default {
         this.partition_id = this.$route.query.partition_id
         var newList = []
         var arr =  this.$route.query.week_date
-
+        console.log('1234325431',this.$route.query);
         if(arr!=""){
           var newArr = arr.split(",")
 
@@ -294,6 +295,7 @@ export default {
                 }
                 var partitions = response.data.data.partitions
                 console.log("分区",partitions)
+                this.theWeek.historyWeek = this.theWeek.thisWeek - 2 
                 this.theWeek.thisWeek = response.data.data.theWeek
                 this.theWeek.lastWeek = this.theWeek.thisWeek - 1
                 this.theWeek.nextWeek = this.theWeek.thisWeek + 1
@@ -473,6 +475,9 @@ export default {
         },
         getSchedules() {
             var theType = 2;
+            if(this.$route.query.weekTime == "historyWeek"){
+                theType =0
+            }
             if(this.$route.query.weekTime == "lastWeek"){
                theType = 1
             }
@@ -863,6 +868,9 @@ export default {
         },
         getPatientSheduleCount(){
             var theType = 2;
+            if(this.$route.query.weekTime == "historyWeek"){
+                theType =0
+            }
             if(this.$route.query.weekTime == "lastWeek"){
                theType = 1
             }
@@ -894,7 +902,7 @@ export default {
                if(response.data.state == 1){
                   var list = response.data.data.list
                   console.log("list22222",list)
-
+                    console.log('asdfgfffffff',response.data.data);
                   this.scheduleCountList = list
                   var total = response.data.data.total
                   console.log("totalw222",total)