소스 검색

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

csx 3 년 전
부모
커밋
328de81c33
27개의 변경된 파일258개의 추가작업 그리고 97개의 파일을 삭제
  1. 2 1
      src/lang/zh.js
  2. 1 1
      src/xt_pages/hospitalStation/chargeDetailManagement.vue
  3. 20 19
      src/xt_pages/hospitalStation/checkTemplate/printOne.vue
  4. 2 2
      src/xt_pages/hospitalStation/components/ChargePrescriptionTable.vue
  5. 6 5
      src/xt_pages/hospitalStation/components/chargeDialog.vue
  6. 62 2
      src/xt_pages/hospitalStation/components/settlePrescriptionTable.vue
  7. 6 3
      src/xt_pages/hospitalStation/doctorDesk.vue
  8. 4 4
      src/xt_pages/hospitalStation/index.vue
  9. 22 3
      src/xt_pages/hospitalStation/outpatientChargesManagement.vue
  10. 3 1
      src/xt_pages/hospitalStation/print.vue
  11. 3 1
      src/xt_pages/hospitalStation/template/printFive.vue
  12. 4 2
      src/xt_pages/hospitalStation/template/printFour.vue
  13. 3 2
      src/xt_pages/hospitalStation/template/printOne.vue
  14. 4 2
      src/xt_pages/hospitalStation/template/printThree.vue
  15. 3 1
      src/xt_pages/hospitalStation/template/printTwo.vue
  16. 3 1
      src/xt_pages/hospitalStation/treatTemplate/printOne.vue
  17. 3 1
      src/xt_pages/hospitalStation/treatTemplate/printTwo.vue
  18. 54 4
      src/xt_pages/outpatientCharges/outpatientChargesManagement.vue
  19. 22 20
      src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue
  20. 4 2
      src/xt_pages/outpatientDoctorStation/template/printFive.vue
  21. 4 2
      src/xt_pages/outpatientDoctorStation/template/printFour.vue
  22. 4 2
      src/xt_pages/outpatientDoctorStation/template/printOne.vue
  23. 4 2
      src/xt_pages/outpatientDoctorStation/template/printThree.vue
  24. 3 1
      src/xt_pages/outpatientDoctorStation/template/printTwo.vue
  25. 2 1
      src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue
  26. 4 2
      src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue
  27. 6 10
      src/xt_pages/outpatientTool/yidiClear.vue

+ 2 - 1
src/lang/zh.js 파일 보기

@@ -269,7 +269,8 @@ export default {
269 269
     summary_tool: '项目消费明细汇总',
270 270
     labelPrint: '标签打印',
271 271
     faPiao: '发票设置',
272
-    chargeDetailManagement: '收费明细'
272
+    chargeDetailManagement: '收费明细',
273
+    yidiClear:'异地清分',
273 274
   },
274 275
   navbar: {
275 276
     logOut: '退出登录',

+ 1 - 1
src/xt_pages/hospitalStation/chargeDetailManagement.vue 파일 보기

@@ -1163,8 +1163,8 @@ export default {
1163 1163
                 prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
1164 1164
                 medical_insurance_number: prescription.advices[b].med_list_codg,
1165 1165
 
1166
-                code: prescription.advices[b].drug.medical_insurance_number,
1167 1166
                 spec: spec,
1167
+                code: prescription.advices[b].drug.medical_insurance_number,
1168 1168
                 det_item_fee_sumamt: prescription.advices[b].order_info.det_item_fee_sumamt,
1169 1169
                 name_id: prescription.advices[b].drug.manufacturer,
1170 1170
                 fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,

+ 20 - 19
src/xt_pages/hospitalStation/checkTemplate/printOne.vue 파일 보기

@@ -40,7 +40,7 @@
40 40
                     </div>
41 41
                     <div>医生签字:{{ doctor ? doctor : '' }}</div>
42 42
                 </div>
43
-            </div>   
43
+            </div>
44 44
             <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
45 45
         </div>
46 46
     </div>
@@ -56,7 +56,7 @@ export default {
56 56
       record_date:String,
57 57
       prescription_id:Number,
58 58
       ids:String
59
-    }, 
59
+    },
60 60
     data(){
61 61
       return {
62 62
         doctorList:[],
@@ -97,10 +97,10 @@ export default {
97 97
       getAllDoctorList().then(response=>{
98 98
         if(response.data.state == 1){
99 99
                var doctor =  response.data.data.doctor
100
-               
100
+
101 101
                this.doctorList = doctor
102 102
              }
103
-         })   
103
+         })
104 104
      },
105 105
 
106 106
       getDoctor(id){
@@ -126,7 +126,8 @@ export default {
126 126
           patient_id:this.patient_id,
127 127
           record_date:this.record_date,
128 128
           prescription_id:this.prescription_id,
129
-          ids:this.ids
129
+          ids:this.ids,
130
+          p_type:1,
130 131
         }
131 132
         console.log("params",params)
132 133
        getPrescriptionPrint(params).then(response=>{
@@ -151,7 +152,7 @@ export default {
151 152
                             }
152 153
                         }
153 154
                   })
154
-                
155
+
155 156
               }
156 157
             })
157 158
             let data = []
