Pārlūkot izejas kodu

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

csx 3 gadus atpakaļ
vecāks
revīzija
241ac977ed

+ 38 - 16
src/xt_pages/hospitalStation/components/chargeDialog.vue Parādīt failu

@@ -20,6 +20,16 @@
20 20
         <el-input type="number" v-model="form.private_price" :disabled="true"></el-input>
21 21
       </el-form-item>
22 22
 
23
+      <el-form-item label="个账支出:" prop="age" :validate-event="is_Name" style="width:33%;">
24
+        <el-input type="number" v-model="form.acct_pay" :disabled="true"></el-input>
25
+      </el-form-item>
26
+
27
+
28
+      <el-form-item label="个人现金支出:" prop="age" :validate-event="is_Name" style="width:33%;">
29
+        <el-input type="number" v-model="form.psn_pay" :disabled="true"></el-input>
30
+      </el-form-item>
31
+
32
+
23 33
 
24 34
       <el-form-item label="支付方式:" style="width:100%;">
25 35
         <!-- <el-select v-model="form.pay_way" placeholder="请选择">
@@ -82,8 +92,8 @@
82 92
     </el-form>
83 93
 
84 94
     <span slot="footer" class="dialog-footer">
85
-    <el-button v-loading="loadingtwo" @click="cancel('formValue')">取 消</el-button>
86
-    <el-button v-loading="loadingtwo" type="primary" @click="confirm('formValue')">确 定</el-button>
95
+    <el-button @click="cancel('formValue')">取 消</el-button>
96
+    <el-button type="primary" @click="confirm('formValue')">确 定</el-button>
87 97
   </span>
88 98
   </el-dialog>
89 99
 
@@ -111,7 +121,10 @@
111 121
           found_price:'',
112 122
           total:0,
113 123
           fapiao_code:"",
114
-          fapiao_number:""
124
+          fapiao_number:"",
125
+          order:null,
126
+          acct_pay:'',
127
+          psn_pay:'',
115 128
 
116 129
 
117 130
         },
@@ -140,7 +153,9 @@
140 153
           reality_price:'',
141 154
           found_price:'',
142 155
           fapiao_code:"",
143
-          fapiao_number:""
156
+          fapiao_number:"",
157
+          acct_pay:"",
158
+          psn_pay:"",
144 159
         },
145 160
 
146 161
       }
@@ -167,19 +182,26 @@
167 182
     },
