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/outpatientChargesManagement.vue

@@ -695,6 +695,8 @@
       }
     },
     created() {
+      var xml=new ActiveXObject("yinhai.yh_hb_sctr")
+      console
       const tableHeight = document.body.clientHeight - 290
       this.tableHeight = tableHeight
       var nowDate = new Date()
@@ -971,7 +973,7 @@
             }
           })
         } else {
-          if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
+          if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138 ||this.$store.getters.xt_user.org_id == 10088) {
             axios.get('http://127.0.0.1:9532/api/register/get', {
               params: forms,
               headers: {
@@ -2088,7 +2090,7 @@
             })
           }
         } else if (index == 6) {
-          if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028) {
+          if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10088) {
             this.$refs.register9504.show()
           } else {
             this.$refs.register.show()

src/xt_pages/outpatientRegistration/index.vue

@@ -959,7 +959,6 @@
           this.is_Name = true
           return
         }
-
         if (this.form.sex == '') {
           this.$message.error('患者性别不能为空')
         }
@@ -1583,7 +1582,7 @@
 
     },
     created() {
-      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138) {
+      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10088) {
         this.form.certificates = 2
         this.form.id_card_type = 1
         this.form.settlementValue = 1