Browse Source

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

csx 2 years ago
parent
commit
283a9ee796

+ 5 - 0
src/xt_pages/hospitalStation/components/deskPrescription.vue View File

@@ -11,6 +11,11 @@
11 11
     <!-- <div class="backColor"></div> -->
12 12
     <div class="mainCenter" v-loading="loading">
13 13
       <div class="centerLeft">
14
+<!--        <el-button  size="small"-->
15
+<!--                    @click="open(1)"-->
16
+<!--                    type="primary">入院登记-->
17
+<!--        </el-button>-->
18
+
14 19
         <el-tabs v-model="dayorMonth" @tab-click="changeDayOrMonth">
15 20
           <el-tab-pane label="日结" name="day"></el-tab-pane>
16 21
           <el-tab-pane label="月结" name="month"></el-tab-pane>

+ 1 - 0
src/xt_pages/hospitalStation/outpatientChargesManagement.vue View File

@@ -91,6 +91,7 @@
91 91
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
92 92
 
93 93
           <div>
94
+            <div>入院时间:{{this.hisPatientInfo&&this.hisPatientInfo.in_hosptial_time?this.hisPatientInfo.in_hosptial_time:""}}</div>
94 95
             <el-button  size="small"
95 96
                        @click="open(1)"
96 97
                        type="primary">入院登记

+ 36 - 0
src/xt_pages/outpatientCharges/summary.vue View File

@@ -138,6 +138,10 @@
138 138
                                    v-if="scope.row.order_status == 2&& scope.row.result.id == 0">
139 139
                             上传结算清单
140 140
                         </el-button>
141
+                      <el-button size="mini" type="primary" @click="cancelUpload(scope.row)"
142
+                                 v-if="scope.row.order_status == 2&& scope.row.result.id > 0">
143
+                        撤销结算清单
144
+                      </el-button>
141 145
                         <el-button size="mini" type="primary"
142 146
                                    v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106"
143 147
                                    @click="settlementPrint(scope.row)">结算单
@@ -300,6 +304,38 @@
300 304
             return '普通住院'
301 305
             break
302 306
         }
307
+      },cancelUpload(row){
308
+        var that = this
309
+        axios.get('http://127.0.0.1:9532/zh/api/clearsettle', {
310
+          params: {
311
+            order_id: row.id,
312
+            admin_user_id: this.$store.getters.xt_user.user.id
313
+          }
314
+        }).then(function(response) {
315
+          if (response.data.state == 0) {
316
+            that.$message.error(response.data.msg)
317
+            return false
318
+          } else {
319
+
320
+            if (response.data.data.failed_code == -10) {
321
+              // that.$message.error(response.data.data.msg)
322
+              that.$confirm(response.data.data.msg, '医保错误信息', {
323
+                confirmButtonText: '确 定',
324
+                type: 'warning'
325
+              }).then(() => {
326
+
327
+              }).catch(() => {
328
+              })
329
+
330
+            } else {
331
+              that.$message.success('撤销成功')
332
+              row.result.id = 0
333
+            }
334
+
335
+          }
336
+        }).catch(function(error) {
337
+        })
338
+
303 339
       },
304 340
       uploadInfo(row) {
305 341
         var that = this