Browse Source

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

csx 4 years ago
parent
commit
22b1dd0189

+ 1 - 0
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue View File

2898
             this.$message.error(response.data.msg)
2898
             this.$message.error(response.data.msg)
2899
             return false
2899
             return false
2900
           } else {
2900
           } else {
2901
+            console.log("切换数据", response.data.data.solution)
2901
             this.$message.success('切换成功')
2902
             this.$message.success('切换成功')
2902
             if (response.data.data.solution != null) {
2903
             if (response.data.data.solution != null) {
2903
               for (const key in response.data.data.solution) {
2904
               for (const key in response.data.data.solution) {

+ 4 - 4
src/xt_pages/hospitalStation/components/prescriptionTable.vue View File

378
 
378
 
379
       },
379
       },
380
       getSingleDose(scope){
380
       getSingleDose(scope){
381
-        // this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
381
+        this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
382
       },
382
       },
383
       getDay(scope){
383
       getDay(scope){
384
-        // this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
384
+        this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
385
       },
385
       },
386
       getProjectSingleDose(scope){
386
       getProjectSingleDose(scope){
387
-        // this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
387
+        this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
388
       },
388
       },
389
       getProjectDay(scope){
389
       getProjectDay(scope){
390
-        // this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
390
+        this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
391
       }
391
       }
392
     },mounted(){
392
     },mounted(){
393
       this.getInitData()
393
       this.getInitData()

+ 47 - 47
src/xt_pages/outpatientCharges/summary.vue View File

100
                     <template slot-scope="scope">
100
                     <template slot-scope="scope">
101
                         <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
101
                         <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
102
                         <el-button size="mini" type="primary" @click="toPrint(scope.row)"
102
                         <el-button size="mini" type="primary" @click="toPrint(scope.row)"
103
-                                   v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919)  ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
103
+                                   v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
104
                             结算单
104
                             结算单
105
                         </el-button>
105
                         </el-button>
106
                         <el-button size="mini" type="primary" v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106" @click="settlementPrint(scope.row)">结算单</el-button>
106
                         <el-button size="mini" type="primary" v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106" @click="settlementPrint(scope.row)">结算单</el-button>
247
         }
247
         }
248
 
248
 
249
       },toRefund(row){
249
       },toRefund(row){
250
-        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
251
-          var that = this;
250
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
251
+          var that = this
252
           this.$confirm('是否退费', '退费', {
252
           this.$confirm('是否退费', '退费', {
253
             confirmButtonText: '确 定',
253
             confirmButtonText: '确 定',
254
             cancelButtonText: '取 消',
254
             cancelButtonText: '取 消',
259
               'patient_id': row.patient_id,
259
               'patient_id': row.patient_id,
260
               'record_time': that.getTimes(row.settle_accounts_date),
260
               'record_time': that.getTimes(row.settle_accounts_date),
261
               'admin_user_id': that.$store.getters.xt_user.user.id,
261
               'admin_user_id': that.$store.getters.xt_user.user.id,
262
-            };
262
+            }
263
             axios.get('http://127.0.0.1:9532/api/refund/post', {
263
             axios.get('http://127.0.0.1:9532/api/refund/post', {
264
               params: params
264
               params: params
265
             })
265
             })
266
               .then(function(response) {
266
               .then(function(response) {
267
                 if (response.data.state == 0) {
267
                 if (response.data.state == 0) {
268
-                  that.$message.error(response.data.msg);
268
+                  that.$message.error(response.data.msg)
269
                   return false
269
                   return false
270
                 } else {
270
                 } else {
271
                   if (response.data.data.failed_code == -10) {
271
                   if (response.data.data.failed_code == -10) {
278
                     }).catch(() => {
278
                     }).catch(() => {
279
                     })
279
                     })
280
                   } else {
280
                   } else {
281
-                    that.$message({ message: '退费成功', type: 'success', duration: 5000 });
281
+                    that.$message({ message: '退费成功', type: 'success', duration: 5000 })
282
                     that.getHisOrderList()
282
                     that.getHisOrderList()
283
 
283
 
284
                   }
284
                   }
300
               'patient_id': this.patientInfo.id,
300
               'patient_id': this.patientInfo.id,
301
               'record_time': this.record_date
301
               'record_time': this.record_date
302
 
302
 
303
-            };
303
+            }
304
             Refund(params).then(response => {
304
             Refund(params).then(response => {
305
               if (response.data.state == 0) {
305
               if (response.data.state == 0) {
306
-                this.$message.error(response.data.msg);
306
+                this.$message.error(response.data.msg)
307
                 return false
307
                 return false
308
               } else {
308
               } else {
309
-                this.$message({ message: '退费成功', type: 'success' });
309
+                this.$message({ message: '退费成功', type: 'success' })
310
                 this.getHisOrderList()
310
                 this.getHisOrderList()
311
               }
311
               }
312
             })
312
             })
316
       },
316
       },
317
       toPrint(row) {
317
       toPrint(row) {
318
         if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
318
         if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
319
-          this.statementVisible9504 = true;
319
+          this.statementVisible9504 = true
320
           let obj = {
320
           let obj = {
321
             order_id: row.id,
321
             order_id: row.id,
322
             patient_id: row.patient_id,
322
             patient_id: row.patient_id,
323
             record_time: this.getTimes(row.settle_accounts_date),
323
             record_time: this.getTimes(row.settle_accounts_date),
324
             admin_user_id: this.$store.getters.xt_user.user.id
324
             admin_user_id: this.$store.getters.xt_user.user.id
325
-          };
325
+          }
326
           this.orderObj9504 = obj
326
           this.orderObj9504 = obj
327
         } else {
327
         } else {
328
-          this.statementVisible = true;
328
+          this.statementVisible = true
329
           let obj = {
329
           let obj = {
330
             order_id: row.id
330
             order_id: row.id
331
-          };
331
+          }
332
           this.orderObj = obj
332
           this.orderObj = obj
333
         }
333
         }
334
 
334
 
335
       },
