XMLWAN il y a 4 ans
Parent
révision
b7bf9c1992

+ 1 - 0
src/xt_pages/dialysis/dialysisDoctorAdvice.vue Voir le fichier

@@ -494,6 +494,7 @@ export default {
494 494
             var schedules = resp.data.scheduals
495 495
             console.log("列表数据",schedules)
496 496
             var config = resp.data.config
497
+            console.log("config222222",config.is_open)
497 498
            if(config.is_open == 0){
498 499
             this.show = true
499 500
             this.showOne = false

+ 1 - 1
src/xt_pages/workforce/components/nextTableWeeks.vue Voir le fichier

@@ -249,7 +249,7 @@ export default {
249 249
         //   week_type:this.week_type,
250 250
         //   week_time:this.week_time,
251 251
         // }
252
-      
252
+     
253 253
       getNextScheduleWeekDay(params).then(response => {
254 254
         this.scheduleData = [];
255 255
         if (response.data.state == 1) {

+ 18 - 1
src/xt_pages/workforce/next_remind_print.vue Voir le fichier

@@ -18,7 +18,8 @@
18 18
       <div id="print_content">
19 19
         <div class="print_main_content">
20 20
           <div class="order_title_panl">
21
-            <span class="main_title">{{day}}排班提醒({{ currentDate }})</span>
21
+            <!-- <span class="main_title">{{day}}排班提醒({{ currentDate }})</span> -->
22
+            <span class="main_title">{{day}}排班提醒({{ getTime(now_time) }})</span>
22 23
           </div>
23 24
           <div class="table_panel">
24 25
             <table class="table">
@@ -94,6 +95,7 @@
94 95
 <script>
95 96
   import { getNextScheduleWeekDay } from '@/api/schedule'
96 97
   import { parseTime } from '@/utils'
98
+  import { uParseTime } from '@/utils/tools'
97 99
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
98 100
   import print from 'print-js'
99 101
   const moment = require('moment') 
@@ -118,6 +120,7 @@
118 120
         start_time:moment().week(moment().week() + 1).startOf('week').unix(),
119 121
         end_time:moment().week(moment().week() + 1).endOf('week').unix(),
120 122
         org_id:0,
123
+        now_time:0
121 124
       }
122 125
     },
123 126
     components: {
@@ -126,6 +129,7 @@
126 129
     created() {
127 130
      this.org_id = this.$store.getters.xt_user.org.id
128 131
      this.currentDate = this.getCurrentDate()
132
+   
129 133
       this.modeOptions = this.$store.getters.treatment_mode
130 134
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
131 135
       this.week_type = this.$route.query.week_type
@@ -145,6 +149,8 @@
145 149
         //   end_time:1610208000,
146 150
         // }
147 151
       console.log("打印下周",params)
152
+     
153
+      console.log("start",this.start_time)
148 154
       getNextScheduleWeekDay(params).then(rs => {
149 155
         var resp = rs.data
150 156
         console.log(resp)
@@ -163,6 +169,10 @@
163 169
       }).catch(err => {
164 170
         this.$message.error(err)
165 171
       })
172
+
173
+      var now_time = parseInt(this.week_type) * 86400 + this.start_time
174
+      console.log("now",now_time)
175
+      this.now_time = now_time
166 176
     },
167 177
     methods: {
168 178
       getAdvice:function(doctor_advice) {
@@ -301,6 +311,13 @@
301 311
           return value1 - value2;
302 312
       }
303 313
      },
314
+     getTime(val) {
315
+         if(val == ""){
316
+          return ""
317
+         }else {
318
+          return uParseTime(val, '{y}-{m}-{d}')
319
+         }
320
+      },
304 321
     }
305 322
   }
306 323
 </script>

+ 3 - 1
src/xt_pages/workforce/remind_print.vue Voir le fichier

@@ -133,13 +133,15 @@
133 133
           week_type:this.week_type,
134 134
           week_time:this.week_time,
135 135
         }
136
-
136
+       console.log("params",params)
137 137
       getScheduleWeekDay(params).then(rs => {
138 138
         var resp = rs.data
139 139
         console.log(resp)
140
+        
140 141
         if (resp.state == 1) {
141 142
           var scheduleData = resp.data.schdules
142 143
           let a = resp.data.day
144
+          console.log("a",a)
143 145
           var myDate = new Date(a);
144 146
           var year = myDate.getFullYear(); //年
145 147
           var month = myDate.getMonth() + 1; //月