@@ -166,9 +167,9 @@ export default {
166 167
               if(item.team.id == 0){
167 168
                 data2.push(item)
168 169
               }
169
-              
170
+
170 171
             })
171
-          
172
+
172 173
             this.total = total
173 174
             this.pre_time = this.advicePrint[0].pre_time
174 175
             this.doctor = this.advicePrint[0].doctor
@@ -184,7 +185,7 @@ export default {
184 185
             let outputlist1Name = response.data.data.his.patient_info ? JSON.parse(response.data.data.his.patient_info) : {};
185 186
             this.faber = outputlist1Name
186 187
 
187
-            
188
+
188 189
           }
189 190
        })
190 191
      },
@@ -237,7 +238,7 @@ export default {
237 238
             }
238 239
               addtotal =  Math.floor(addtotal * 100) / 100
239 240
         }
240
-       
241
+
241 242
        }
242 243
 
243 244
       for (let i = 0; i < this.prescriptions.length; i++) {
@@ -247,7 +248,7 @@ export default {
247 248
                 total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
248 249
               }
249 250
             }
250
-          
251
+
251 252
             if (this.prescriptions[i].additionalcharge != null) {
252 253
               for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
253 254
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
@@ -259,7 +260,7 @@ export default {
259 260
 
260 261
         return total + addtotal
261 262
       },
262
-      
263
+
263 264
      getProjectName(id){
264 265
         var project_name = ""
265 266
         for(let i=0;i<this.projectList.length;i++){
@@ -274,14 +275,14 @@ export default {
274 275
         let newIds = ids.split(',').sort(function(a,b){
275 276
           return a-b;
276 277
         })
277
-        
278
+
278 279
         var name = ""
279 280
         let nameArr = []
280 281
         for(let i=0;i<this.diagnoses.length;i++){
281 282
           // if(id == this.diagnoses[i].id){
282 283
           //    name = this.diagnoses[i].class_name
283 284
           // }
284
-          
285
+
285 286
           if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
286 287
             // name += diagnoses[i].class_name + ' '
287 288
             nameArr.push(this.diagnoses[i].class_name)
@@ -291,7 +292,7 @@ export default {
291 292
         nameArr.map((item,index) => {
292 293
           if(item == '尿毒症'){
293 294
             newNameArr.push(item)
294
-            nameArr.splice(index,1,'') 
295
+            nameArr.splice(index,1,'')
295 296
           }
296 297
         })
297 298
         newNameArr.push(...nameArr)
@@ -315,7 +316,7 @@ export default {
315 316
             this.page = 1
316 317
             arr.push(item.advices.length)
317 318
             item.pageArr.push(arr)
318
-            
319
+
319 320
           }else if(item.advices.length > 5){
320 321
             this.page = parseInt(item.advices.length / 5)
321 322
             let num = item.advices.length % 5
@@ -413,7 +414,7 @@ export default {
413 414
       var xtuser = this.$store.getters.xt_user;
414 415
       this.orgname = xtuser.org.org_name;
415 416
       this.org_id = this.$store.getters.xt_user.org_id
416
-     
417
+
417 418
    },
418 419
    watch:{
419 420
      ids:function(val){
@@ -428,7 +429,7 @@ export default {
428 429
 <style lang="scss" scoped>
429 430
 .prescription-print{
430 431
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
431
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
432
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
432 433
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
433 434
     margin-bottom: 20px;
434 435
     padding:20px 10px;
@@ -486,7 +487,7 @@ export default {
486 487
 }
487 488
 .actionBar{
488 489
     display: flex;
489
-    justify-content: space-between; 
490
+    justify-content: space-between;
490 491
     line-height: 24px;
491 492
     padding:0 10px;
492 493
 }

+ 2 - 2
src/xt_pages/hospitalStation/components/ChargePrescriptionTable.vue 파일 보기

@@ -49,7 +49,7 @@
49 49
 
50 50
       <el-table-column align="center" prop="name" width="60" label="总价">
51 51
         <template slot-scope="scope">
52
-          <div> {{scope.row.retail_price * scope.row.prescribing_number}}元</div>
52
+          <div> {{(scope.row.retail_price * scope.row.prescribing_number).toFixed(2)}}元</div>
53 53
         </template>
54 54
       </el-table-column>
55 55
 
@@ -185,7 +185,7 @@
185 185
 
186 186
       <el-table-column align="center" prop="name" width="60" label="总价">
187 187
         <template slot-scope="scope">
188
-          <div> {{scope.row.total * scope.row.price}}元</div>
188
+          <div> {{(scope.row.total * scope.row.price).toFixed(2)}}元</div>
189 189
         </template>
190 190
       </el-table-column>
191 191
 

+ 6 - 5
src/xt_pages/hospitalStation/components/chargeDialog.vue 파일 보기

@@ -166,19 +166,20 @@
166 166
       }
167 167
     },
168 168
     methods: {
169
-      show: function (total) {
169
+      show: function (total,order) {
170 170
         this.total = total;
171 171
         this.form.private_price = total;
172 172
         this.form.pay_price = total;
173 173
         this.form.total = total + this.form.medical_insurance_price;
174 174
         this.form.discount_price = 0.0;
175 175
         this.form.preferential_price = 0.0;
176
-
177 176
         this.form.fapiao_code ="";
178 177
         this.form.fapiao_number = "";
179
-
180
-
181
-
178
+        if(order&&order.id > 0){
179
+          this.total = order.medfee_sumamt;
180
+          this.form.private_price = order.medfee_sumamt;
181
+          this.form.pay_price = order.medfee_sumamt;
182
+        }
182 183
         this.visibility = true
183 184
 
184 185
       }, hide: function () {

+ 62 - 2
src/xt_pages/hospitalStation/components/settlePrescriptionTable.vue 파일 보기

@@ -48,12 +48,41 @@
48 48
       </el-table-column>
49 49
       <el-table-column align="center" prop="name" width="60" label="总价">
50 50
         <template slot-scope="scope">
51
-          <div> {{scope.row.prescribing_number * scope.row.retail_price}}元</div>
51
+          <div> {{(scope.row.prescribing_number * scope.row.retail_price).toFixed(2)}}元</div>
52 52
 
53 53
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
54 54
         </template>
55 55
       </el-table-column>
56 56
 
57
+      <el-table-column align="center" prop="name" width="60" label="全自费金额">
58
+        <template slot-scope="scope">
59
+          <div> {{scope.row.fulamt_ownpay_amt}}元</div>
60
+        </template>
61
+      </el-table-column>
62
+
63
+
64
+
65
+      <el-table-column align="center" prop="name" width="60" label="超限价金额">
66
+        <template slot-scope="scope">
67
+          <div> {{scope.row.overlmt_amt}}元</div>
68
+        </template>
69
+      </el-table-column>
70
+
71
+
72
+      <el-table-column align="center" prop="name" width="60" label="先行自付金额">
73
+        <template slot-scope="scope">
74
+          <div> {{scope.row.preselfpay_amt}}元</div>
75
+        </template>
76
+      </el-table-column>
77
+
78
+
79
+      <el-table-column align="center" prop="name" width="60" label="符合正常范围金额">
80
+        <template slot-scope="scope">
81
+          <div> {{scope.row.inscp_scp_amt}}元</div>
82
+        </template>
83
+      </el-table-column>
84
+
85
+
57 86
 
58 87
 
59 88
       <el-table-column align="center" prop="name" width="50" label="备注">
@@ -118,11 +147,42 @@
118 147
 
119 148
       <el-table-column align="center" prop="name" width="60" label="总价">
120 149
         <template slot-scope="scope">
121
-          <div> {{scope.row.total * scope.row.price}}元</div>
150
+          <div> {{(scope.row.total * scope.row.price).toFixed(2)}}元</div>
122 151
 
123 152
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
124 153
         </template>
125 154
       </el-table-column>
155
+
156
+      <el-table-column align="center" prop="name" width="60" label="全自费金额">
157
+        <template slot-scope="scope">
158
+          <div> {{scope.row.fulamt_ownpay_amt}}元</div>
159
+        </template>
160
+      </el-table-column>
161
+
162
+
163
+
164
+      <el-table-column align="center" prop="name" width="60" label="超限价金额">
165
+        <template slot-scope="scope">
166
+          <div> {{scope.row.overlmt_amt}}元</div>
167
+        </template>
168
+      </el-table-column>
169
+
170
+
171
+      <el-table-column align="center" prop="name" width="60" label="先行自付金额">
172
+        <template slot-scope="scope">
173
+          <div> {{scope.row.preselfpay_amt}}元</div>
174
+        </template>
175
+      </el-table-column>
176
+
177
+
178
+      <el-table-column align="center" prop="name" width="60" label="符合正常范围金额">
179
+        <template slot-scope="scope">
180
+          <div> {{scope.row.inscp_scp_amt}}元</div>
181
+        </template>
182
+      </el-table-column>
183
+
184
+
185
+
126 186
       <el-table-column align="center" prop="name" width="50" label="备注">
127 187
         <template slot-scope="scope">
128 188
           <!--<el-input v-model="scope.row.remark" readonly></el-input>-->

+ 6 - 3
src/xt_pages/hospitalStation/doctorDesk.vue 파일 보기

@@ -3967,7 +3967,8 @@
3967 3967
             record: this.record_date,
3968 3968
             prescription_id: this.prescription_id,
3969 3969
             ids: ids1,
3970
-            patient_id: this.patientid
3970
+            patient_id: this.patientid,
3971
+            p_type:1
3971 3972
           }
3972 3973
           this.paramsObj = obj1
3973 3974
         }
@@ -3983,7 +3984,8 @@
3983 3984
             record: this.record_date,
3984 3985
             prescription_id: this.prescription_id,
3985 3986
             ids: ids2,
3986
-            patient_id: this.patientid
3987
+            patient_id: this.patientid,
3988
+            p_type:1
3987 3989
           }
3988 3990
           this.paramsObj2 = obj2
3989 3991
         }
@@ -3997,7 +3999,8 @@
3997 3999
             record: this.record_date,
3998 4000
             prescription_id: this.prescription_id,
3999 4001
             ids: ids2,
4000
-            patient_id: this.patientid
4002
+            patient_id: this.patientid,
4003
+            p_type:1
4001 4004
           }
4002 4005
           this.paramsObj3 = obj3
4003 4006
         }

+ 4 - 4
src/xt_pages/hospitalStation/index.vue 파일 보기

@@ -87,7 +87,7 @@
87 87
                     <!--<el-form-item class="specialFormItem" label="医保卡号:">-->
88 88
                     <!--<div style="display:flex;">-->
89 89
                     <!--<el-input v-model="form.medicalInsuranceCard"></el-input>-->
90
-                    <el-button style="margin-left:10px;" type="primary" @click="check" v-if="form.id_card_no.length > 0">查待遇</el-button>
90
+<!--                    <el-button style="margin-left:10px;" type="primary" @click="check" v-if="form.id_card_no.length > 0">查待遇</el-button>-->
91 91
                     <!--</div>-->
92 92
                     <!--</el-form-item>-->
93 93
 
@@ -338,7 +338,6 @@
338 338
         },
339 339
         doctorList: [],
340 340
         departmentList: [],
341
-        check: 0,
342 341
         show: false,
343 342
         is_Name: false,
344 343
         patient: [],
@@ -358,7 +357,8 @@
358 357
         }
359 358
         var that = this
360 359
         let params={
361
-          id_card_no: this.form.id_card_no,
360
+          patient_id:this.form.id,
361
+        id_card_no: this.form.id_card_no,
362 362
           admin_user_id:this.$store.getters.xt_user.user.id,
363 363
           med_type: this.form.med_type,
364 364
           insutype: this.form.social_type
@@ -870,7 +870,7 @@
870 870
       }
871 871
       this.form.start_time =moment(new Date()).add('year',0).format("YYYY-MM-DD HH:mm:ss")
872 872
       this.getInitData()
873
-      //获取当前机构有人员信息
873
+      //获取当前机构有人员信息inde
874 874
       this.getAllDoctorList()
875 875
     }
876 876
   }

+ 22 - 3
src/xt_pages/hospitalStation/outpatientChargesManagement.vue 파일 보기

@@ -13,7 +13,6 @@
13 13
             :editable="false"
14 14
             style="width: 100%;"
15 15
             type="date"
16
-            :picker-options="pickerOptions"
17 16
             placeholder="选择开始时间"
18 17
             align="right"
19 18
             format="yyyy-MM-dd"
@@ -423,7 +422,7 @@ export default {
423 422
       department: [],
424 423
       invoiceVisible: false,
425 424
       invoiceParams: {},
426
-      out_hospital_time: ''
425
+      out_hospital_time: moment(new Date()).add('year',0).format("YYYY-MM-DD HH:mm:ss")
427 426
 
428 427
     }
429 428
   },
@@ -1427,7 +1426,7 @@ export default {
1427 1426
           return
1428 1427
         }
1429 1428
 
1430
-        this.$refs.charge.show(this.getSettleTotal())
1429
+        this.$refs.charge.show(this.getSettleTotal(),this.order)
1431 1430
 
1432 1431
       } else if (index == 4) {
1433 1432
         if (this.hisPatientInfo.balance_accounts_type == 2) {
@@ -2688,6 +2687,15 @@ export default {
2688 2687
             obj['id'] = drug_month_prescriptions.advices[a].drug_id
2689 2688
             // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
2690 2689
             obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price)
2690
+
2691
+
2692
+            obj['code'] = drug_month_prescriptions.advices[a].drug.medical_insurance_number
2693
+            obj['fulamt_ownpay_amt'] = drug_month_prescriptions.advices[a].order_info.fulamt_ownpay_amt
2694
+            obj['overlmt_amt'] = drug_month_prescriptions.advices[a].order_info.overlmt_amt
2695
+            obj['inscp_scp_amt'] = drug_month_prescriptions.advices[a].order_info.inscp_scp_amt
2696
+            obj['preselfpay_amt'] = drug_month_prescriptions.advices[a].order_info.preselfpay_amt
2697
+
2698
+
2691 2699
             count = count + drug_month_prescriptions.advices[a].prescribing_number
2692 2700
 
2693 2701
           }
@@ -2716,6 +2724,12 @@ export default {
2716 2724
 
2717 2725
             }
2718 2726
 
2727
+            obj['fulamt_ownpay_amt'] = project_month_prescriptions.project[a].order_info.fulamt_ownpay_amt
2728
+            obj['overlmt_amt'] = project_month_prescriptions.project[a].order_info.overlmt_amt
2729
+            obj['inscp_scp_amt'] = project_month_prescriptions.project[a].order_info.inscp_scp_amt
2730
+            obj['preselfpay_amt'] = project_month_prescriptions.project[a].order_info.preselfpay_amt
2731
+
2732
+
2719 2733
             // obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
2720 2734
             // obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
2721 2735
             obj['single_dose'] = project_month_prescriptions.project[a].single_dose
@@ -2729,6 +2743,9 @@ export default {
2729 2743
             // price = price + project_month_prescriptions.project[a].price
2730 2744
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
2731 2745
 
2746
+
2747
+
2748
+
2732 2749
           }
2733 2750
         }
