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

src/xt_pages/hospitalStation/chargeDetailManagement.vue

@@ -76,6 +76,7 @@
             <el-button
                 v-if="(this.radio == 1 && this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 )"
                 size="small"
+                v-loading="isUpload"
                 @click="open(1)"
                 type="primary">上传费用明细
             </el-button>
@@ -85,6 +86,7 @@
                 v-if="(this.radio == 1 && this.hisPatientInfo.balance_accounts_type == 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 )"
                 size="small"
                 @click="open(1)"
+                v-loading="isUpload"
                 type="primary">上传费用明细
             </el-button>
 
@@ -92,6 +94,9 @@
             <el-button
                 v-if="( this.radio == 2 &&this.hisPatientInfo.balance_accounts_type != 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
                 size="small" @click="open(2)" type="primary"
+                v-loading="isUpload"
+
+
             >撤销明细
             </el-button>
 
@@ -100,6 +105,8 @@
             <el-button
                 v-if="( this.radio == 2 &&this.hisPatientInfo.balance_accounts_type == 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
                 size="small" @click="open(2)" type="primary"
+                v-loading="isUpload"
+
             >撤销明细
             </el-button>
 
@@ -111,12 +118,14 @@
                 v-if="( this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 )"
                 size="small"
                 @click="open(1)"
+                v-loading="isUpload"
                 type="primary">上传费用明细
             </el-button>
 
             <el-button
               v-if="( this.hisPatientInfo.balance_accounts_type == 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 )"
               size="small"
+              v-loading="isUpload"
               @click="open(1)"
               type="primary">上传费用明细
             </el-button>
@@ -124,6 +133,7 @@
 
             <el-button
                 v-if="( this.hisPatientInfo.balance_accounts_type != 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+                v-loading="isUpload"
 
                 size="small" @click="open(2)" type="primary"
             >撤销明细
@@ -131,7 +141,7 @@
 
             <el-button
               v-if="( this.hisPatientInfo.balance_accounts_type == 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
-
+              v-loading="isUpload"
               size="small" @click="open(2)" type="primary"
             >撤销明细
             </el-button>
