Browse Source

打印单

XMLWAN 4 years ago
parent
commit
0a0bd06ac8

+ 10 - 0
src/api/schedule.js View File

122
     params:params
122
     params:params
123
   })
123
   })
124
 }
124
 }
125
+
126
+
127
+export function getThreeWeekList(params){
128
+  console.log("params----",params)
129
+  return request({
130
+    url:"/api/schedule/getthreeweeklist",
131
+    method:"get",
132
+    params:params
133
+  })
134
+}

+ 10 - 3
src/xt_pages/sign/signIn.vue View File

196
                 console.log('执行')
196
                 console.log('执行')
197
                 this.page++
197
                 this.page++
198
                 let obj = {
198
                 let obj = {
199
-                    cmd: "queuelistbyq",
199
+                    cmd: "queue/queuelistbyq",
200
                     data: {page:this.page,size:10,sort:1}
200
                     data: {page:this.page,size:10,sort:1}
201
                 };
201
                 };
202
                 this.websocketSend(obj)
202
                 this.websocketSend(obj)
204
                 console.log('执行2222')
204
                 console.log('执行2222')
205
                 this.page = 1
205
                 this.page = 1
206
                 let newobj = {
206
                 let newobj = {
207
-                    cmd: "queuelistbyq",
207
+                    cmd: "queue/queuelistbyq",
208
                     data: {page:this.page,size:10,sort:1}
208
                     data: {page:this.page,size:10,sort:1}
209
                 };
209
                 };
210
                 this.websocketSend(newobj)
210
                 this.websocketSend(newobj)
263
                         this.queueInfo = res.data.queueInfo
263
                         this.queueInfo = res.data.queueInfo
264
                         this.page = 1
264
                         this.page = 1
265
                         let obj = {
265
                         let obj = {
266
-                            cmd: "queue/queuelist",
266
+                            cmd: "queue/queuelistbyq",
267
                             data: {page:1,size:10,sort:1}
267
                             data: {page:1,size:10,sort:1}
268
                         };
268
                         };
269
                         this.websocketSend(obj)
269
                         this.websocketSend(obj)
279
                         this.signInList.map(item => {
279
                         this.signInList.map(item => {
280
                             item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
280
                             item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
281
                         })
281
                         })
282
+                    }else if(res.channel == 'queue/queuelistbyq'){
283
+                        console.log(11111111111,res.data)
284
+                        this.signInList = res.data.patientQueueList.data
285
+                        this.count = res.data.patientQueueList.count
286
+                        this.signInList.map(item => {
287
+                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
288
+                        })
282
                     }
289
                     }
283
                 
290
                 
284
                 // console.log("action", re.action);
291
                 // console.log("action", re.action);

+ 2 - 1
src/xt_pages/stock/drugs/query.vue View File

418
        
418
        
419
         
419
         
420
          const data = this.formatJson(filterVal, this.tableData)
420
          const data = this.formatJson(filterVal, this.tableData)
421
-      
421
+         console.log("data",data)
422
+        
422
          excel.export_json_to_excel({
423
          excel.export_json_to_excel({
423
            header: tHeader,
424
            header: tHeader,
424
            data,
425
            data,

+ 2 - 2
src/xt_pages/workforce/components/tableData.vue View File

1461
             this.zone_device_map = zone_device_map;
1461
             this.zone_device_map = zone_device_map;
1462
 
1462
 
1463
             this.zone_names = Object.keys(this.zone_device_map);
1463
             this.zone_names = Object.keys(this.zone_device_map);
1464
-            console.log('8989898989898989',this.zone_names)
1464
+            // console.log('8989898989898989',this.zone_names)
1465
 
1465
 
1466
-            console.log(this.current_devices);
1466
+            // console.log(this.current_devices);
1467
 
1467
 
1468
             if (this.zone_names.length > 0) {
1468
             if (this.zone_names.length > 0) {
1469
               this.zone_name = this.zone_names[0];
1469
               this.zone_name = this.zone_names[0];

+ 1 - 1
src/xt_pages/workforce/components/tableWeeks.vue View File

241
              scheduleData[i].sort = scheduleData[i].number.sort
241
              scheduleData[i].sort = scheduleData[i].number.sort
242
            }
242
            }
243
           var arr = scheduleData.sort(this.compare('sort'))
243
           var arr = scheduleData.sort(this.compare('sort'))
244
-          console.log("元旦快乐",arr)
244
+          
245
           this.scheduleData = arr
245
           this.scheduleData = arr
246
         } else {
246
         } else {
247
           this.$message.error("网络错误");
247
           this.$message.error("网络错误");