Merge branch '2022-10-17_vue_schedule_branch' of http://git.shengws.com/csx/Vue_New into 20220812

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -29,6 +29,19 @@
         <el-input type="number" v-model="form.psn_pay" :disabled="true"></el-input>
       </el-form-item>
 
+      <el-form-item class="number_style" label="完全自费：" prop="age" :validate-event="is_Name">
+        <el-input type="number" v-model="form.fulamt_ownpay_amt" :disabled="true"></el-input>
+      </el-form-item>
+
+
+      <el-form-item class="number_style" label="超限价：" prop="age" :validate-event="is_Name">
+        <el-input type="number" v-model="form.overlmt_self_pay" :disabled="true"></el-input>
+      </el-form-item>
+
+      <el-form-item class="number_style" label="个人共济：" prop="age" :validate-event="is_Name">
+        <el-input type="number" v-model="form.acct_mulaid_pay" :disabled="true"></el-input>
+      </el-form-item>
+
 
       <el-form-item label="个人现金支付方式：" style="width:100%;"><!--门诊-->
         <el-checkbox  v-model="form.dec_way" @change="changedecimal">
@@ -142,6 +155,9 @@
           order:null,
           acct_pay:'',
           psn_pay:'',
+          overlmt_self_pay:'',
+          acct_mulaid_pay:'',
+          fulamt_ownpay_amt:'',
         },
         payWays: [
           {value: 1, label: '现金'},
@@ -171,6 +187,9 @@
           fapiao_number:"",
           acct_pay:"",
           psn_pay:"",
+          overlmt_self_pay:"",
+          acct_mulaid_pay:"",
+          fulamt_ownpay_amt:"",
         },
 
       }
@@ -292,6 +311,10 @@
           this.form.pay_price = (this.order.medfee_sumamt).toFixed(2)
           this.form.medical_insurance_price = this.order.fund_pay_sumamt
           this.form.private_price =  this.order.psn_part_amt
+          this.form.overlmt_self_pay = this.order.overlmt_self_pay
+          this.form.acct_mulaid_pay = this.order.acct_mulaid_pay
+          this.form.fulamt_ownpay_amt = this.order.fulamt_ownpay_amt
+
         }
 
         this.visibility = true
@@ -393,6 +416,6 @@ border: 1px solid #66b1ff;
   .el-input__inner{
     font-weight: bolder;
   }
-  
+
 }
 </style>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -177,6 +177,17 @@
           </el-option>
         </el-select>
       </el-form-item>
+
+      <el-form-item label="救助人群类型：" :validate-event="is_Name">
+        <el-select v-model="form.mdtrt_type" placeholder="请选择" style="width:100%;">
+          <el-option
+            v-for="item in mdtrt"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="挂号费：">
         <el-input v-model="form.registration_fee"></el-input>
       </el-form-item>
@@ -274,6 +285,7 @@
           age: '',
           id_card: '',
           register: '',
+          mdtrt_type:'',
           doctor: '',
           id_card_type: 1,
           department: '',
@@ -339,7 +351,20 @@
         }, {
           value: 310,
           label: '职工基本医疗保险'
-        }],
+        }],mdtrt: [{
+            value: "1",
+            label: '新冠肺炎确诊患者'
+          }, {
+            value: "2",
+            label: '其他国家突发公共事件'
+          }, {
+            value: "3",
+            label: '新冠肺炎疑似患者'
+          }, {
+            value: "4",
+            label: '无症状感染者'
+          }
+        ],
         register: [{
           value: 1,
           label: '普通'
@@ -699,6 +724,7 @@
         this.form.medical_insurance_card = ''
         this.form.name = ''
         this.form.gender = ''
+        this.form.mdtrt_type=''
         this.form.medical_care = ''
         this.form.birthda = ''
         this.form.age = ''

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -242,10 +242,6 @@
                             items.curPrescriptions.order.maf_pay ? items.curPrescriptions.order.maf_pay.toFixed(2) : ''
                           }}元</span></span>
 
-                        <!--                        <span>基金支付金额：<span-->
-                        <!--                            style="color:red;">{{-->
-                        <!--                            items.curPrescriptions.order.hifp_pay ? items.curPrescriptions.order.hifp_pay.toFixed(2) : ''-->
-                        <!--                          }}元</span></span>-->
                         <span>个人账户支付金额：<span
                             style="color:red;">{{
                             items.curPrescriptions.order.acct_pay ? items.curPrescriptions.order.acct_pay.toFixed(2) : ''
@@ -264,10 +260,29 @@
                             items.curPrescriptions.order.balc ? items.curPrescriptions.order.balc.toFixed(2) : ''
                           }}元</span></span>
 
+
+                        <span>完全自费：<span
+                          style="color:red;">{{
+                            items.curPrescriptions.order.fulamt_ownpay_amt ? items.curPrescriptions.order.fulamt_ownpay_amt.toFixed(2) : ''
+                          }}元</span></span>
+
+                        <span>超限价：<span
+                          style="color:red;">{{
+                            items.curPrescriptions.order.overlmt_self_pay ? items.curPrescriptions.order.overlmt_self_pay.toFixed(2) : ''
+                          }}元</span></span>
+
+                        <span>个人共济：<span
+                          style="color:red;">{{
+                            items.curPrescriptions.order.acct_mulaid_pay ? items.curPrescriptions.order.acct_mulaid_pay.toFixed(2) : ''
+                          }}元</span></span>
+
                         <span v-if="items.curPrescriptions.order_status  == 1">待结算</span>
                         <span v-if="items.curPrescriptions.order_status  == 2">已结算</span>
                         <span v-if="items.curPrescriptions.order_status  == 3">已退费</span>
+
                       </div>
+
+
                     </div>
                   </div>