Browse Source

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

28169 3 months ago
parent
commit
ef1a320423

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

500
             });
500
             });
501
           return false
501
           return false
502
         } else {
502
         } else {
503
-          this.isloading = true
503
+          that.isloading = true
504
 
504
 
505
           //有打开则调用接口
505
           //有打开则调用接口
506
           axios.get('http://127.0.0.1:9532/api/changedrug/five', {params: params}).then(function (response) {
506
           axios.get('http://127.0.0.1:9532/api/changedrug/five', {params: params}).then(function (response) {
507
             if (response.data.state == 0) {
507
             if (response.data.state == 0) {
508
-              this.isloading = false
508
+              that.isloading = false
509
               that.$message.error(response.data.data.msg);
509
               that.$message.error(response.data.data.msg);
510
               return false
510
               return false
511
             } else {
511
             } else {
512
-              this.isloading = false
512
+              that.isloading = false
513
               if (response.data.data.failed_code == -10) {
513
               if (response.data.data.failed_code == -10) {
514
                 that.$confirm(response.data.data.msg, '医保错误信息', {
514
                 that.$confirm(response.data.data.msg, '医保错误信息', {
515
                   confirmButtonText: '确 定',
515
                   confirmButtonText: '确 定',
523
               }
523
               }
524
             }
524
             }
525
           }).catch(function (error) {
525
           }).catch(function (error) {
526
-            this.isloading = false
526
+            that.isloading = false
527
           })
527
           })
528
         }
528
         }
529
       }).catch(function (error) {
529
       }).catch(function (error) {

+ 2 - 4
src/xt_pages/drugSourceCode/drugQuery.vue View File

639
           return false
639
           return false
640
         } else {
640
         } else {
641
 
641
 
642
-          this.tableData = []
642
+          that.tableData = []
643
           if(that.stock_type == 1){
643
           if(that.stock_type == 1){
644
-
645
             axios.get('http://127.0.0.1:9532/api/3508',{params:params}).then(function(response) {
644
             axios.get('http://127.0.0.1:9532/api/3508',{params:params}).then(function(response) {
646
               if (response.data.state == 0) {
645
               if (response.data.state == 0) {
647
                 that.$message.error(response.data.data.msg);
646
                 that.$message.error(response.data.data.msg);
654
                   }).then(() => {
653
                   }).then(() => {
655
 
654
 
656
                   }).catch(() => {
655
                   }).catch(() => {
656
+
657
                   })
657
                   })
658
                 }else{
658
                 }else{
659
                   that.tableData = that.tableData.concat(response.data.data.info)
659
                   that.tableData = that.tableData.concat(response.data.data.info)
806
           .catch(() => {});
806
           .catch(() => {});
807
       })
807
       })
808
 
808
 
809
-
810
-
811
     },
809
     },
812
     change(){
810
     change(){
813
 
811
 

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

3549
         }
3549
         }
3550
 
3550
 
3551
         if (this.hisPatientInfo.id_card_type == 1) {
3551
         if (this.hisPatientInfo.id_card_type == 1) {
3552
-          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318 && this.$store.getters.xt_user.org_id !=  10210 && this.$store.getters.xt_user.org_id !=  10375 &&  this.$store.getters.xt_user.org_id !=  10480 &&  this.$store.getters.xt_user.org_id !=  10387  &&  this.$store.getters.xt_user.org_id !=  10598 &&  this.$store.getters.xt_user.org_id !=  10721 &&   this.$store.getters.xt_user.org_id !=  10726 &&   this.$store.getters.xt_user.org_id !=  10567 &&  this.$store.getters.xt_user.org_id !=  10697 &&   this.$store.getters.xt_user.org_id !=  10724 &&   this.$store.getters.xt_user.org_id !=  10571) {
3552
+          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318 && this.$store.getters.xt_user.org_id !=  10210 && this.$store.getters.xt_user.org_id !=  10375 &&  this.$store.getters.xt_user.org_id !=  10480 &&  this.$store.getters.xt_user.org_id !=  10387  &&  this.$store.getters.xt_user.org_id !=  10598 &&  this.$store.getters.xt_user.org_id !=  10721 &&   this.$store.getters.xt_user.org_id !=  10726 &&   this.$store.getters.xt_user.org_id !=  10567 &&  this.$store.getters.xt_user.org_id !=  10697 &&   this.$store.getters.xt_user.org_id !=  10724 &&   this.$store.getters.xt_user.org_id !=  10571 &&   this.$store.getters.xt_user.org_id !=  10633) {
3553
             this.pwdFormVisible = true
3553
             this.pwdFormVisible = true
3554
             this.pwd = ''
3554
             this.pwd = ''
3555
           } else {
3555
           } else {