335
       },
336
       settlementPrint(row){
336
       settlementPrint(row){
337
-        this.settlementVisible = true;
337
+        this.settlementVisible = true
338
         let obj = {
338
         let obj = {
339
           order_id: row.id
339
           order_id: row.id
340
-        };
340
+        }
341
         this.settlementObj = obj
341
         this.settlementObj = obj
342
       },
342
       },
343
       export_detail() {
343
       export_detail() {
344
         let params = {
344
         let params = {
345
           start_time: this.start_time,
345
           start_time: this.start_time,
346
           end_time: this.end_time
346
           end_time: this.end_time
347
-        };
347
+        }
348
         getExportConsumeDetailList(params).then(response => {
348
         getExportConsumeDetailList(params).then(response => {
349
           if (response.data.state == 0) {
349
           if (response.data.state == 0) {
350
-            this.$message.error(response.data.msg);
350
+            this.$message.error(response.data.msg)
351
             return false
351
             return false
352
           } else {
352
           } else {
353
 
353
 
354
-            let list = [];
354
+            let list = []
355
             for (let i = 0; i < response.data.data.order.length; i++) {
355
             for (let i = 0; i < response.data.data.order.length; i++) {
356
-              let order = response.data.data.order[i];
357
-              let number = '';
358
-              let name = '';
359
-              let department = '';
360
-              let doctor_name = '';
361
-              let balance_accounts = '';
356
+              let order = response.data.data.order[i]
357
+              let number = ''
358
+              let name = ''
359
+              let department = ''
360
+              let doctor_name = ''
361
+              let balance_accounts = ''
362
 
362
 
363
-              let order_status = '';
363
+              let order_status = ''
364
 
364
 
365
               if (order.his_patient != null && order.his_patient.number.length > 0) {
365
               if (order.his_patient != null && order.his_patient.number.length > 0) {
366
                 number = order.his_patient.number
366
                 number = order.his_patient.number
421
                 '收费日期': '',
421
                 '收费日期': '',
422
                 '收费状态': order_status,
422
                 '收费状态': order_status,
423
                 '退费日期': ''
423
                 '退费日期': ''
424
-              };
424
+              }
425
               list.push(obj)
425
               list.push(obj)
426
             }
426
             }
427
             import('@/vendor/Export2Excel').then(excel => {
427
             import('@/vendor/Export2Excel').then(excel => {
428
-              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期'];
429
-              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期'];
430
-              const data = this.formatJson(filterVal, list);
428
+              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期']
429
+              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期']
430
+              const data = this.formatJson(filterVal, list)
431
               excel.export_json_to_excel({
431
               excel.export_json_to_excel({
432
                 header: tHeader,
432
                 header: tHeader,
433
                 data,
433
                 data,
442
         return jsonData.map(v => filterVal.map(j => v[j]))
442
         return jsonData.map(v => filterVal.map(j => v[j]))
443
       },
443
       },
444
       changeDoctor() {
444
       changeDoctor() {
445
-        this.page = 1;
446
-        this.keywords = '';
445
+        this.page = 1
446
+        this.keywords = ''
447
         this.getHisOrderList()
447
         this.getHisOrderList()
448
       },
448
       },
449
       handleSizeChange(limit) {
449
       handleSizeChange(limit) {
450
-        this.limit = limit;
450
+        this.limit = limit
451
         this.getHisOrderList()
451
         this.getHisOrderList()
452
 
452
 
453
       }, handleCurrentChange(page) {
453
       }, handleCurrentChange(page) {
454
-        this.page = page;
454
+        this.page = page
455
         this.getHisOrderList()
455
         this.getHisOrderList()
456
 
456
 
457
       },
457
       },
458
       handleStartTimeChange() {
458
       handleStartTimeChange() {
459
-        this.page = 1;
460
-        this.keywords = '';
459
+        this.page = 1
460
+        this.keywords = ''
461
         this.getHisOrderList()
461
         this.getHisOrderList()
462
       }, handleEndTimeChange() {
462
       }, handleEndTimeChange() {
463
-        this.page = 1;
464
-        this.keywords = '';
463
+        this.page = 1
464
+        this.keywords = ''
465
         this.getHisOrderList()
465
         this.getHisOrderList()
466
       },
466
       },
467
       searchAction() {
467
       searchAction() {
468
-        this.page = 1;
468
+        this.page = 1
469
         this.getHisOrderList()
469
         this.getHisOrderList()
470
 
470
 
471
       },
471
       },
487
           start_time: this.start_time,
487
           start_time: this.start_time,
488
           end_time: this.end_time,
488
           end_time: this.end_time,
489
           type: this.admin_user_id
489
           type: this.admin_user_id
490
-        };
490
+        }
491
         getHisOrderList(params).then(response => {
491
         getHisOrderList(params).then(response => {
492
           if (response.data.state == 0) {
492
           if (response.data.state == 0) {
493
-            this.$message.error(response.data.msg);
493
+            this.$message.error(response.data.msg)
494
             return false
494
             return false
495
           } else {
495
           } else {
496
-            this.tableData = response.data.data.order;
496
+            this.tableData = response.data.data.order
497
             this.total = response.data.data.total
497
             this.total = response.data.data.total
498
           }
498
           }
499
         })
499
         })
501
       }, getDoctorList() {
501
       }, getDoctorList() {
502
         getDoctorList().then(response => {
502
         getDoctorList().then(response => {
503
           if (response.data.state == 0) {
503
           if (response.data.state == 0) {
504
-            this.$message.error(response.data.msg);
504
+            this.$message.error(response.data.msg)
505
             return false
505
             return false
506
           } else {
506
           } else {
507
             this.doctors = response.data.data.doctors
507
             this.doctors = response.data.data.doctors
516
         }
516
         }
517
       },
517
       },
518
       invoicePrint(obj){
518
       invoicePrint(obj){
519
-        console.log(obj);
519
+        console.log(obj)
520
         let paramsObj = {
520
         let paramsObj = {
521
           order_id: obj.id,
521
           order_id: obj.id,
522
           patient_id: obj.patient_id,
522
           patient_id: obj.patient_id,
524
           age:obj.age,
524
           age:obj.age,
525
           gend:obj.gend,
525
           gend:obj.gend,
526
           setl_time:obj.setl_time
526
           setl_time:obj.setl_time
527
-        };
528
-        this.invoiceParams = paramsObj;
527
+        }
528
+        this.invoiceParams = paramsObj
529
         this.invoiceVisible = true
529
         this.invoiceVisible = true
530
       }
530
       }
531
     }, created() {
531
     }, created() {
532
 
532
 
533
 
533
 
534
-      this.fetchAllAdminUsers();
535
-      this.getDoctorList();
534
+      this.fetchAllAdminUsers()
535
+      this.getDoctorList()
536
       this.getHisOrderList()
536
       this.getHisOrderList()
537
 
537
 
538
 
538
 

+ 1 - 1
src/xt_pages/outpatientDoctorStation/template/printOne.vue View File

24
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
24
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
25
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
25
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
26
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
26
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
27
-                  <div style="margin-left:100px;"><span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;{{it.day}}天</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
27
+                  <div style="margin-left:100px;"><span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
28
               </div>
28
               </div>
29
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
29
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
30
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
30
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>

+ 2 - 2
src/xt_pages/user/dialysisRecord.vue View File

331
               <th>透后称重(kg)</th>
331
               <th>透后称重(kg)</th>
332
               <th>透前血压(mmhg)</th>
332
               <th>透前血压(mmhg)</th>
333
               <th>透后血压(mmhg)</th>
333
               <th>透后血压(mmhg)</th>
334
-              <th>超滤量(L)</th>
334
+              <th>目标超滤量(L)</th>
335
               <th>血管通路</th>
335
               <th>血管通路</th>
336
               <th>抗凝剂种类 首剂/维持/总量</th>
336
               <th>抗凝剂种类 首剂/维持/总量</th>
337
               <th>透析器型号</th>
337
               <th>透析器型号</th>
361
                   }}
361
                   }}
362
                 </td>
362
                 </td>
363
                 <td>
363
                 <td>
364
-                  {{ item.predialysis_evaluation.ultrafiltration_amount }}
364
+                  {{ item.prescription.target_ultrafiltration }}
365
                 </td>
365
                 </td>
366
                 <td>{{ setVascularAccess(item.prescription) }}</td>
366
                 <td>{{ setVascularAccess(item.prescription) }}</td>
367
                 <td>{{ setAnticoagulantsConfit(item.prescription) }}</td>
367
                 <td>{{ setAnticoagulantsConfit(item.prescription) }}</td>