Browse Source

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

陈少旭 2 weeks ago
parent
commit
05defe785b

+ 2 - 2
src/xt_pages/Pharmacy/PatientDispensing.vue View File

@@ -441,7 +441,7 @@ export default {
441 441
 
442 442
       if(this.textarea!=null){
443 443
         var  textAreaList = this.textarea.split(",")
444
-        console.log("textArrleti",textAreaList)
444
+        // console.log("textArrleti",textAreaList)
445 445
         var arr = []
446 446
         if(textAreaList!=null && textAreaList.length>0){
447 447
           for(let i=0;i<textAreaList.length;i++){
@@ -1223,7 +1223,7 @@ export default {
1223 1223
     },
1224 1224
     getDrugCode(id,DataSources,DrugCode,index,DrugId,type){
1225 1225
       this.drug_type = type
1226
-      console.log(type)
1226
+      console.log("type---------------",type)
1227 1227
       console.log( this.drug_type)
1228 1228
       if (type == 1){
1229 1229
         // 针对百霖

+ 6 - 6
src/xt_pages/Pharmacy/drugCode.vue View File

@@ -865,12 +865,12 @@ export default {
865 865
     },
866 866
     toFaYao(row) {
867 867
 
868
-      if (this.is_open == 1) {
869
-        if (row.drug_code == '') {
870
-          this.$message.error("药品追溯码不能为空!")
871
-          return
872
-        }
873
-      }
868
+      // if (this.is_open == 1) {
869
+      //   if (row.drug_code == '') {
870
+      //     this.$message.error("药品追溯码不能为空!")
871
+      //     return
872
+      //   }
873
+      // }
874 874
       var params = {
875 875
         drug_id: row.drug_id,
876 876
         patient_id: row.patient_id,

+ 6 - 6
src/xt_pages/drugSourceCode/drugCodeQuery.vue View File

@@ -494,12 +494,12 @@
494 494
       },
495 495
       toFaYao(row){
496 496
 
497
-        if(this.is_open == 1){
498
-          if(row.drug_code==''){
499
-             this.$message.error("药品追溯码不能为空!")
500
-             return
501
-          }
502
-        }
497
+        // if(this.is_open == 1){
498
+        //   if(row.drug_code==''){
499
+        //      this.$message.error("药品追溯码不能为空!")
500
+        //      return
501
+        //   }
502
+        // }
503 503
           var params= {
504 504
             drug_id:row.drug_id,
505 505
             patient_id:row.patient_id,

+ 86 - 45
src/xt_pages/qcd/workAnalysis/nurse.vue View File

@@ -402,11 +402,11 @@
402 402
         this.loading = true
403 403
         this.tableData = []
404 404
         this.modeList = []
405
+        this.list = []
405 406
         // console.log("params",params)
406 407
         GetNurseWorkloadTableData(params)
407 408
           .then(rs => {
408 409
             var resp = rs.data
409
-            console.log("列表2323323232323233232332323223233223233223",resp)
410 410
             if (resp.state == 1) {
411 411
               let total_cure = 0
412 412
               let total_puncture = 0
@@ -428,15 +428,12 @@
428 428
                 total_diffcult_nurse = total_diffcult_nurse + resp.data.data[i].difficult_nuser_count
429 429
                 total_new_fistula_nurse = total_new_fistula_nurse + resp.data.data[i].new_nuser_count
430 430
                 total_start_nurse = total_start_nurse + resp.data.data[i].start_nuser_count
431
-                // console.log( resp.data.data[i].start_nuser_count)
432
-
433
-                // console.log(total_start_nurse)
434 431
                 total_finish_nurse = total_finish_nurse + resp.data.data[i].finish_nuser_count
435 432
                 total_washpipe_nurse = total_washpipe_nurse + resp.data.data[i].washpipe_nuser_count
436 433
                 this.tableData.push(resp.data.data[i])
437 434
                 
438 435
              }        
439
-            //  this.list.push(obj)
436
+
440 437
               this.tableData.push( {
441 438
                 user_name:"合计",
442 439
                 cure_count:total_cure,
@@ -452,10 +449,9 @@
452 449
               console.log('33333',this.tableData)
453 450
               
454 451
               var dialysisCount = resp.data.dialysisCount
455
-                console.log("dialysisCount",dialysisCount)
452
+              console.log("dialysisCount",dialysisCount)
456 453
               for(let i=0;i<dialysisCount.length;i++){
457
-                // for()
458
-                // var obj={}
454
+               
459 455
                 if(dialysisCount[i].mode_id == 1){
460 456
                   dialysisCount[i].mode_id = "HD"
461 457
                 }
@@ -498,6 +494,84 @@
498 494
                if(dialysisCount[i].mode_id == 14){
499 495
                   dialysisCount[i].mode_id = "腹水回输"
500 496
                 }
497
+                if(dialysisCount[i].mode_id == 19){
498
+                  dialysisCount[i].mode_id = "IUF+HD"
499
+                }
500
+                if(dialysisCount[i].mode_id == 20){
501
+                  dialysisCount[i].mode_id = "UF"
502
+                }
503
+                if(dialysisCount[i].mode_id == 21){
504
+                  dialysisCount[i].mode_id = "HD+"
505
+                }
506
+                if(dialysisCount[i].mode_id == 22){
507
+                  dialysisCount[i].mode_id = "血浆胆红素吸附+HDF"
508
+                }
509
+                if(dialysisCount[i].mode_id == 23){
510
+                  dialysisCount[i].mode_id = "血浆胆红素吸附"
511
+                }
512
+                if(dialysisCount[i].mode_id == 24){
513
+                  dialysisCount[i].mode_id = "I-HDF"
514
+                }
515
+                if(dialysisCount[i].mode_id == 25){
516
+                  dialysisCount[i].mode_id = "HD高通"
517
+                }
518
+                if(dialysisCount[i].mode_id == 26){
519
+                  dialysisCount[i].mode_id = "CVVH"
520
+                }
521
+                if(dialysisCount[i].mode_id == 27){
522
+                  dialysisCount[i].mode_id = "CVVHD"
523
+                }
524
+                if(dialysisCount[i].mode_id == 28){
525
+                  dialysisCount[i].mode_id = "CVVHDF"
526
+                }
527
+                if(dialysisCount[i].mode_id == 29){
528
+                  dialysisCount[i].mode_id = "PE"
529
+                }
530
+                if(dialysisCount[i].mode_id == 30){
531
+                  dialysisCount[i].mode_id = "血浆胆红素吸附+HP"
532
+                }
533
+                if(dialysisCount[i].mode_id == 31){
534
+                  dialysisCount[i].mode_id = "HPD"
535
+                }
536
+                if(dialysisCount[i].mode_id == 32){
537
+                  dialysisCount[i].mode_id = "HDP"
538
+                }
539
+                if(dialysisCount[i].mode_id == 33){
540
+                  dialysisCount[i].mode_id = "HFD"
541
+                }
542
+                if(dialysisCount[i].mode_id == 34){
543
+                  dialysisCount[i].mode_id = "HDF100"
544
+                }
545
+                if(dialysisCount[i].mode_id == 35){
546
+                  dialysisCount[i].mode_id = "HDF600"
547
+                }
548
+                if(dialysisCount[i].mode_id == 36){
549
+                  dialysisCount[i].mode_id = "HDF800"
550
+                }
551
+                if(dialysisCount[i].mode_id == 37){
552
+                  dialysisCount[i].mode_id = "HDF1000"
553
+                }
554
+                if(dialysisCount[i].mode_id == 38){
555
+                  dialysisCount[i].mode_id = "HDF80"
556
+                }
557
+                if(dialysisCount[i].mode_id == 39){
558
+                  dialysisCount[i].mode_id = "HF16"
559
+                }
560
+                if(dialysisCount[i].mode_id == 40){
561
+                  dialysisCount[i].mode_id = "HD(无肝素)"
562
+                }
563
+                if(dialysisCount[i].mode_id == 41){
564
+                  dialysisCount[i].mode_id = "HDF17H"
565
+                }
566
+                if(dialysisCount[i].mode_id == 42){
567
+                  dialysisCount[i].mode_id = "HD."
568
+                }
569
+                if(dialysisCount[i].mode_id == 43){
570
+                  dialysisCount[i].mode_id = "HD(2)"
571
+                }
572
+                if(dialysisCount[i].mode_id == 44){
573
+                  dialysisCount[i].mode_id = "导管溶栓"
574
+                }
501 575
               }
502 576
                 let dataInfo = {}
503 577
                 dialysisCount.forEach((item, index) => {
@@ -713,46 +787,14 @@
713 787
         this.export_file_step_two()
714 788
       },
715 789
       export_file_step_two: function(){
790
+        console.log("likst======================",this.list)
791
+       
716 792
         this.downloadLoading = true
717 793
         import('@/vendor/Export2Excel').then(excel => {
718
-          // const filterVal = [
719
-          //   '区号',
720
-          //   '机号'
721
-          // ]
722
-          // if (this.export_type == 0) {
723 794
             const multiHeader = [['姓名', '穿刺', '治疗', '换药', '疑难穿刺', '上机', '下机', '冲管', '宣教小结', '合计']]
724
-          //  const header=['姓名', '穿刺', '治疗', '换药', '疑难穿刺', '上机', '下机', '冲管', '宣教小结', '合计']
725
-            // const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
795
+          
726 796
             const merges = ['A1', 'B1', 'C1', 'D1', 'E1', 'F1', 'G1', 'H1', 'I1', 'J1']
727
-            // var list = []
728
-            // let i = 0
729
-            // var jihaos=[]
730
-            // for (let key in this.tableData) {
731
-            //   var tempValue
732
-            //   if(this.tableData[key].admin_user_id !=''){
733
-            //     jihaos.push(this.tableData[key].admin_user_id)
734
-            //     // console.log('2222222',jihaos);
735
-            //   }
736
-              
737
-            //   if (i == 0) {
738
-            //     let m = 'A2' + ':' + 'A' + (1 + jihaos.length)
739
-            //     tempValue = (2 + jihaos.length)
740
-            //     merges.push(m)
741
-            //   } 
742
-            //   else {
743
-            //     let m = 'A' + (tempValue + 1) + ':' + 'A' + ((tempValue + 1) + jihaos.length - 1)
744
-            //     tempValue = ((tempValue + 1) + jihaos.length - 1)
745
-            //     merges.push(m)
746
-            //   }
747
-            //   // for (let b = 0; b < jihaos.length; b++) {
748
-            //     let obj = {}
749
-            //     obj['name'] = this.tableData[key].user_name
750
-            //     // obj['区号'] = this.partitions[key].name
751
-            //     // obj['机号'] = jihaos[b].number.toString()
752
-            //     list.push(obj)
753
-            //   // }
754
-            //   // i++
755
-            // }
797
+            
756 798
             var data = []
757 799
 
758 800
             this.list.map(item => {
@@ -766,7 +808,6 @@
766 808
             excel.export_json_to_excel2({
767 809
               
768 810
               multiHeader,
769
-              // header,
770 811
               merges,
771 812
               data,
772 813
               filename

+ 14 - 14
src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue View File

@@ -644,14 +644,14 @@ export default {
644 644
            
645 645
               list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
646 646
              
647
-              if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
647
+              if(this.org_id == 10644 || this.org_id == 10752){
648 648
                 list[i].drugInMoney = ""
649 649
               }else{
650 650
                 list[i].drugInMoney = list[i].last_price
651 651
               }
652
-              if(this.org_id == 10697 || this.org_id == 9478){
653
-                list[i].drugSaleMoney =  (list[i].over_count_one * list[i].last_price).toFixed(2)
654
-              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
652
+              if(this.org_id == 10697 || this.org_id == 9478 || this.org_id == 0){
653
+                list[i].drugSaleMoney =  (list[i].over_count_one/list[i].min_number * list[i].last_price).toFixed(2)
654
+              }else if(this.org_id == 10644 || this.org_id == 10752){
655 655
               
656 656
                 list[i].drugSaleMoney =  this.GetInitStartFlowPice(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
657 657
               } else{
@@ -662,10 +662,10 @@ export default {
662 662
               list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
663 663
               list[i].drugAddOne = this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
664 664
               
665
-              if( this.org_id == 10697 || this.org_id == 9478){
665
+              if( this.org_id == 10697 || this.org_id == 9478 || this.org_id == 0){
666 666
                  list[i].drugAddPrice = list[i].last_price
667
-                 list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne).toFixed(2)
668
-              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
667
+                 list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne/list[i].min_number).toFixed(2)
668
+              }else if(this.org_id == 10644 || this.org_id == 10752){
669 669
                 list[i].drugAddPrice = "/"
670 670
                 list[i].drugAddSalePrice = this.drugAddInfoOnePirce(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
671 671
                 console.log("本期增加加淀粉",list[i].drugAddSalePrice)
@@ -678,10 +678,10 @@ export default {
678 678
               list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
679 679
               list[i].drugOutOne =this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
680 680
            
681
-              if( this.org_id == 10697 || this.org_id == 9478){
681
+              if( this.org_id == 10697 || this.org_id == 9478 || this.org_id == 0){
682 682
                 list[i].drugOutPrice = list[i].last_price
683
-                list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].last_price).toFixed(2)
684
-              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
683
+                list[i].drugOutSalePrice = (list[i].drugOutOne/list[i].min_number * list[i].last_price).toFixed(2)
684
+              }else if(this.org_id == 10644 || this.org_id == 10752){
685 685
                 list[i].drugOutPrice = "/"
686 686
                 list[i].drugOutSalePrice= this.getDrugOutPriceOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
687 687
               } else{
@@ -698,10 +698,10 @@ export default {
698 698
             }
699 699
              
700 700
             list[i].overDrugOne = this.GetDrugOverOne(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
701
-            if(this.org_id == 10697 || this.org_id == 9478){
701
+            if(this.org_id == 10697 || this.org_id == 9478 || this.org_id == 0){
702 702
                 list[i].overDrugPrice = list[i].last_price
703
-                list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].last_price).toFixed(2)
704
-            }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
703
+                list[i].oveDrugSaleMoney = (list[i].overDrugOne/list[i].min_number * list[i].last_price).toFixed(2)
704
+            }else if(this.org_id ==10644 || this.org_id == 10752){
705 705
               console.log("加个2323323",list[i].drugAddSalePrice)
706 706
                 list[i].overDrugPrice = ""
707 707
                 list[i].oveDrugSaleMoney = this.GetDrugOverOnePrice(list[i].drugSaleMoney,list[i].drugAddSalePrice,list[i].drugOutSalePrice,list[i].min_number,list[i].min_unit,list[i].max_unit)
@@ -712,7 +712,7 @@ export default {
712 712
            
713 713
             }
714 714
             
715
-            if(this.org_id == 10697 || this.org_id == 9478){
715
+            if(this.org_id == 10697 || this.org_id == 9478 || this.org_id == 0){
716 716
               if(list!=null && list.length>0){
717 717
                 var obj = {drug_type:"",drug_name:"合计",dose:"",dose_unit:"",min_number:"",min_unit:"",max_unit:"",medical_insurance_number:"",manufacturer:"",dealer:"",drugIn:"",drugInMoney:"",drugSaleMoney:0,drugAdd:"",drugAddPrice:"",drugAddSalePrice:0,drugOut:"",drugOutPrice:"",drugOutSalePrice:0,overDrug:"",overDrugPrice:"",oveDrugSaleMoney:0}
718 718
                 for(let i=0;i<list.length;i++){

+ 4 - 4
src/xt_pages/stock/drugs/components/purchaseNewDrugQueryPrint.vue View File

@@ -366,7 +366,7 @@ export default {
366 366
               }
367 367
 
368 368
                 if( this.org_id == 10697 || this.org_id == 9478){
369
-                  list[i].drugSaleMoney =  (list[i].over_count_one * list[i].last_price).toFixed(2)
369
+                  list[i].drugSaleMoney =  (list[i].over_count_one/list[i].min_number * list[i].last_price).toFixed(2)
370 370
                 }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
371 371
                   list[i].drugAddPrice = ""
372 372
                   list[i].drugSaleMoney =  this.GetInitStartFlowPice(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
@@ -380,7 +380,7 @@ export default {
380 380
                
381 381
                 if(this.org_id == 10697 || this.org_id ==9478){
382 382
                  list[i].drugAddPrice = list[i].last_price
383
-                 list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne).toFixed(2)
383
+                 list[i].drugAddSalePrice = (list[i].last_price *list[i].drugAddOne/list[i].min_number).toFixed(2)
384 384
                 }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
385 385
                   list[i].drugAddPrice = "/"
386 386
                   list[i].drugAddSalePrice = this.drugAddInfoOnePirce(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
@@ -397,7 +397,7 @@ export default {
397 397
 
398 398
                 if( this.org_id == 10697 || this.org_id == 9478){
399 399
                   list[i].drugOutPrice = list[i].last_price
400
-                  list[i].drugOutSalePrice = (list[i].drugOutOne * list[i].last_price).toFixed(2)
400
+                  list[i].drugOutSalePrice = (list[i].drugOutOne/list[i].min_number * list[i].last_price).toFixed(2)
401 401
                 }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
402 402
                   list[i].drugOutPrice = "/"
403 403
                   list[i].drugOutSalePrice= this.getDrugOutPriceOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
@@ -416,7 +416,7 @@ export default {
416 416
                 list[i].overDrugOne = this.GetDrugOverOne(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
417 417
                 if(this.org_id == 10697 || this.org_id == 9478){
418 418
                   list[i].overDrugPrice = list[i].last_price
419
-                  list[i].oveDrugSaleMoney = (list[i].overDrugOne * list[i].last_price).toFixed(2)
419
+                  list[i].oveDrugSaleMoney = (list[i].overDrugOne/list[i].min_number * list[i].last_price).toFixed(2)
420 420
                 }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
421 421
                   list[i].overDrugPrice = ""
422 422
                   list[i].oveDrugSaleMoney = this.GetDrugOverOnePrice(list[i].drugSaleMoney,list[i].drugAddSalePrice,list[i].drugOutSalePrice,list[i].min_number,list[i].min_unit,list[i].max_unit)

+ 6 - 2
src/xt_pages/stock/drugs/drugInventoryModePrint.vue View File

@@ -433,8 +433,8 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
433 433
                   arr[i].month_out_total_price = (this.getOutCountOne(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) * this.getRetailPrice(arr[i].drug_id)).toFixed(2)
434 434
                   
435 435
                   arr[i].month_out_total_price_one =this.getOutCountOne(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) * this.getRetailPrice(arr[i].drug_id)
436
-                  arr[i].month_over_total_price = (this.getSumCountOne(arr[i].sum_count,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) * this.getBuyPrice(arr[i].drug_id)).toFixed(2)
437
-                  arr[i].month_over_total_price_one =this.getSumCountOne(arr[i].sum_count,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) *  this.getBuyPrice(arr[i].drug_id)
436
+                  arr[i].month_over_total_price = (this.getSumCountTwo(arr[i].sum_count,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) * this.getBuyPrice(arr[i].drug_id)).toFixed(2)
437
+                  arr[i].month_over_total_price_one =this.getSumCountTwo(arr[i].sum_count,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) *  this.getBuyPrice(arr[i].drug_id)
438 438
                 }
439 439
 
440 440
                 this.tableList = arr
@@ -1004,6 +1004,10 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
1004 1004
         },
1005 1005
         getSumCountOne(total,min_number,min_unit,max_unit){
1006 1006
           return total
1007
+        },
1008
+
1009
+        getSumCountTwo(total,min_number,min_unit,max_unit){
1010
+          return total/min_number
1007 1011
         }
1008 1012
 
1009 1013
         

+ 27 - 3
src/xt_pages/user/patients.vue View File

@@ -286,7 +286,7 @@
286 286
       </div> -->
287 287
       <div  class="cell clearfix">
288 288
         <label class="title"><span class="name">主管护士</span> : </label>
289
-        <el-select v-model="form.nurse" style="width:200px"  @change="changeNuseSearch">
289
+        <el-select v-model="listQuery.nurse" style="width:200px"  @change="changeNuseSearch">
290 290
             <el-option
291 291
               placeholder="主管护士"
292 292
               v-for="(item,index) in adminUserOptions"
@@ -295,6 +295,20 @@
295 295
               :value="item.id"
296 296
              
297 297
             
298
+            />
299
+        </el-select>
300
+      </div>
301
+      <div  class="cell clearfix">
302
+        <label class="title"><span class="name">医保地区</span> : </label>
303
+        <el-select v-model="listQuery.insuplc_admdvs_name" style="width:200px"  @change="changeInsuplcAdmdv">
304
+            <el-option
305
+              placeholder="医保地区"
306
+              v-for="(item,index) in  patientZoneList"
307
+              :key="index"
308
+              :label="item.insuplc_admdvs_name"
309
+              :value="item.insuplc_admdvs_name"
310
+             
311
+            
298 312
             />
299 313
         </el-select>
300 314
       </div>
@@ -928,6 +942,7 @@
928 942
           patientSoureType:'',
929 943
           nurse:0,
930 944
           patient_type:"",
945
+          insuplc_admdvs_name:"全部",
931 946
         },
932 947
         multipleSelection: [],
933 948
         bindWechatDialog: false,
@@ -958,14 +973,16 @@
958 973
           patient_address:"",
959 974
           patient_start_time:"",
960 975
           patient_end_time:"",
961
-          nurse:"0"
976
+          nurse:"0",
977
+          
962 978
         },
963 979
         adminUserOptions:[],
964 980
         scheduleList:[],
965 981
         patientsList:[],
966 982
         patienttypeArr:[{value:1,label:'血透患者'},{value:2,label:'慢病患者'},{value:3,label:'会员患者'},
967 983
                         {value:4,label:'腹透患者'},{value:5,label:'CKD患者'},{value:6,label:'其他患者'}
968
-        ]
984
+        ],
985
+        patientZoneList:[]
969 986
       }
970 987
     },
971 988
     created() {
@@ -1650,6 +1667,9 @@
1650 1667
       changeNuseSearch(){
1651 1668
         this.getList()
1652 1669
       },
1670
+      changeInsuplcAdmdv(){
1671
+        this.getList()
1672
+      },
1653 1673
       getList() {
1654 1674
         //  console.log("query23323223wo",this.listQuery)
1655 1675
         fetchList(this.listQuery).then(response => {
@@ -1812,6 +1832,10 @@
1812 1832
            if(response.data.state == 1){
1813 1833
              this.gridData = response.data.data.patients;
1814 1834
              this.totalOne = response.data.data.total;
1835
+            var patientZoneList =  response.data.data.patientZoneList
1836
+            var obj = {id:0,insuplc_admdvs_name:"全部"}
1837
+            this.patientZoneList.push(obj)
1838
+            this.patientZoneList.push(...patientZoneList)
1815 1839
              var  value = response.data.data.total
1816 1840
              if(value == 0){
1817 1841
                this.value = ""

+ 13 - 13
src/xt_permission.js View File

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
12 12
 
13 13
 router.beforeEach((to, from, next) => {
14 14
   // 线上注释
15
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-    store.dispatch('VerifyConfigList', []).then(() => {
17
-      next()
18
-    })
19
-  }
20
-  if (store.getters.permission_routers === undefined) {
21
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-      next()
23
-    })
24
-  } else {
25
-    next()
26
-  }
27
-  return
15
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+  //   store.dispatch('VerifyConfigList', []).then(() => {
17
+  //     next()
18
+  //   })
19
+  // }
20
+  // if (store.getters.permission_routers === undefined) {
21
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+  //     next()
23
+  //   })
24
+  // } else {
25
+  //   next()
26
+  // }
27
+  // return
28 28
 //  // 线上注释
29 29
   NProgress.start()
30 30
   // console.log(store.getters.current_role_urls.indexOf(to.path))