2734 2751
         obj['total'] = count
@@ -2906,6 +2923,8 @@ export default {
2906 2923
                 preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
2907 2924
                 inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt
2908 2925
 
2926
+
2927
+
2909 2928
               }
2910 2929
               tempAdvice.push(obj)
2911 2930
             }

+ 3 - 1
src/xt_pages/hospitalStation/print.vue 파일 보기

@@ -71,7 +71,8 @@
71 71
         prescription_id:"",
72 72
         ids:'',
73 73
         paramsObj:{},
74
-        org_id:''
74
+        org_id:'',
75
+        p_type:1,
75 76
       };
76 77
     },
77 78
     methods:{
@@ -190,6 +191,7 @@
190 191
       this.prescription_id = prescription_id
191 192
       this.patient_id = this.paramsObj.patient_id
192 193
       this.ids = this.paramsObj.ids
194
+
193 195
       // var record_date = this.$route.query.record
194 196
       // this.record_date = record_date
195 197
       // console.log("record_date",record_date)

+ 3 - 1
src/xt_pages/hospitalStation/template/printFive.vue 파일 보기

@@ -203,7 +203,9 @@ export default {
203 203
         patient_id: this.patient_id,
204 204
         record_date: this.record_date,
205 205
         prescription_id: this.prescription_id,
206
-        ids: this.ids
206
+        ids: this.ids,
207
+        p_type:1,
208
+
207 209
       }
208 210
       console.log('params', params)
209 211
       getPrescriptionPrint(params).then(response => {

+ 4 - 2
src/xt_pages/hospitalStation/template/printFour.vue 파일 보기

@@ -148,8 +148,10 @@ export default {
148 148
           patient_id:this.patient_id,
149 149
           record_date:this.record_date,
150 150
           prescription_id:this.prescription_id,
151
-          ids:this.ids
152
-        }
151
+          ids:this.ids,
152
+           p_type:1,
153
+
154
+         }
153 155
         console.log("params",params)
154 156
        getPrescriptionPrint(params).then(response=>{
155 157
          if(response.data.state == 1){

+ 3 - 2
src/xt_pages/hospitalStation/template/printOne.vue 파일 보기

@@ -149,7 +149,8 @@ export default {
149 149
           patient_id:this.patient_id,
150 150
           record_date:this.record_date,
151 151
           prescription_id:this.prescription_id,
152
-          ids:this.ids
152
+          ids:this.ids,
153
+          p_type:1,
153 154
         }
154 155
         console.log("params",params)
155 156
        getPrescriptionPrint(params).then(response=>{
@@ -169,7 +170,7 @@ export default {
169 170
      },
170 171
      getHisPatientDetail(){
171 172
           const params = {
172
-              patient_id:this.patient_id
173
+              patient_id:this.patient_id,
173 174
           }
174 175
        getHisPatientDetail(params).then(response=>{
175 176
           if(response.data.state == 1){

+ 4 - 2
src/xt_pages/hospitalStation/template/printThree.vue 파일 보기

@@ -171,8 +171,10 @@ export default {
171 171
           patient_id:this.patient_id,
172 172
           record_date:this.record_date,
173 173
           prescription_id:this.prescription_id,
174
-          ids:this.ids
175
-        }
174
+          ids:this.ids,
175
+           p_type:1,
176
+
177
+         }
176 178
         console.log("params",params)
177 179
        getPrescriptionPrint(params).then(response=>{
178 180
          if(response.data.state == 1){

+ 3 - 1
src/xt_pages/hospitalStation/template/printTwo.vue 파일 보기

@@ -130,7 +130,9 @@ export default {
130 130
           patient_id:this.patient_id,
131 131
           record_date:this.record_date,
132 132
           prescription_id:this.prescription_id,
133
-        }
133
+           p_type:1,
134
+
135
+         }
134 136
         console.log("params---",params)
135 137
        getPrescriptionPrint(params).then(response=>{
136 138
          if(response.data.state == 1){

+ 3 - 1
src/xt_pages/hospitalStation/treatTemplate/printOne.vue 파일 보기

@@ -317,7 +317,9 @@
317 317
           patient_id: this.patient_id,
318 318
           record_date: this.record_date,
319 319
           prescription_id: this.prescription_id,
320
-          ids: this.ids
320
+          ids: this.ids,
321
+          p_type:1,
322
+
321 323
         }
322 324
         console.log('999999', params)
323 325
         getPrescriptionPrint(params).then(response => {

+ 3 - 1
src/xt_pages/hospitalStation/treatTemplate/printTwo.vue 파일 보기

@@ -308,7 +308,9 @@ export default {
308 308
           record_date:this.record_date,
309 309
           prescription_id:this.prescription_id,
310 310
           ids:this.ids,
311
-        }
311
+           p_type:1,
312
+
313
+         }
312 314
         console.log("999999",params)
313 315
        getPrescriptionPrint(params).then(response=>{
314 316
          if(response.data.state == 1){

+ 54 - 4
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue 파일 보기

@@ -89,6 +89,11 @@
89 89
             >结算单
90 90
             </el-button>
91 91
 
92
+            <el-button v-if="this.radio == 2   && this.order.order_status == 2" size="small"
93
+                       @click="open(30)" type="primary"
94
+            >打印发票
95
+            </el-button>
96
+
92 97
             <el-button
93 98
                 size="small" @click="open(10)" type="primary"
94 99
             >退号
@@ -801,6 +806,14 @@
801 806
       </div>
802 807
     </el-dialog>
803 808
 
809
+    <el-dialog
810
+        class="centerDialog"
811
+        width="1200px"
812
+        title="打印"
813
+        :visible.sync="invoiceVisible">
814
+      <invoice-print ref="print" :invoiceParams='invoiceParams'></invoice-print>
815
+    </el-dialog>
816
+
804 817
   </div>
805 818
 
806 819
 </template>
@@ -808,13 +821,15 @@
808 821
 
809 822
 <script>
810 823
 import axios from 'axios'
811
-
824
+import invoicePrint from './invoicePrint'
812 825
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
813 826
 import noCharge from './components/noCharge'
814 827
 import charged from './components/charged'
815 828
 import medicalInsuranceRefund from './components/medicalInsuranceRefund'
816 829
 import prescriptionTable from './components/prescriptionTable'
817 830
 import additionalCharges from './components/additionalCharges'
831
+import { fetchAllAdminUsers } from '@/api/doctor'
832
+
818 833
 import {
819 834
   changeMedType,
820 835
   getChargeHisPatientInfo,
@@ -826,7 +841,8 @@ import {
826 841
   Refund,
827 842
   refundNumber,
828 843
   register,
829
-  upload
844
+  upload,
845
+
830 846
 } from '@/api/his/his'
831 847
 import RegisterDialog from './components/registerDialog'
832 848
 import treatPrint from './treatPrint'
@@ -854,11 +870,14 @@ export default {
854 870
     prescriptionTable,
855 871
     additionalCharges,
856 872
     treatPrint,
857
-    statementPrint
873
+    statementPrint,
874
+    invoicePrint
858 875
 
859 876
   },
860 877
   data() {
861 878
     return {
879
+      invoiceVisible:false,
880
+      invoiceParams:null,
862 881
       temp_med_type: '',
863 882
       dialogVisible: false,
864 883
       pwdFormVisible: false,
@@ -949,7 +968,7 @@ export default {
949 968
 
950 969
       other_start_time_two: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
951 970
       other_end_time_two: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
952
-
971
+      adminUserOptions:[],
953 972
       curMonthPrescriptions: null,
954 973
       newCurMonthPrescriptions: null,
955 974
       big_month_prescriptions: [],
@@ -1025,6 +1044,7 @@ export default {
1025 1044
     }
1026 1045
   },
1027 1046
   created() {
1047
+    this.fetchAllAdminUsers()
1028 1048
     const tableHeight = document.body.clientHeight - 290
1029 1049
     this.tableHeight = tableHeight
1030 1050
     var nowDate = new Date()
@@ -1056,6 +1076,14 @@ export default {
1056 1076
     this.getPatientList()
1057 1077
   },
1058 1078
   methods: {
1079
+    fetchAllAdminUsers() {
1080
+      fetchAllAdminUsers().then(response => {
1081
+        if (response.data.state == 1) {
1082
+          this.adminUserOptions = response.data.data.users
1083
+
1084
+        }
1085
+      })
1086
+    },
1059 1087
     changeTimeTwo() {
1060 1088
       this.getPatientList()
1061 1089
       this.form.diagnosis_time = this.record_date + ' ' + '00:00:00'
@@ -2986,7 +3014,29 @@ export default {
2986 3014
             .catch(function(error) {
2987 3015
             })
2988 3016
 
3017
+      } else if(index == 30){
3018
+
3019
+        let paramsObj = {
3020
+          order_id: this.order.id,
3021
+          patient_id: this.order.patient_id,
3022
+          number: this.order.mdtrt_id,
3023
+          name: this.patientInfo.name,
3024
+          age: this.order.age,
3025
+          gend: this.order.gend,
3026
+          setl_time: this.order.setl_time,
3027
+          chargeName: this.getName(this.order.creator)
3028
+        }
3029
+        this.invoiceParams = paramsObj
3030
+        this.invoiceVisible = true
3031
+
2989 3032
       }
3033
+    }, getName(admin_user_id) {
3034
+      for (let i = 0; i < this.adminUserOptions.length; i++) {
3035
+        if (this.adminUserOptions[i].id == admin_user_id) {
3036
+          return this.adminUserOptions[i].name
3037
+        }
3038
+      }
3039
+
2990 3040
     },
2991 3041
     choosePatient() {
2992 3042
       this.radioStatus = id

+ 22 - 20
src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue 파일 보기

@@ -40,7 +40,7 @@
40 40
                     </div>
41 41
                     <div>医生签字:{{ doctor ? doctor : '' }}</div>
42 42
                 </div>
43
-            </div>   
43
+            </div>
44 44
             <img style="width:100%;" v-if="org_id == 10138 || org_id == 10278" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
45 45
         </div>
46 46
     </div>
@@ -56,7 +56,7 @@ export default {
56 56
       record_date:String,
57 57
       prescription_id:Number,
58 58
       ids:String
59
-    }, 
59
+    },
60 60
     data(){
61 61
       return {
62 62
         doctorList:[],
@@ -97,10 +97,10 @@ export default {
97 97
       getAllDoctorList().then(response=>{
98 98
         if(response.data.state == 1){
99 99
                var doctor =  response.data.data.doctor
100
-               
100
+
101 101
                this.doctorList = doctor
102 102
              }
103
-         })   
103
+         })
104 104
      },
105 105
 
106 106
       getDoctor(id){
@@ -126,8 +126,10 @@ export default {
126 126
           patient_id:this.patient_id,
127 127
           record_date:this.record_date,
128 128
           prescription_id:this.prescription_id,
129
-          ids:this.ids
130
-        }
129
+          ids:this.ids,
130
+           p_type:2,
131
+
132
+         }
131 133
         console.log("params",params)
132 134
        getPrescriptionPrint(params).then(response=>{
133 135
          if(response.data.state == 1){
@@ -152,7 +154,7 @@ export default {
152 154
                             }
153 155
                         }
154 156
                   })
155
-                
157
+
156 158
               }
157 159
             })
158 160
             let data = []
@@ -167,9 +169,9 @@ export default {
167 169
               if(item.team.id == 0){
168 170
                 data2.push(item)
169 171
               }
170
-              
172
+
171 173
             })
172
-          
174
+
173 175
             this.total = total.toFixed(2)
174 176
             this.pre_time = this.advicePrint[0].pre_time
175 177
             this.doctor = this.advicePrint[0].doctor
@@ -185,7 +187,7 @@ export default {
185 187
             let outputlist1Name = response.data.data.his.patient_info ? JSON.parse(response.data.data.his.patient_info) : {};
186 188
             this.faber = outputlist1Name
187 189
 
188
-            
190
+
189 191
           }
190 192
        })
191 193
      },
@@ -238,7 +240,7 @@ export default {
238 240
             }
239 241
               addtotal =  Math.floor(addtotal * 100) / 100
240 242
         }
241
-       
243
+
242 244
        }
243 245
 
244 246
       for (let i = 0; i < this.prescriptions.length; i++) {
@@ -248,7 +250,7 @@ export default {
248 250
                 total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
249 251
               }
250 252
             }
251
-          
253
+
252 254
             if (this.prescriptions[i].additionalcharge != null) {
253 255
               for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
254 256
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
@@ -260,7 +262,7 @@ export default {
260 262
 
261 263
         return total + addtotal
262 264
       },
263
-      
265
+
264 266
      getProjectName(id){
265 267
         var project_name = ""
266 268
         for(let i=0;i<this.projectList.length;i++){
@@ -275,14 +277,14 @@ export default {
275 277
         let newIds = ids.split(',').sort(function(a,b){
276 278
           return a-b;
277 279
         })
278
-        
280
+
279 281
         var name = ""
280 282
         let nameArr = []
281 283
         for(let i=0;i<this.diagnoses.length;i++){
282 284
           // if(id == this.diagnoses[i].id){
283 285
           //    name = this.diagnoses[i].class_name
284 286
           // }
285
-          
287
+
286 288
           if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
287 289
             // name += diagnoses[i].class_name + ' '
288 290
             nameArr.push(this.diagnoses[i].class_name)
@@ -292,7 +294,7 @@ export default {
292 294
         nameArr.map((item,index) => {
293 295
           if(item == '尿毒症'){
294 296
             newNameArr.push(item)
295
-            nameArr.splice(index,1,'') 
297
+            nameArr.splice(index,1,'')
296 298
           }
297 299
         })
298 300
         newNameArr.push(...nameArr)
@@ -316,7 +318,7 @@ export default {
316 318
             this.page = 1
317 319
             arr.push(item.advices.length)
318 320
             item.pageArr.push(arr)
319
-            
321
+
320 322
           }else if(item.advices.length > 5){
321 323
             this.page = parseInt(item.advices.length / 5)
322 324
             let num = item.advices.length % 5
@@ -414,7 +416,7 @@ export default {
414 416
       var xtuser = this.$store.getters.xt_user;
415 417
       this.orgname = xtuser.org.org_name;
416 418
       this.org_id = this.$store.getters.xt_user.org_id
417
-     
419
+
418 420
    },
419 421
    watch:{
420 422
      ids:function(val){
@@ -429,7 +431,7 @@ export default {
429 431
 <style lang="scss" scoped>
430 432
 .prescription-print{
431 433
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
432
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
434
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
433 435
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
434 436
     margin-bottom: 20px;
435 437
     padding:20px 10px;
@@ -487,7 +489,7 @@ export default {
487 489
 }
488 490
 .actionBar{
489 491
     display: flex;
490
-    justify-content: space-between; 
492
+    justify-content: space-between;
491 493
     line-height: 24px;
492 494
     padding:0 10px;
493 495
 }

+ 4 - 2
src/xt_pages/outpatientDoctorStation/template/printFive.vue 파일 보기

@@ -167,8 +167,10 @@ export default {
167 167
           patient_id:this.patient_id,
168 168
           record_date:this.record_date,
169 169
           prescription_id:this.prescription_id,
170
-          ids:this.ids
171
-        }
170
+          ids:this.ids,
171
+           p_type:2,
172
+
173
+         }
172 174
         console.log("params",params)
173 175
        getPrescriptionPrint(params).then(response=>{
174 176
          if(response.data.state == 1){

+ 4 - 2
src/xt_pages/outpatientDoctorStation/template/printFour.vue 파일 보기

@@ -147,8 +147,10 @@ export default {
147 147
           patient_id:this.patient_id,
148 148
           record_date:this.record_date,
149 149
           prescription_id:this.prescription_id,
150
-          ids:this.ids
151
-        }
150
+          ids:this.ids,
151
+           p_type:2,
152
+
153
+         }
152 154
         console.log("params",params)
153 155
        getPrescriptionPrint(params).then(response=>{
154 156
          if(response.data.state == 1){

+ 4 - 2
src/xt_pages/outpatientDoctorStation/template/printOne.vue 파일 보기

@@ -165,8 +165,10 @@ export default {
165 165
           patient_id:this.patient_id,
166 166
           record_date:this.record_date,
167 167
           prescription_id:this.prescription_id,
168
-          ids:this.ids
169
-        }
168
+          ids:this.ids,
169
+           p_type:2,
170
+
171
+         }
170 172
         console.log("params",params)
171 173
        getPrescriptionPrint(params).then(response=>{
172 174
          if(response.data.state == 1){

+ 4 - 2
src/xt_pages/outpatientDoctorStation/template/printThree.vue 파일 보기

@@ -184,8 +184,10 @@ export default {
184 184
           patient_id:this.patient_id,
185 185
           record_date:this.record_date,
186 186
           prescription_id:this.prescription_id,
187
-          ids:this.ids
188
-        }
187
+          ids:this.ids,
188
+           p_type:2,
189
+
190
+         }
189 191
         console.log("params",params)
190 192
        getPrescriptionPrint(params).then(response=>{
191 193
          if(response.data.state == 1){

+ 3 - 1
src/xt_pages/outpatientDoctorStation/template/printTwo.vue 파일 보기

@@ -112,7 +112,9 @@ export default {
112 112
           patient_id:this.patient_id,
113 113
           record_date:this.record_date,
114 114
           prescription_id:this.prescription_id,
115
-        }
115
+           p_type:2,
116
+
117
+         }
116 118
         console.log("params---",params)
117 119
        getPrescriptionPrint(params).then(response=>{
118 120
          if(response.data.state == 1){

+ 2 - 1
src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue 파일 보기

@@ -317,7 +317,8 @@
317 317
           patient_id: this.patient_id,
318 318
           record_date: this.record_date,
319 319
           prescription_id: this.prescription_id,
320
-          ids: this.ids
320
+          ids: this.ids,
321
+          p_type:2,
321 322
         }
322 323
         console.log('999999', params)
323 324
         getPrescriptionPrint(params).then(response => {

+ 4 - 2
src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue 파일 보기

@@ -247,7 +247,7 @@ export default {
247 247
       //   age++
248 248
       // }
249 249
       // return age
250
-      var nowTime = new Date().getTime(); 
250
+      var nowTime = new Date().getTime();
251 251
       //一年毫秒数(365 * 86400000 = 31536000000)
252 252
       return Math.ceil((nowTime-(birthday * 1000))/31536000000);
253 253
     },
@@ -321,7 +321,9 @@ export default {
321 321
           record_date:this.record_date,
322 322
           prescription_id:this.prescription_id,
323 323
           ids:this.ids,
324
-        }
324
+           p_type:2,
325
+
326
+         }
325 327
         console.log("999999",params)
326 328
        getPrescriptionPrint(params).then(response=>{
327 329
          if(response.data.state == 1){

+ 6 - 10
src/xt_pages/outpatientTool/yidiClear.vue 파일 보기

@@ -7,15 +7,11 @@
7 7
     <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
8 8
       <div>
9 9
 
10
-        <el-date-picker
11
-            v-model="year"
12
-            type="year"
13
-            placeholder="选择年">
14
-        </el-date-picker>
10
+
15 11
         <el-date-picker
16 12
             v-model="month"
17 13
             type="month"
18
-            placeholder="选择月">
14
+            placeholder="选择年月">
19 15
         </el-date-picker>
20 16
       </div>
21 17
       <div>
@@ -98,8 +94,8 @@ export default {
98 94
     getYidiClear(){
99 95
       var that = this;
100 96
       let params = {
101
-        'year':year,
102
-        'month':month,
97
+        'year':this.month.split("-")[0],
98
+        'month':this.month.split("-")[1],
103 99
         'admin_user_id':this.$store.getters.xt_user.user.id,
104 100
       };
105 101
       axios.get('http://127.0.0.1:9532/api/allopatry/get',{params:params}).then(function(response) {
@@ -127,8 +123,8 @@ export default {
127 123
     },comfirmClear(){
128 124
       var that = this;
129 125
       let params = {
130
-        'year':year,
131
-        'month':month,
126
+        'year':this.month.split("-")[0],
127
+        'month':this.month.split("-")[1],
132 128
         'admin_user_id':this.$store.getters.xt_user.user.id,
133 129
       };
134 130
       axios.post('http://127.0.0.1:9532/api/comfirmallopatry/post',{params:params}).then(function(response) {