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

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -438,12 +438,12 @@
         })
           .then(function (response) {
             if (response.data.state == 0) {
-              this.read_loading = false
+              that.read_loading = false
 
               that.$message.error(response.data.msg)
               return false
             } else {
-              this.read_loading = false
+              thatthat.read_loading = false
               var patient = response.data.data.patient
               if (that.form.id_card_type == 1) {
                 that.form.id = patient.id

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -86,7 +86,7 @@
 
       },
       getInfo(obj) {
-        if (this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9504) {
+        if (this.$store.getters.xt_user.org_id == 9504) {
           var that = this
           axios.get('http://127.0.0.1:9532/sz/api/settle/query', {
             params: obj

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -57,7 +57,7 @@
             <div class="mainRight">
 
                 <div class="mainCell fixedCell" style="margin-bottom:10px;">
-                    <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 0">
+                    <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 0">
                         <el-button v-loading="loadingone" size="small"
                                    @click="sz_open(1)"
                                    type="primary">挂号
@@ -83,12 +83,7 @@
                         >
                             退费
                         </el-button>
-
-
-
-
                         <el-button size="small" @click="sz_open(10)" type="primary">打印</el-button>
-
                     </div>
 
 
@@ -114,7 +109,7 @@
 
 
 
-                    <div v-if="this.$store.getters.xt_user.org_id != 9504 && this.$store.getters.xt_user.org_id != 9538">
+                    <div v-if="this.$store.getters.xt_user.org_id != 9504">
                         <el-button size="small" @click="open(3)" type="primary">打印</el-button>
                         <el-button v-loading="loadingone" size="small"
                                    @click="open(6)"
@@ -618,7 +613,7 @@
         }
 
         this.loadingtwo = true
-        if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9504) {
+        if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9504) {
 
           var that = this
           axios.get('http://127.0.0.1:9532/sz/api/settle/get', {
@@ -718,7 +713,7 @@
         this.loadingone = true
 
         var that = this
-        if (this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9504) {
+        if ( this.$store.getters.xt_user.org_id == 9504) {
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
             params: forms
           })
@@ -799,7 +794,7 @@
 
         var that = this
 
-        if (this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 4 ||  this.$store.getters.xt_user.org_id == 9504) {
+        if ( this.$store.getters.xt_user.org_id == 4 ||  this.$store.getters.xt_user.org_id == 9504) {
 
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
             params: forms

src/xt_pages/outpatientRegistration/index.vue

@@ -684,12 +684,12 @@
         })
           .then(function (response) {
             if (response.data.state == 0) {
-              this.read_loading = false
+              that.read_loading = false
 
               that.$message.error(response.data.msg)
               return false
             } else {
-              this.read_loading = false
+              that.read_loading = false
 
               var patient = response.data.data.patient
               if (that.form.id_card_type == 1) {
@@ -1136,7 +1136,7 @@
               params['admin_user_id'] = this.$store.getters.xt_user.user.id
             this.loadingone = true
 
-            if (this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9504) {
+            if (this.$store.getters.xt_user.org_id == 9504) {
               var that = this
 
               axios.get('http://127.0.0.1:9532/sz/api/register/get', {