XMLWAN 3 lat temu
rodzic
commit
1562960235

+ 8 - 5
src/xt_pages/workforce/remind_print.vue Wyświetl plik

@@ -83,7 +83,7 @@
83 83
                 </td>
84 84
                 <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
85 85
                   <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctoradvice)}}</span>
86
-                   <span v-if="main_collection.hisdoctoradviceinfo.length>0">{{ getAdviceOne(main_collection.hisdoctoradviceinfo)}}</span>
86
+                   <span style="white-space: pre" v-if="main_collection.hisdoctoradviceinfo.length>0">{{ getAdviceOne(main_collection.hisdoctoradviceinfo)}}</span>
87 87
                 </td>
88 88
               </tr>
89 89
               </tbody>
@@ -121,7 +121,8 @@
121 121
         currentDate:'',
122 122
         org_id:0,
123 123
         printObj:{},
124
-        zone:"",
124
+        week_time:0,
125
+        zone:0,
125 126
       }
126 127
     },
127 128
     components: {
@@ -129,7 +130,7 @@
129 130
     },
130 131
     created() {
131 132
       this.getPrintList()
132
-     this.org_id = this.$store.getters.xt_user.org.id
133
+      this.org_id = this.$store.getters.xt_user.org.id
133 134
     //  this.currentDate = this.getCurrentDate()
134 135
       this.modeOptions = this.$store.getters.treatment_mode
135 136
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
@@ -149,8 +150,9 @@
149 150
               list[i].sort = list[i].number.sort
150 151
            }
151 152
            var arr = list.sort(this.compare('sort'))
152
-             console.log("list2222999999999",list)
153
+            
153 154
              this.scheduleData = arr
155
+            
154 156
              let a = response.data.data.day
155 157
               console.log("a",a)
156 158
               var myDate = new Date(a);
@@ -266,6 +268,7 @@
266 268
 
267 269
           name = name + doctor_advice[i].advice_name + " " + drug_spec + " " + prescribing_number + " " + single_dose + " " + doctor_advice[i].delivery_way + " " + doctor_advice[i].execution_frequency + " " + doctor_advice[i].remark + "\n"
268 270
 
271
+        
269 272
         }
270 273
           return name
271 274
 
@@ -273,6 +276,7 @@
273 276
         }
274 277
 
275 278
       },
279
+     
276 280
       printAction: function() {
277 281
         const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
278 282
 
@@ -356,7 +360,6 @@
356 360
       getPrintList().then(response=>{
357 361
          if(response.data.state == 1){
358 362
            var list = response.data.data.list
359
-           console.log("list222222222",list)
360 363
            this.printObj = list
361 364
          }
362 365
       })

+ 45 - 43
src/xt_pages/workforce/remind_print_setting.vue Wyświetl plik

@@ -45,7 +45,7 @@
45 45
 </template>
46 46
 
47 47
 <script>
48
-  import { getNextScheduleWeekDay,getPrintList } from '@/api/schedule'
48
+  import { getScheduleList,getPrintList } from '@/api/schedule'
49 49
   import { parseTime } from '@/utils'
50 50
   import { uParseTime } from '@/utils/tools'
51 51
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
@@ -92,54 +92,56 @@
92 92
       this.week_time  = this.$route.query.week_time
93 93
       this.zone = this.$route.query.zone
94 94
       this.pre_status = this.$route.query.prestatus
95
-      const params = {
95
+     const params = {
96 96
           week_type:this.week_type,
97 97
           week_time:this.week_time,
98
-          start_time:this.start_time,
99
-          end_time:this.end_time,
100 98
           zone:this.zone,
101 99
         }
102
-      getNextScheduleWeekDay(params).then(rs => {
103
-        var resp = rs.data
104
-        console.log(resp)
105
-        if (resp.state == 1) {
106
-         var scheduleData = resp.data.schedule
107
-
108
-          if(this.pre_status == 0){
109
-              for(let i=0;i<scheduleData.length;i++){
110
-              scheduleData[i].sort = scheduleData[i].number.sort
111
-            }
112
-            var arr = scheduleData.sort(this.compare('sort'))
113
-            this.scheduleData = arr
114
-            console.log("数据类型",this.scheduleData)
115
-          }
116
-          if(this.pre_status == 1){
117
-            var newList = []
118
-            for(let i=0;i<scheduleData.length;i++){
119
-              if(scheduleData.prescription.id > 0){
120
-                 newList.push(scheduleData[i])
121
-              } 
122
-            }
123
-            var arr = newList.sort(this.compare('sort'))
124
-            this.scheduleData = arr
100
+       console.log("params",params)
101
+       getScheduleList(params).then(response=>{
102
+         if(response.data.state ==1){
103
+           var list = response.data.data.list
104
+           for(let i=0;i<list.length;i++){
105
+              list[i].sort = list[i].number.sort
106
+           }
107
+           var arr = list.sort(this.compare('sort'))
108
+            
109
+             this.scheduleData = arr
110
+            
111
+             let a = response.data.data.day
112
+              console.log("a",a)
113
+              var myDate = new Date(a);
114
+              var year = myDate.getFullYear(); //年
115
+              var month = myDate.getMonth() + 1; //月
116
+              var day = myDate.getDate(); //日
117
+              var days = myDate.getDay();
118
+              switch(days) {
119
+              case 1:
120
+                days = '星期一';
121
+                break;
122
+              case 2:
123
+                days = '星期二';
124
+                break;
125
+              case 3:
126
+                days = '星期三';
127
+                break;
128
+              case 4:
129
+                days = '星期四';
130
+                break;
131
+              case 5:
132
+                days = '星期五';
133
+                break;
134
+              case 6:
135
+                days = '星期六';
136
+                break;
137
+              case 0:
138
+                days = '星期日';
139
+                break;
125 140
           }
126
-
127
-          if(this.pre_status == 2){
128
-            var newList = []
129
-            for(let i=0;i<scheduleData.length;i++){
130
-              if(scheduleData.prescription.id == 0){
131
-                 newList.push(scheduleData[i])
132
-              } 
133
-            }
134
-            var arr =   newList.sort(this.compare('sort'))
135
-            this.scheduleData = arr
141
+          var str = year + "年" + month + "月" + day + "日  " + days;
142
+          this.currentDate = str
136 143
           }
137
-        } else {
138
-          this.$message.error(resp.msg)
139
-        }
140
-      }).catch(err => {
141
-        this.$message.error(err)
142
-      })
144
+       })
143 145
 
144 146
       var now_time = parseInt(this.week_type) * 86400 + this.start_time
145 147
       console.log("now",now_time)