Parcourir la source

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

see999 il y a 3 ans
Parent
révision
63620a3d7b

+ 3 - 0
src/xt_pages/outpatientCharges/components/registerDialog.vue Voir le fichier

637
         this.form.id_card_type = 2
637
         this.form.id_card_type = 2
638
         this.form.certificates = 1
638
         this.form.certificates = 1
639
 
639
 
640
+        if (this.$store.getters.xt_user.org_id == 10188){
641
+          this.form.id_card_type = 1
642
+        }
640
 
643
 
641
         if (departments.length > 0) {
644
         if (departments.length > 0) {
642
           this.form.department = departments[0].id
645
           this.form.department = departments[0].id

+ 1 - 1
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Voir le fichier

2123
         }
2123
         }
2124
 
2124
 
2125
         if (this.hisPatientInfo.id_card_type == 1) {
2125
         if (this.hisPatientInfo.id_card_type == 1) {
2126
-          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106) {
2126
+          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188) {
2127
             this.pwdFormVisible = true
2127
             this.pwdFormVisible = true
2128
             this.pwd = ''
2128
             this.pwd = ''
2129
           } else {
2129
           } else {