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

src/xt_pages/Pharmacy/drugCode.vue

@@ -500,16 +500,16 @@ export default {
             });
           return false
         } else {
-          this.isloading = true
+          that.isloading = true
 
           //有打开则调用接口
           axios.get('http://127.0.0.1:9532/api/changedrug/five', {params: params}).then(function (response) {
             if (response.data.state == 0) {
-              this.isloading = false
+              that.isloading = false
               that.$message.error(response.data.data.msg);
               return false
             } else {
-              this.isloading = false
+              that.isloading = false
               if (response.data.data.failed_code == -10) {
                 that.$confirm(response.data.data.msg, '医保错误信息', {
                   confirmButtonText: '确 定',
@@ -523,7 +523,7 @@ export default {
               }
             }
           }).catch(function (error) {
-            this.isloading = false
+            that.isloading = false
           })
         }
       }).catch(function (error) {

src/xt_pages/drugSourceCode/drugQuery.vue

@@ -639,9 +639,8 @@ export default {
           return false
         } else {
 
-          this.tableData = []
+          that.tableData = []
           if(that.stock_type == 1){
-
             axios.get('http://127.0.0.1:9532/api/3508',{params:params}).then(function(response) {
               if (response.data.state == 0) {
                 that.$message.error(response.data.data.msg);
@@ -654,6 +653,7 @@ export default {
                   }).then(() => {
 
                   }).catch(() => {
+
                   })
                 }else{
                   that.tableData = that.tableData.concat(response.data.data.info)
@@ -806,8 +806,6 @@ export default {
           .catch(() => {});
       })
 
-
-
     },
     change(){
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -3549,7 +3549,7 @@ export default {
         }
 
         if (this.hisPatientInfo.id_card_type == 1) {
-          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) {
+          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) {
             this.pwdFormVisible = true
             this.pwd = ''
           } else {