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

@@ -86,7 +86,7 @@
 
       },
       getInfo(obj) {
-        if (this.$store.getters.xt_user.org_id == 9504) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
           var that = this
           axios.get('http://127.0.0.1:9532/sz/api/settle/query', {
             params: obj
@@ -109,12 +109,20 @@
                   that.info['patient_name'] = response.data.data.patient_name
                   that.info['doctor_code'] = response.data.data.doctor_code
                   that.info['doctor_name'] = response.data.data.doctor_name
-                  that.info['health_card_no'] = response.data.data.health_card_no
+                  if(response.data.data.health_card_no_two.length == 0){
+                    that.info['health_card_no'] = response.data.data.health_card_no
+                  }else{
+                    that.info['health_card_no'] = response.data.data.health_card_no_two
+                  }
+
                   that.info['order_number'] = response.data.data.order_number
 
                   that.info['department'] =  response.data.data.department
                   that.info['yiliao_leibie'] =  response.data.data.yiliao_leibie
 
+                  that.info['before_money'] =  response.data.data.before_money
+                  that.info['after_money'] =   response.data.data.after_money
+
                   that.info['org_name'] = that.$store.getters.xt_user.org.org_name
                   console.log("～～～～" + that.info)
 

src/xt_pages/outpatientCharges/newTreatTemplate/printOne.vue

@@ -77,9 +77,9 @@
                 </div>
                 <div class="moneyBox">
                     <p>实收金：{{info.transBody.akc264}}元</p>
-                    <p>记账前金额：{{0.00}}元</p>
+                    <p>记账前金额：{{info.before_money}}元</p>
                     <p>扣款金额：{{0.00}}元</p>
-                    <p>记账后金额：{{0.00}}元</p>
+                    <p>记账后金额：{{info.after_money}}元</p>
                     <p>找赎金：{{0.00}}元</p>
                 </div>
                 <div class="actionBar">

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 == 0">
+                    <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028">
                         <el-button v-loading="loadingone" size="small"
                                    @click="sz_open(1)"
                                    type="primary">挂号
@@ -110,7 +110,7 @@
 
 
 
-                    <div v-if="this.$store.getters.xt_user.org_id != 9504">
+                    <div v-if="this.$store.getters.xt_user.org_id != 9504 && this.$store.getters.xt_user.org_id != 10028">
                         <el-button size="small" @click="open(3)" type="primary">打印</el-button>
                         <el-button v-loading="loadingone" size="small"
                                    @click="open(6)"
@@ -136,13 +136,13 @@
                         </el-button>
 
                         <el-button
-                                v-if="this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877"
+                                v-if="this.$store.getters.xt_user.org_id == 9919 "
                                 size="small" @click="open(10)" type="primary"
                         >退号
                         </el-button>
 
                         <el-button
-                                v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 3877"
+                                v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"
                                 size="small" @click="open(11)" type="primary"
                         >撤销明细
                         </el-button>
@@ -613,7 +613,7 @@
 
         }
 
-        if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9504) {
+        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504) {
           var that = this
           axios.get('http://127.0.0.1:9532/sz/api/settle/get', {
             params: form
@@ -645,7 +645,7 @@
 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877) {
+        } else if (this.$store.getters.xt_user.org_id == 9919) {
           var that = this
           axios.get('http://127.0.0.1:9532/api/upload/get', {
             params: form
@@ -707,7 +707,7 @@
         this.loadingone = true
 
         var that = this
-        if ( this.$store.getters.xt_user.org_id == 9504) {
+        if ( this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
             params: forms
           })
@@ -788,7 +788,7 @@
 
         var that = this
 
-        if ( this.$store.getters.xt_user.org_id == 4 ||  this.$store.getters.xt_user.org_id == 9504) {
+        if ( this.$store.getters.xt_user.org_id == 10028 ||  this.$store.getters.xt_user.org_id == 9504) {
 
           axios.get('http://127.0.0.1:9532/sz/api/register/get', {
             params: forms
@@ -858,7 +858,7 @@
 
             })
 
-        } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877) {
+        } else if (this.$store.getters.xt_user.org_id == 9919 ) {
 
           axios.get('http://127.0.0.1:9532/api/register/get', {
             params: forms
@@ -1475,7 +1475,7 @@
           }
 
         } else if (index == 5) {
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877) {
+          if (this.$store.getters.xt_user.org_id == 9919 ) {
 
             var that = this
             this.$confirm('是否退费', '退费', {
@@ -1570,7 +1570,7 @@
 
           var that = this
 
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877) {
+          if (this.$store.getters.xt_user.org_id == 9919) {
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
               params: params
             })
@@ -1707,7 +1707,7 @@
             })
         } else if (index == 15) {
           var that = this
-          if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919) {
+          if (this.$store.getters.xt_user.org_id == 9919) {
 
             if (this.diagnosis.length || this.diagnosis == 0) {
               that.$message.error('诊断不能为空,请选择诊断内容')
@@ -1816,7 +1816,7 @@
 
           }
           this.loadingtwo = true
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877) {
+          if (this.$store.getters.xt_user.org_id == 9919 ) {
             var that = this
             axios.get('http://127.0.0.1:9532/api/pre_upload/get', {
               params: form

src/xt_pages/outpatientCharges/summary.vue

@@ -197,7 +197,7 @@
     },
     methods: {
       toPrint(row){
-        if(this.$store.getters.xt_user.org_id == 9504){
+        if(this.$store.getters.xt_user.org_id == 9504 ||this.$store.getters.xt_user.org_id == 10028){
           this.statementVisible9504 = true
           let obj = {
             order_id: row.id,

src/xt_pages/outpatientCharges/treatTemplate/printOne.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <div id='prescription-print' class="prescription-print">
-            <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 || this.$store.getters.xt_user.org_id == 10028">
                 <div class="printTitle">{{orgname}}&nbsp;&nbsp;医药费收据及收费项目清单</div>
                 <div class="infoMain">
                     <div class="infoP">医院(药店)编号：{{org_code}}</div>
@@ -346,7 +346,7 @@
     },
     created() {
 
-      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 9538) {
+      if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
         this.orgname = xtuser.org.org_name
         var form = {
           'order_id': this.paramsObj.order_id,

src/xt_pages/outpatientRegistration/index.vue

@@ -3,7 +3,7 @@
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-        <div v-if="this.$store.getters.xt_user.org_id == 9504 || 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 == 10028"
              class="app-container">
             <div class="nameTitle">患者基本信息:</div>
             <div class="formMain">
@@ -938,7 +938,7 @@
             params['admin_user_id'] = this.$store.getters.xt_user.user.id
             this.loadingone = true
 
-            if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 0) {
+            if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
               var that = this
               axios.get('http://127.0.0.1:9532/sz/api/register/get', {
                 params: params
@@ -1133,7 +1133,7 @@
               params['admin_user_id'] = this.$store.getters.xt_user.user.id
             this.loadingone = true
 
-            if (this.$store.getters.xt_user.org_id == 9504) {
+            if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
               var that = this
 
               axios.get('http://127.0.0.1:9532/sz/api/register/get', {

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -3,7 +3,7 @@
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-        <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 0" class="app-container">
+        <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028" class="app-container">
             <div class="cell clearfix">
                 <!-- <el-input style="width: 180px;" v-model.trim="search_input" class="filter-item"/> -->
                 <el-autocomplete