@@ -393,6 +403,7 @@ export default {
   },
   data() {
     return {
+      isUpload:false,
       register: [
         { value: 11, label: '普通门诊' },
         // { value: 12, label: '门诊挂号' },
@@ -775,9 +786,11 @@ export default {
       return jsonData.map(v => filterVal.map(j => v[j]))
     },
     open(index) {
+
       if (index == 2) {
         let settle_accounts_type = ''
         if (this.activeName == 'first') {
+
           settle_accounts_type = 1
           var that = this
           this.$confirm('是否撤销明细', '撤销明细', {
@@ -786,6 +799,8 @@ export default {
             type: 'warning'
           }).then(() => {
             if (that.hisPatientInfo.balance_accounts_type != 2){
+              that.isUpload = true
+
               let params = {
                 'settle_accounts_type': settle_accounts_type,
                 'patient_id': that.hisPatientInfo.patient_id,
@@ -800,8 +815,12 @@ export default {
                     if (response.data.state == 0) {
                       that.$message.error(response.data.msg)
                       that.loadingtwo = false
+                      that.isUpload = false
+
                       return false
                     } else {
+                      that.isUpload = false
+
                       if (response.data.data.failed_code == -10) {
                         // that.$message.error(response.data.data.msg)
                         that.$confirm(response.data.data.msg, '医保错误信息', {
@@ -812,6 +831,7 @@ export default {
                         }).catch(() => {
                         })
                       } else {
+
                         that.$message.success('撤销明细成功')
                         that.radio = 1
                         that.getPatientList()
@@ -831,12 +851,18 @@ export default {
                 'record_time': that.record_date,
                 'admin_user_id': that.$store.getters.xt_user.user.id
               }
+              that.isUpload = true
+
               refundDetail(params).then(response => {
                 if (response.data.state == 0) {
+                  that.isUpload = false
+
                   this.loading = false
                   this.$message.error(response.data.msg)
                   return false
                 } else {
+                  that.isUpload = false
+
                   that.$message.success('撤销明细成功')
                   that.radio = 1
                   that.getPatientList()
@@ -847,7 +873,6 @@ export default {
           }).catch(() => {
           })
         } else {
-
           if (this.hisPatientInfo.balance_accounts_type != 2) {
             settle_accounts_type = 2
             var that = this
@@ -856,6 +881,7 @@ export default {
               cancelButtonText: '取 消',
               type: 'warning'
             }).then(() => {
+              that.isUpload = true
 
               let params = {
                 'settle_accounts_type': settle_accounts_type,
@@ -870,10 +896,13 @@ export default {
               })
                 .then(function(response) {
                   if (response.data.state == 0) {
+                    that.isUpload = false
+
                     that.$message.error(response.data.msg)
                     that.loadingtwo = false
                     return false
                   } else {
+                    that.isUpload = false
                     if (response.data.data.failed_code == -10) {
                       // that.$message.error(response.data.data.msg)
                       that.$confirm(response.data.data.msg, '医保错误信息', {
@@ -905,6 +934,8 @@ export default {
               cancelButtonText: '取 消',
               type: 'warning'
             }).then(() => {
+              that.isUpload = true
+
               let params = {
                 'settle_accounts_type': settle_accounts_type,
                 'patient_id': that.hisPatientInfo.patient_id,
@@ -914,26 +945,22 @@ export default {
               }
               refundDetail(params).then(response => {
                 if (response.data.state == 0) {
+                  that.isUpload = false
                   this.loading = false
                   this.$message.error(response.data.msg)
                   return false
                 } else {
+                  that.isUpload = false
                   that.$message.success('撤销明细成功')
                   that.radio = 1
                   that.getPatientList()
                 }
               })
 
-
-
             }).catch(() => {
             })
 
-
           }
-
-
-
         }
 
       } else if (index == 1) {
@@ -954,15 +981,20 @@ export default {
           params['settle_accounts_type'] = 2
 
         }
+        that.isUpload = true
+
         if (this.hisPatientInfo.balance_accounts_type != 2) {
           axios.get('http://127.0.0.1:9532/zh/api/uploadinfo/get', {
             params: params
           })
               .then(function(response) {
                 if (response.data.state == 0) {
+                  that.isUpload = false
+
                   that.$message.error(response.data.msg)
                   return false
                 } else {
+                  that.isUpload = false
                   if (response.data.data.failed_code == -10) {
                     // that.$message.error(response.data.data.msg)
                     that.$confirm(response.data.data.msg, '医保错误信息', {
@@ -1000,12 +1032,17 @@ export default {
             params['settle_accounts_type'] = 2
 
           }
+          that.isUpload = true
+
           upLoadChargeInfo(params).then(response => {
             if (response.data.state == 0) {
+              that.isUpload = false
+
               this.loading = false
               this.$message.error(response.data.msg)
               return false
             } else {
+              that.isUpload = false
               that.$message.success('上传明细成功')
               that.radio = 2
               that.changePatientInfo()

src/xt_pages/outpatientTool/detailPrint.vue

@@ -162,7 +162,7 @@
       <table class="listTable" border="1">
         <tr style="height:45px">
           <td width="50" style="text-align: center">序号</td>
-          <td width="50" style="text-align: center" v-if="$store.getters.xt_user.org_id == 10567 || $store.getters.xt_user.org_id == 10724 ">费用类型</td>
+          <td width="50" style="text-align: center" v-if="$store.getters.xt_user.org_id == 10567 || $store.getters.xt_user.org_id == 10724  || $store.getters.xt_user.org_id == 9478">费用类型</td>
 
           <td width="150" style="text-align: center">处方日期</td>
           <td width="230" style="text-align: center">费用编码</td>
@@ -179,8 +179,8 @@
             <span v-if="item.is_total == 2">合计</span>
           </td>
 
-          <td style="text-align: center" v-if="$store.getters.xt_user.org_id == 10567 || $store.getters.xt_user.org_id == 10724">
-            <span  v-if="($store.getters.xt_user.org_id == 10567 && item.is_total == 1) || ($store.getters.xt_user.org_id == 10724 && item.is_total == 1)">{{getTypeTwo(item.med_chrgitm_type)}}</span>
+          <td style="text-align: center" v-if="$store.getters.xt_user.org_id == 10567 || $store.getters.xt_user.org_id == 10724 || $store.getters.xt_user.org_id == 9478 ">
+            <span  v-if="($store.getters.xt_user.org_id == 10567 && item.is_total == 1) || ($store.getters.xt_user.org_id == 10724 && item.is_total == 1) || ($store.getters.xt_user.org_id == 9478 && item.is_total == 1)">{{getTypeTwo(item.med_chrgitm_type)}}</span>
           </td>
           <td style="text-align: center">
             <span v-if="item.is_total == 1">{{getTimes(item.record_date)}}</span>