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

config/index.js

@@ -29,8 +29,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-   // host: 'localhost',
+    // host: 'xt.test.sgjyun.com',
+   host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/xt_pages/outpatientCharges/newStatementPrint.vue

@@ -154,10 +154,7 @@
 
       },
       getInfo(order_id) {
-        if (this.$store.getters.xt_user.org_id == 3877 || 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 == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
-
           var that = this;
-
           axios.get('http://127.0.0.1:9532/api/settle/query', {
             params: {
               order_id: order_id,
@@ -175,8 +172,6 @@
                 that.info = response.data.data.info;
                 that.p_admin = response.data.data.printor_admin;
                 that.charge_admin = response.data.data.charge_admin;
-
-
                 that.info['p_admin'] =  that.p_admin;
                 that.info['charge_admin'] =  that.charge_admin;
 
@@ -233,7 +228,6 @@
             .catch(function (error) {
 
             });
-        }
       }
 
     },

src/xt_pages/outpatientCharges/settlementPrint.vue

@@ -162,7 +162,6 @@ export default {
 
     },
     getInfo(order_id) {
-      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9990 || this.$store.getters.xt_user.org_id == 0) {
 
         var that = this;
 
@@ -237,7 +236,6 @@ export default {
           .catch(function (error) {
 
           });
-      }
     }
   },
   created() {