168 183
     methods: {
169 184
       show: function (total,order) {
170
-        this.total = total;
171
-        this.form.private_price = total;
172
-        this.form.pay_price = total;
173
-        this.form.total = total + this.form.medical_insurance_price;
174
-        this.form.discount_price = 0.0;
175
-        this.form.preferential_price = 0.0;
176
-        this.form.fapiao_code ="";
177
-        this.form.fapiao_number = "";
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;
185
+        this.form.total = total
186
+        this.form.private_price = total
187
+        this.form.pay_price = total
188
+        this.form.total = total + this.form.medical_insurance_price
189
+        this.form.discount_price = 0.0
190
+        this.form.preferential_price = 0.0
191
+
192
+        this.form.fapiao_code =""
193
+        this.form.fapiao_number = ""
194
+        this.order = order
195
+
196
+        if(this.order && this.order.id > 0){
197
+          this.form.acct_pay = this.order.acct_pay
198
+          this.form.psn_pay = this.order.psn_cash_pay
199
+          this.form.total = this.order.medfee_sumamt
200
+          this.form.pay_price = this.order.medfee_sumamt
201
+          this.form.medical_insurance_price = this.order.fund_pay_sumamt
202
+          this.form.private_price =  this.order.psn_part_amt
182 203
         }
204
+
183 205
         this.visibility = true
184 206
 
185 207
       }, hide: function () {

+ 3 - 2
src/xt_pages/hospitalStation/outpatientChargesManagement.vue Parādīt failu

@@ -1425,8 +1425,8 @@ export default {
1425 1425
           this.$message.error('请先到医生工作站开处方再来结算')
1426 1426
           return
1427 1427
         }
1428
-
1429
-        this.$refs.charge.show(this.getSettleTotal(),this.order)
1428
+        console.log(this.order)
1429
+        this.$refs.charge.show(this.settle_total,this.order)
1430 1430
 
1431 1431
       } else if (index == 4) {
1432 1432
         if (this.hisPatientInfo.balance_accounts_type == 2) {
@@ -2901,6 +2901,7 @@ export default {
2901 2901
       return arr.filter((arr) => !res.has(arr.id_card_no) && res.set(arr.id_card_no, 1))
2902 2902
     },
2903 2903
     handleCurrentChange(val) {
2904
+      console.log(val)
2904 2905
       this.curPrescriptions = {}
2905 2906
       this.curMonthPrescriptions = {}
2906 2907
       this.prescriptions = []

+ 46 - 53
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Parādīt failu

@@ -46,7 +46,7 @@
46 46
           </el-button>
47 47
         </div>
48 48
         <div>
49
-          <el-table :data="patientTableData" :height="tableHeight" border style="width: 100%;"
49
+          <el-table  :data="patientTableData" :height="tableHeight" border style="width: 100%;"
50 50
                     :row-style="{ color: '#303133' }"
51 51
 
52 52
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -60,6 +60,22 @@
60 60
               </template>
61 61
             </el-table-column>
62 62
           </el-table>
63
+
64
+<!--          <el-table v-else :data="monthChargePatientTableData" :height="tableHeight" border style="width: 100%;"-->
65
+<!--                    :row-style="{ color: '#303133' }"-->
66
+
67
+<!--                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"-->
68
+<!--                    highlight-current-row ref="tab"-->
69
+<!--                    @current-change="handleCurrentChange">-->
70
+<!--            <el-table-column align="center" prop="name" label="姓名" wdith='89'>-->
71
+<!--              <template slot-scope="scope">{{ scope.row.name }}</template>-->
72
+<!--            </el-table-column>-->
73
+<!--            <el-table-column align="center" prop="name" label="就诊号" width="110">-->
74
+<!--              <template slot-scope="scope">{{ scope.row.number ? scope.row.number : '' }}-->
75
+<!--              </template>-->
76
+<!--            </el-table-column>-->
77
+<!--          </el-table>-->
78
+
63 79
         </div>
64 80
       </div>
65 81
 
@@ -874,6 +890,7 @@ export default {
874 890
   },
875 891
   data() {
876 892
     return {
893
+      monthChargePatientTableData:[],
877 894
       invoiceVisible:false,
878 895
       invoiceParams:null,
879 896
       temp_med_type: '',
@@ -937,7 +954,9 @@ export default {
937 954
         { value: '1112', label: '精二' },
938 955
         { value: '9933', label: '门诊特殊病(9933)' },
939 956
         { value: '990602', label: '门诊特殊病(990602)' },
940
-        { value: '1402', label: '门诊特殊病(1402)' }
957
+        { value: '1402', label: '门诊特殊病(1402)' },
958
+        { value: '0', label: '自费' }
959
+
941 960
 
942 961
       ],
943 962
       register_two: [
@@ -946,7 +965,8 @@ export default {
946 965
         { value: '9922', label: '家庭通道' },
947 966
         { value: '9933', label: '门诊特殊病(9933)' },
948 967
         { value: '990602', label: '门诊特殊病(990602)' },
949
-        { value: '1402', label: '门诊特殊病(1402)' }
968
+        { value: '1402', label: '门诊特殊病(1402)' },
969
+        { value: '0', label: '自费' }
950 970
 
951 971
       ],
952 972
       loading: false,
@@ -1434,8 +1454,8 @@ export default {
1434 1454
                   })
1435 1455
 
1436 1456
                 } else {
1437
-                  that.changeRadioAndPatient(2)
1438 1457
                   that.radio = 2
1458
+                  that.changeRadioAndPatient(2)
1439 1459
                   that.$refs.charge.hide()
1440 1460
                   that.loadingtwo = false
1441 1461
                   that.state = '已收费'
@@ -1508,6 +1528,7 @@ export default {
1508 1528
                     }).catch(() => {
1509 1529
                     })
1510 1530
                   } else {
1531
+
1511 1532
                     that.changeRadio(1)
1512 1533
                     that.$refs.register9504.hide()
1513 1534
                     that.$message({ message: '挂号成功', type: 'success' })
@@ -1573,6 +1594,7 @@ export default {
1573 1594
                   })
1574 1595
 
1575 1596
                 } else {
1597
+                  that.radio = 1
1576 1598
                   that.changeRadioAndPatient(1)
1577 1599
                   that.$message({ message: '挂号成功', type: 'success', duration: 5000 })
1578 1600
                   that.$refs.register.hide()
@@ -2186,16 +2208,6 @@ export default {
2186 2208
       if (this.activeName == 'first') {
2187 2209
         this.getPatientList()
2188 2210
       } else if (this.activeName == 'second') {
2189
-
2190
-
2191
-
2192
-
2193
-
2194
-
2195
-
2196
-
2197
-
2198
-
2199 2211
         const params = {
2200 2212
           'record_date': this.record_date,
2201 2213
           'patient_id': this.patientInfo.id,
@@ -3075,6 +3087,7 @@ export default {
3075 3087
       this.getPatientList()
3076 3088
     },
3077 3089
     changeRadioAndPatient(id) {
3090
+      this.radio = id
3078 3091
       let params = {
3079 3092
         'record_date': this.record_date
3080 3093
       }
@@ -3559,6 +3572,22 @@ export default {
3559 3572
         num = num.substring(0)
3560 3573
       }
3561 3574
       return parseFloat(num).toFixed(decimal)
3575
+    },getMonthChargePatientList(){
3576
+      let params = {
3577
+        'record_date': this.record_date,
3578
+        'start_time':this.other_start_time,
3579
+        'end_time':this.other_end_time,
3580
+      }
3581
+      getChargeHisPatientList(params).then(response => {
3582
+        if (response.data.state == 0) {
3583
+          this.$message.error(response.data.msg)
3584
+          return false
3585
+        } else {
3586
+          this.hisPatientDatas = []
3587
+
3588
+        }
3589
+      })
3590
+
3562 3591
     },
3563 3592
     //患者列表
3564 3593
     getPatientList() {
@@ -4034,6 +4063,9 @@ export default {
4034 4063
         case 9922:
4035 4064
           return '家庭通道' + '处方' + index
4036 4065
           break
4066
+        case 0:
4067
+          return '自费' + '处方' + index
4068
+          break
4037 4069
       }
4038 4070
     }, unique_four(array) {
4039 4071
       // res用来存储结果
@@ -4382,47 +4414,8 @@ export default {
4382 4414
             this.hisPatientInfo = response.data.data.his_info
4383 4415
             this.info = response.data.data.info
4384 4416
             this.order = response.data.data.order
4385
-            this.p_type = ''
4386
-            this.sick_type = ''
4387
-            this.diagnosis = []
4388
-            this.sick_history = ''
4389
-            this.form.diagnosis = []
4390
-            if (this.info.id > 0) {
4391
-              this.form.p_type = response.data.data.info.register_type
4392
-              this.form.sick_type = response.data.data.info.sick_type
4393
-              if (response.data.data.info.diagnosis.length == 0) {
4394
-                this.form.diagnosis = []
4395
-              } else {
4396
-                for (let i = 0; i < response.data.data.info.diagnosis.split(',').length; i++) {
4397
-                  this.form.diagnosis.push(parseInt(response.data.data.info.diagnosis.split(',')[i]))
4398
-                }
4399
-              }
4400
-              this.sick_history = this.info.sick_history
4401
-              if (this.info.register_type == 0) {
4402
-                this.form.p_type = ''
4403
-              }
4404
-
4405
-              if (this.info.sick_type == 0) {
4406
-                this.form.sick_type = ''
4407
-              }
4408
-            } else {
4409
-              this.form.p_type = 14
4410
-              this.form.sick_type = this.sick[0].id
4411
-              if (response.data.data.last_info.diagnoses.length == 0) {
4412
-                this.form.diagnosis = []
4413
-              } else {
4414
-                for (let i = 0; i < response.data.data.last_info.diagnosis.split(',').length; i++) {
4415
-                  this.form.diagnosis.push(parseInt(response.data.data.last_info.diagnosis.split(',')[i]))
4416
-                }
4417
-              }
4418
-
4419
-              this.sick_history = ''
4420
-            }
4421 4417
             this.addtions_charge = response.data.data.addtions_charge
4422 4418
             this.setMonthPrescription(response.data.data.month_prescriptions)
4423
-
4424
-
4425
-
4426 4419
           }
4427 4420
         })
4428 4421
 

+ 1 - 4
src/xt_pages/outpatientCharges/statementPrint.vue Parādīt failu

@@ -12,7 +12,7 @@
12 12
         >
13 13
       </template>
14 14
 
15
-      <div class='dialysisPage' style="padding-top:40px;" v-if="paramsObj.balance_accounts_type != 2">
15
+      <div class='dialysisPage' style="padding-top:40px;">
16 16
         <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504 || org_id == 10028 || org_id == 0 || org_id == 4 || org_id == 10278">
17 17
           <printTwo :info="info" v-if="org_id == 9990"></printTwo>
18 18
           <printThree :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts" v-if="org_id == 10138 || org_id == 0 || org_id == 4 || org_id == 10278"></printThree>
@@ -21,9 +21,6 @@
21 21
         <printOne :info="info" v-else></printOne>
22 22
       </div>
23 23
 
24
-    <div class='dialysisPage' style="padding-top:40px;" v-else>
25
-      <print-six :info="info" ></print-six>
26
-    </div>
27 24
   </div>
28 25
 </template>
29 26
 

+ 4 - 0
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Parādīt failu

@@ -536,6 +536,10 @@
536 536
           { value: 1111, label: '精一' },
537 537
           { value: 1112, label: '精二' },
538 538
           { value: 9922, label: '家庭通道' },
539
+          { value: 9933, label: '门诊特殊病(9933)' },
540
+          { value: 990602, label: '门诊特殊病(990602)' },
541
+          { value: 1402, label: '门诊特殊病(1402)' },
542
+          { value: 0, label: '自费' }
539 543
 
540 544
 
541 545