111

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -204,7 +204,7 @@
                     </div>
                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('区域')>-1">
                       区域
-                    </div> 
+                    </div>
                   </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     穿刺针：
@@ -509,7 +509,7 @@
                       </td>
                       <td width="200" v-if="org_id == 9919">ktv</td>
                       <td width="200">病情变化及处理</td>
-                     
+
                       <!-- <td width="100">时间</td>
                   <td width="30">T<br>C°</td>
                   <td width="30">P<br/>次/分</td>
@@ -542,8 +542,7 @@
                         {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }}
                       </td>
                       <td>{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
-                      <td>{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}
-                      </td>
+                      <td>{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</td>
                       <td v-if="(dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time)">
                         {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
                       </td>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -351,9 +351,10 @@
                 this.$refs.charge.hide()
                 return false
               } else {
+                this.$refs.charge.hide()
+                this.loadingtwo = false
                 this.state = '已收费'
                 this.$message({message: '收费成功', type: 'success'})
-                this.$refs.charge.hide()
                 this.loadingtwo = false
                 this.cal_one = this.cal_one - 1
                 this.cal_two = this.cal_two + 1
@@ -371,6 +372,9 @@
               this.$refs.charge.hide()
               return false
             } else {
+              this.$refs.charge.hide()
+
+              this.loadingtwo = false
               this.state = '已收费'
               this.$message({message: '收费成功', type: 'success'})
               this.$refs.charge.hide()
@@ -400,9 +404,9 @@
                 this.$refs.register.hide()
                 return false
               } else {
+                this.$refs.register.hide()
                 this.getPatientList()
                 this.$message({message: '挂号成功', type: 'success'})
-                this.$refs.register.hide()
                 this.loadingone = false
                 var his_info = response.data.data.his_info
                 this.hisPatientInfo = his_info
@@ -715,7 +719,7 @@
 
         } else if (index == 7) {
           let params={
-            start_time:"2020-12-01",
+            start_time:"2020-12-28",
             end_time:"2020-12-30",
             insutype:"390",
             clr_type:"11",
@@ -744,7 +748,7 @@
 
         } else if (index == 8) {
           let params={
-            start_time:"2020-12-01",
+            start_time:"2020-12-28",
             end_time:"2020-12-30",
           }
           axios.get('http://127.0.0.1:9532/api/checkdetailaccount/get', {