Преглед изворни кода

Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

yq1 пре 10 месеци
родитељ
комит
58af959787

+ 9 - 0
src/api/his/his.js Прегледај датотеку

@@ -857,6 +857,15 @@ export function getHisOrderListtwo(params){
857 857
 
858 858
 
859 859
 
860
+export function modifyFapiaoCodetwo(params) {
861
+  return request({
862
+    url: '/api/fapiao/modifytwo',
863
+    method: 'post',
864
+    params: params
865
+  })
866
+}
867
+
868
+
860 869
 
861 870
 
862 871
 

+ 2 - 0
src/api/his/his_tools.js Прегледај датотеку

@@ -89,3 +89,5 @@ export function getBatchPrivateExpenses(params) {
89 89
 
90 90
 
91 91
 
92
+
93
+

+ 2 - 2
src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue Прегледај датотеку

@@ -209,7 +209,7 @@
209 209
             </el-form-item>
210 210
           </el-col>
211 211
 
212
-          <!-- <el-col :span="8" v-if="isShow('灌流器凝血')">
212
+          <el-col :span="8" v-if="isShow('灌流器凝血')">
213 213
             <el-form-item label="灌流器凝血: " :prop="isName('灌流器凝血')" :rules="isCheckmust('灌流器凝血')">
214 214
               <el-input
215 215
                 v-model="form.condenser "
@@ -217,7 +217,7 @@
217 217
                 @focus="showDialog('11')"
218 218
               ></el-input>
219 219
             </el-form-item>
220
-          </el-col> -->
220
+          </el-col>
221 221
 
222 222
           <el-col :span="8" v-if="isShow('管路凝血')">
223 223
             <el-form-item label="管路凝血: " :prop="isName('管路凝血')" :rules="isCheckmust('管路凝血')">

+ 2 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Прегледај датотеку

@@ -4722,7 +4722,7 @@ export default {
4722 4722
 
4723 4723
         
4724 4724
 
4725
-        if(this.org_id== 0 || this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633){
4725
+        if(this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633){
4726 4726
           let projectsOne = [];
4727 4727
           response.data.data.projects.map((item) => {
4728 4728
               projectsOne.push(item);
@@ -4759,7 +4759,7 @@ export default {
4759 4759
            }
4760 4760
         }
4761 4761
 
4762
-        if(this.org_id ==10515  || this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489){
4762
+        if(this.org_id ==10515  || this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489 || this.org_id == 0 || this.org_id == 10644){
4763 4763
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
4764 4764
 
4765 4765
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){

+ 67 - 13
src/xt_pages/outpatientCharges/summary.vue Прегледај датотеку

@@ -644,6 +644,14 @@
644 644
         <el-button type="primary" @click="accounts_sum">确 定</el-button>
645 645
       </span>
646 646
     </el-dialog>
647
+
648
+    <el-dialog title="修改发票号码" :visible.sync="dialogfapiaoVisible">
649
+      <el-input v-model="fapiao_code" type="text"></el-input>
650
+      <div slot="footer" class="dialog-footer">
651
+        <el-button @click="dialogfapiaoVisible = false">取 消</el-button>
652
+        <el-button type="primary" @click="modifyFaPiaoCode">确 定</el-button>
653
+      </div>
654
+    </el-dialog>
647 655
   </div>
648 656
 </template>
649 657
 
@@ -651,6 +659,9 @@
651 659
 <script>
652 660
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
653 661
 import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund } from '@/api/his/his'
662
+import { ModifyFapiaoCode } from '@/api/his/his_tools'
663
+
664
+
654 665
 // import NewStatementPrint from './newStatementPrint'
655 666
 import { adminMainView} from "@/api/role/admin";
656 667
 import NewStatementPrint from './statementPrint.vue'
@@ -670,7 +681,8 @@ import {
670 681
   getHisDataThree,
671 682
   getHisDataTwo,
672 683
   handleOne,
673
-  getHisOrderListtwo
684
+  getHisOrderListtwo,
685
+  modifyFapiaoCodetwo
674 686
 } from '../../api/his/his'
675 687
 
676 688
 import { handleData10106, handleData10138Two, handleData10318 } from '../../api/his/his_export'
@@ -699,6 +711,7 @@ export default {
699 711
       admins:[],
700 712
       orderObj: {},
701 713
       batchOrderObj: {},
714
+      fapiao_code:"",
702 715
       med_options: [
703 716
         { id: 0, text: '全部' },
704 717
         { id: 11, text: '普通门诊' },
@@ -719,6 +732,9 @@ export default {
719 732
       tableData: [],
720 733
       tableData2:[],
721 734
       selecting_schs: [],
735
+      dialogfapiaoVisible:false,
736
+      targeOrderId:0,
737
+      targeObj:{},
722 738
       limit: 10,
723 739
       page: 1,
724 740
       keywords: '',
@@ -3999,22 +4015,60 @@ export default {
3999 4015
         }
4000 4016
       }
4001 4017
       return res
4018
+    },modifyFaPiaoCode(){
4019
+      let params = {
4020
+          id:this.targeOrderId,
4021
+          fapiao_code: this.fapiao_code
4022
+      }
4023
+      modifyFapiaoCodetwo(params).then((response) => {
4024
+        if (response.data.state == 0) {
4025
+          this.$message.error(response.data.msg)
4026
+          return false
4027
+        } else {
4028
+          var obj = this.targeObj
4029
+          let paramsObj = {
4030
+            order_id: obj.id,
4031
+            patient_id: obj.patient_id,
4032
+            number: obj.mdtrt_id,
4033
+            name: obj.patient.name,
4034
+            age: obj.age,
4035
+            gend: obj.patient.gender,
4036
+            setl_time: obj.setl_time,
4037
+            chargeName: this.getName(obj.creator)
4038
+          }
4039
+          this.dialogfapiaoVisible = false
4040
+          this.invoiceParams = paramsObj
4041
+          this.invoiceVisible = true
4042
+        }
4043
+      })
4044
+
4002 4045
     },
4003 4046
 
4004 4047
     invoicePrint(obj) {
4005
-      console.log(obj)
4006
-      let paramsObj = {
4007
-        order_id: obj.id,
4008
-        patient_id: obj.patient_id,
4009
-        number: obj.mdtrt_id,
4010
-        name: obj.patient.name,
4011
-        age: obj.age,
4012
-        gend: obj.patient.gender,
4013
-        setl_time: obj.setl_time,
4014
-        chargeName: this.getName(obj.creator)
4048
+      if(this.$store.getters.xt_user.org_id == 10480){
4049
+        this.fapiao_code = obj.fa_piao_code
4050
+        this.dialogfapiaoVisible = true
4051
+        this.targeOrderId = obj.id
4052
+        this.targeObj = obj
4053
+      }else{
4054
+        let paramsObj = {
4055
+          order_id: obj.id,
4056
+          patient_id: obj.patient_id,
4057
+          number: obj.mdtrt_id,
4058
+          name: obj.patient.name,
4059
+          age: obj.age,
4060
+          gend: obj.patient.gender,
4061
+          setl_time: obj.setl_time,
4062
+          chargeName: this.getName(obj.creator)
4063
+        }
4064
+        this.dialogfapiaoVisible = false
4065
+        this.invoiceParams = paramsObj
4066
+        this.invoiceVisible = true
4067
+
4068
+
4015 4069
       }
4016
-      this.invoiceParams = paramsObj
4017
-      this.invoiceVisible = true
4070
+
4071
+
4018 4072
     }
4019 4073
   }
4020 4074
 }

+ 241 - 0
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Прегледај датотеку

@@ -11,10 +11,20 @@
11 11
     <!-- <div class="backColor"></div> -->
12 12
     <div class="mainCenter" v-loading="loading">
13 13
       <div class="centerLeft">
14
+        <div v-if="prescriptions[0].id >0 && (org_id == 10278 || org_id == 10138 || org_id == 0) ">
15
+        <el-button style="width: 100px" size="small" @click="callElePre(1)" type="primary">处方预核验</el-button>
16
+        <el-button style="width: 100px"  size="small" @click="callElePre(2)" type="primary">处方签名</el-button>
17
+        <el-button style="width: 100px"  size="small" @click="callElePre(3)" type="primary">处方上传</el-button>
18
+        <el-button style="width: 100px"  size="small" @click="callElePre(4)" type="primary">处方撤销</el-button>
19
+        <el-button style="width: 100px"  size="small" @click="callElePre(5)" type="primary">处方信息查询</el-button>
20
+        <el-button style="width: 100px"  size="small" @click="callElePre(6)" type="primary">处方结果查询</el-button>
21
+        </div>
14 22
         <el-tabs v-model="dayorMonth" @tab-click="changeDayOrMonth">
15 23
           <el-tab-pane label="日结" name="day"></el-tab-pane>
16 24
           <el-tab-pane label="月结" name="month"></el-tab-pane>
17 25
         </el-tabs>
26
+
27
+
18 28
         <el-form :model="form" ref="form" label-width="80px"
19 29
                  style="display: flex;flex-wrap: wrap;justify-content: space-between;">
20 30
           <el-form-item label="姓名:" prop="name" label-position="right">
@@ -4393,6 +4403,237 @@ export default {
4393 4403
     },
4394 4404
     clearSelection() {
4395 4405
       this.$refs.tabProjectTeam.clearSelection()
4406
+    },callElePre(type){
4407
+      switch (type){
4408
+        case 1:
4409
+          var  that = this
4410
+          let params = {
4411
+            'admin_user_id':3626,
4412
+            'patient_id': this.patientInfo.id,
4413
+            'his_patient_id': this.hisPatientInfo.id,
4414
+            'record_time':this.record_date
4415
+          }
4416
+          axios.get('http://127.0.0.1:9532/api/CFYLJG001', {
4417
+            params: params
4418
+          }).then(function(response) {
4419
+            if (response.data.state == 0) {
4420
+              that.$message.error(response.data.msg)
4421
+              that.fapiaoCodeDialogVisible = false
4422
+              return false
4423
+            } else {
4424
+              that.fapiaoCodeDialogVisible = false
4425
+              if (response.data.data.failed_code == -10) {
4426
+                that.$confirm(response.data.data.msg, '医保错误信息', {
4427
+                  confirmButtonText: '确 定',
4428
+                  type: 'warning'
4429
+                }).then(() => {
4430
+
4431
+                }).catch(() => {
4432
+
4433
+                })
4434
+
4435
+              } else {
4436
+                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
4437
+                that.order.is_upload_diagnose = 1
4438
+              }
4439
+
4440
+            }
4441
+          })
4442
+            .catch(function(error) {
4443
+
4444
+            })
4445
+
4446
+          break
4447
+        case 2:
4448
+          var  that = this
4449
+          let params2 = {
4450
+            'order_id': this.order.id,
4451
+            'admin_user_id': this.$store.getters.xt_user.user.id,
4452
+            'fapiao_code':this.fapiao_code,
4453
+          }
4454
+          axios.get('http://127.0.0.1:9532/api/CFYLJG002', {
4455
+            params: params2
4456
+          }).then(function(response) {
4457
+            if (response.data.state == 0) {
4458
+              that.$message.error(response.data.msg)
4459
+              that.fapiaoCodeDialogVisible = false
4460
+              return false
4461
+            } else {
4462
+              that.fapiaoCodeDialogVisible = false
4463
+              if (response.data.data.failed_code == -10) {
4464
+                that.$confirm(response.data.data.msg, '医保错误信息', {
4465
+                  confirmButtonText: '确 定',
4466
+                  type: 'warning'
4467
+                }).then(() => {
4468
+
4469
+                }).catch(() => {
4470
+
4471
+                })
4472
+
4473
+              } else {
4474
+                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
4475
+                that.order.is_upload_diagnose = 1
4476
+              }
4477
+
4478
+            }
4479
+          })
4480
+            .catch(function(error) {
4481
+
4482
+            })
4483
+          break
4484
+        case 3:
4485
+          var  that = this
4486
+          let params3 = {
4487
+            'order_id': this.order.id,
4488
+            'admin_user_id': this.$store.getters.xt_user.user.id,
4489
+            'fapiao_code':this.fapiao_code,
4490
+          }
4491
+          axios.get('http://127.0.0.1:9532/api/CFYLJG003', {
4492
+            params: params3
4493
+          }).then(function(response) {
4494
+            if (response.data.state == 0) {
4495
+              that.$message.error(response.data.msg)
4496
+              that.fapiaoCodeDialogVisible = false
4497
+              return false
4498
+            } else {
4499
+              that.fapiaoCodeDialogVisible = false
4500
+              if (response.data.data.failed_code == -10) {
4501
+                that.$confirm(response.data.data.msg, '医保错误信息', {
4502
+                  confirmButtonText: '确 定',
4503
+                  type: 'warning'
4504
+                }).then(() => {
4505
+
4506
+                }).catch(() => {
4507
+
4508
+                })
4509
+
4510
+              } else {
4511
+                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
4512
+                that.order.is_upload_diagnose = 1
4513
+              }
4514
+
4515
+            }
4516
+          })
4517
+            .catch(function(error) {
4518
+
4519
+            })
4520
+          break
4521
+        case 4:
4522
+          var  that = this
4523
+          let params4 = {
4524
+            'order_id': this.order.id,
4525
+            'admin_user_id': this.$store.getters.xt_user.user.id,
4526
+            'fapiao_code':this.fapiao_code,
4527
+          }
4528
+          axios.get('http://127.0.0.1:9532/api/CFYLJG004', {
4529
+            params: params4
4530
+          }).then(function(response) {
4531
+            if (response.data.state == 0) {
4532
+              that.$message.error(response.data.msg)
4533
+              that.fapiaoCodeDialogVisible = false
4534
+              return false
4535
+            } else {
4536
+              that.fapiaoCodeDialogVisible = false
4537
+              if (response.data.data.failed_code == -10) {
4538
+                that.$confirm(response.data.data.msg, '医保错误信息', {
4539
+                  confirmButtonText: '确 定',
4540
+                  type: 'warning'
4541
+                }).then(() => {
4542
+
4543
+                }).catch(() => {
4544
+
4545
+                })
4546
+
4547
+              } else {
4548
+                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
4549
+                that.order.is_upload_diagnose = 1
4550
+              }
4551
+
4552
+            }
4553
+          })
4554
+            .catch(function(error) {
4555
+
4556
+            })
4557
+          break
4558
+        case 5:
4559
+          var  that = this
4560
+          let params5 = {
4561
+            'order_id': this.order.id,
4562
+            'admin_user_id': this.$store.getters.xt_user.user.id,
4563
+            'fapiao_code':this.fapiao_code,
4564
+          }
4565
+          axios.get('http://127.0.0.1:9532/api/CFYLJG005', {
4566
+            params: params5
4567
+          }).then(function(response) {
4568
+            if (response.data.state == 0) {
4569
+              that.$message.error(response.data.msg)
4570
+              that.fapiaoCodeDialogVisible = false
4571
+              return false
4572
+            } else {
4573
+              that.fapiaoCodeDialogVisible = false
4574
+              if (response.data.data.failed_code == -10) {
4575
+                that.$confirm(response.data.data.msg, '医保错误信息', {
4576
+                  confirmButtonText: '确 定',
4577
+                  type: 'warning'
4578
+                }).then(() => {
4579
+
4580
+                }).catch(() => {
4581
+
4582
+                })
4583
+
4584
+              } else {
4585
+                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
4586
+                that.order.is_upload_diagnose = 1
4587
+              }
4588
+
4589
+            }
4590
+          })
4591
+            .catch(function(error) {
4592
+
4593
+            })
4594
+          break
4595
+        case 6:
4596
+          var  that = this
4597
+          let params6 = {
4598
+            'order_id': this.order.id,
4599
+            'admin_user_id': this.$store.getters.xt_user.user.id,
4600
+            'fapiao_code':this.fapiao_code,
4601
+          }
4602
+          axios.get('http://127.0.0.1:9532/api/CFYLJG006', {
4603
+            params: params6
4604
+          }).then(function(response) {
4605
+            if (response.data.state == 0) {
4606
+              that.$message.error(response.data.msg)
4607
+              that.fapiaoCodeDialogVisible = false
4608
+              return false
4609
+            } else {
4610
+              that.fapiaoCodeDialogVisible = false
4611
+              if (response.data.data.failed_code == -10) {
4612
+                that.$confirm(response.data.data.msg, '医保错误信息', {
4613
+                  confirmButtonText: '确 定',
4614
+                  type: 'warning'
4615
+                }).then(() => {
4616
+
4617
+                }).catch(() => {
4618
+
4619
+                })
4620
+
4621
+              } else {
4622
+                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
4623
+                that.order.is_upload_diagnose = 1
4624
+              }
4625
+
4626
+            }
4627
+          })
4628
+            .catch(function(error) {
4629
+
4630
+            })
4631
+          break
4632
+
4633
+      }
4634
+
4635
+
4636
+
4396 4637
     }
4397 4638
   }, mounted() {
4398 4639
     this.request_record_date = this.record_date