2 次代码提交 18d5a18465 ... cfca348a13

作者 SHA1 备注 提交日期
  陈少旭 cfca348a13 Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch 1周前
  陈少旭 a7f532cdb6 1111 1周前

+ 6 - 3
src/xt_pages/hospitalStation/batchStatementTemplate/hospitalBatchPrint.vue 查看文件

@@ -90,17 +90,20 @@
90 90
         <td width="100">血透室</td>
91 91
         <td>床号</td>
92 92
         <td></td>
93
+
94
+
95
+
93 96
         <td>入院日期</td>
94 97
         <td v-if="$store.getters.xt_user.org_id == 10215">{{info.his.in_hosptial_time.split(" ")[0]}}</td>
95
-        <td v-if="$store.getters.xt_user.org_id != 10215">{{info.order.setl_time.split(" ")[0]}}</td>
98
+        <td v-if="$store.getters.xt_user.org_id != 10215">{{info.info.begndate}}</td>
96 99
 
97 100
         <td>出院日期</td>
98 101
         <td width="100" v-if="$store.getters.xt_user.org_id == 10215">{{info.his.out_hosptial_time.split(" ")[0]}}</td>
99
-        <td v-if="$store.getters.xt_user.org_id != 10215">{{info.order.setl_time.split(" ")[0]}}</td>
102
+        <td v-if="$store.getters.xt_user.org_id != 10215">{{info.info.enddate}}</td>
100 103
 
101 104
         <td>住院天数</td>
102 105
         <td v-if="$store.getters.xt_user.org_id == 10215">{{getDay(info.his.in_hosptial_time.split(" ")[0],info.his.out_hosptial_time.split(" ")[0])}}</td>
103
-        <td v-if="$store.getters.xt_user.org_id != 10215">{{getDay(info.order.setl_time.split(" ")[0],info.order.setl_time.split(" ")[0])}}</td>
106
+        <td v-if="$store.getters.xt_user.org_id != 10215">{{getDay(info.info.begndate,info.info.enddate)}}</td>
104 107
       </tr>
105 108
       <tr>
106 109
         <td>险种</td>

+ 90 - 2
src/xt_pages/outpatientCharges/costComparison.vue 查看文件

@@ -114,7 +114,16 @@
114 114
         <el-table-column align="center" prop="name" label="医保中心结算笔数">
115 115
           <template slot-scope="scope">{{ scope.row.num }}</template>
116 116
         </el-table-column>
117
-
117
+        <el-table-column
118
+          prop="address"
119
+          align="center"
120
+          label="操作">
121
+          <template slot-scope="scope">
122
+            <el-button v-if="scope.row.check_type == 3 && org_id== 10191" @click="handleClick(scope.row.id)" style="font-size:16px;"
123
+                       type="text">撤销清算
124
+            </el-button>
125
+          </template>
126
+        </el-table-column>
118 127
       </el-table>
119 128
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :page-sizes="[10, 50, 100]"
120 129
         :page-size="10" background style="margin-top:20px;float: right" layout="total, sizes, prev, pager, next, jumper"
@@ -164,6 +173,8 @@
164 173
         <div slot="footer" class="dialog-footer">
165 174
           <el-button @click="dialogFormVisible = false">取 消</el-button>
166 175
           <el-button type="primary" @click="confirm">确 定</el-button>
176
+          <el-button v-if="org_id== 10191" type="primary" @click="clrconfirm">提交</el-button>
177
+
167 178
         </div>
168 179
       </el-dialog>
169 180
 
@@ -418,7 +429,84 @@ export default {
418 429
       this.selection = selection
419 430
 
420 431
 
421
-    }, confirm() {
432
+
433
+    },handleClick(id){
434
+      let params = {
435
+        admin_user_id: this.$store.getters.xt_user.user.id,
436
+        id: id,
437
+      }
438
+      var that = this
439
+      axios.get('http://127.0.0.1:9532/api/32041', {
440
+        params: params
441
+      })
442
+        .then(function (response) {
443
+          if (response.data.state == 0) {
444
+            that.$message.error(response.data.msg)
445
+            return false
446
+          } else {
447
+
448
+            if (response.data.data.failed_csuode == -10) {
449
+              // that.$message.error(response.data.data.msg)
450
+              that
451
+                .$confirm(response.data.data.msg, "医保错误信息", {
452
+                  confirmButtonText: "确 定",
453
+                  type: "warning",
454
+                })
455
+                .then(() => {})
456
+                .catch(() => {});
457
+            } else {
458
+              that
459
+                .$confirm(response.data.data.info, "医保信息", {
460
+                  confirmButtonText: "确 定",
461
+                  type: "warning",
462
+                })
463
+                .then(() => {})
464
+                .catch(() => {});
465
+            }
466
+          }
467
+        })
468
+        .catch(function (error) {
469
+
470
+        })
471
+
472
+    },  clrconfirm() {
473
+        let params = {
474
+          start_time: this.start_time,
475
+          end_time: this.end_time,
476
+          admin_user_id: this.$store.getters.xt_user.user.id,
477
+        }
478
+        var that = this
479
+        axios.get('http://127.0.0.1:9532/api/32031', {
480
+          params: params
481
+        })
482
+          .then(function (response) {
483
+            if (response.data.state == 0) {
484
+              that.$message.error(response.data.msg)
485
+              return false
486
+            } else {
487
+
488
+              if (response.data.data.failed_csuode == -10) {
489
+                // that.$message.error(response.data.data.msg)
490
+                that
491
+                  .$confirm(response.data.data.msg, "医保错误信息", {
492
+                    confirmButtonText: "确 定",
493
+                    type: "warning",
494
+                  })
495
+                  .then(() => {})
496
+                  .catch(() => {});
497
+              } else {
498
+                that.$message.success("清算申请提交成功");
499
+                that.getList()
500
+
501
+              }
502
+            }
503
+          })
504
+          .catch(function (error) {
505
+
506
+          })
507
+
508
+    },
509
+    confirm() {
422 510
       if (this.check_type == 1) {
423 511
         let params = {
424 512
           start_time: this.start_time,