Browse Source

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

see999 4 years ago
parent
commit
440d7feab7

BIN
src/xt_pages/.DS_Store View File


BIN
src/xt_pages/dialysis/.DS_Store View File


+ 0 - 1
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

740
                 'record_time': this.record_date,
740
                 'record_time': this.record_date,
741
                 'admin_user_id':this.$store.getters.xt_user.user.id
741
                 'admin_user_id':this.$store.getters.xt_user.user.id
742
 
742
 
743
-
744
               }
743
               }
745
               axios.get('http://127.0.0.1:9532/api/refund/post', {
744
               axios.get('http://127.0.0.1:9532/api/refund/post', {
746
                 params: params
745
                 params: params

File diff suppressed because it is too large
+ 699 - 587
src/xt_pages/outpatientRegistration/index.vue


+ 3 - 10
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: "queue/queuelistbyq",
199
+                    cmd: "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: "queue/queuelistbyq",
207
+                    cmd: "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/queuelistbyq",
266
+                            cmd: "queue/queuelist",
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
-                        })
289
                     }
282
                     }
290
                 
283
                 
291
                 // console.log("action", re.action);
284
                 // console.log("action", re.action);