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

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -50,16 +50,16 @@
             </el-form-item>
 
 
-            <!--<el-form-item label="医疗类别：" prop="medical_care">-->
-                <!--<el-select v-model="form.medical_care"  placeholder="请选择" style="width:100%;">-->
-                    <!--<el-option-->
-                            <!--v-for="(item,index) in medical_care"-->
-                            <!--:key="index"-->
-                            <!--:label="item.label"-->
-                            <!--:value="item.value">-->
-                    <!--</el-option>-->
-                <!--</el-select>-->
-            <!--</el-form-item>-->
+            <el-form-item label="医疗类别：" prop="medical_care">
+                <el-select v-model="form.medical_care"  placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="(item,index) in medical_care"
+                            :key="index"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
 
 
             <el-form-item label="证件类型：" prop="certificates" >
@@ -318,7 +318,7 @@
           birthday: [{required: true, message: "患者出生日期不能为空", trigger: 'blur'}],
           certificates: [{required: true, message: "证件类型不能为空", trigger: 'change'}],
           id_card_type: [{required: true, message: "读卡类型不能为空", trigger: 'change'}],
-          // medical_care: [{required: true, message: "医疗类别不能为空", trigger: 'change'}],
+          medical_care: [{required: true, message: "医疗类别不能为空", trigger: 'change'}],
 
         },
         visibility: false,
@@ -488,6 +488,7 @@
         // this.form.social_type = patientInfo.health_care_type
         this.form.id_card_type = 1
         this.form.certificates = 1
+        this.form.medical_care = 11
 
         // if( this.form.social_type == 0){
         //   this.form.social_type = ""

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -87,7 +87,7 @@
                         >
                             退费
                         </el-button>
-                        <el-button size="small" @click="sz_open(10)" type="primary">打印</el-button>
+                        <el-button size="small" @click="sz_open(10)" v-if="this.radio == 2" type="primary">打印</el-button>
 
                         <el-button size="small" @click="sz_open(11)" type="primary"
                                    v-if="this.hisPatientInfo.id > 0 "
@@ -258,9 +258,9 @@
                                             <!--<span>个人支付：<span style="color:red;">{{ items.curPrescriptions.order.psn_cash_pay?items.curPrescriptions.order.psn_cash_pay:''}}元</span></span>-->
 
 
-                                            <span>医疗费总额：<span style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt ?  items.curMonthPrescriptions.order.medfee_sumamt:getTotalFour(items.month_prescriptions)?getTotalFour(items.month_prescriptions):'' }}元</span></span>
-                                            <span>基金支付金额：<span style="color:red;">{{ items.curPrescriptions.order.fund_pay_sumamt?items.curMonthPrescriptions.order.fund_pay_sumamt:''}}元</span></span>
-                                            <span>个人账户支付金额：<span style="color:red;">{{ items.curPrescriptions.order.acct_pay?items.curMonthPrescriptions.order.acct_pay:''}}元</span></span>
+                                            <span>医疗费总额：<span style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt ?  items.curPrescriptions.order.medfee_sumamt:getTotalFour(items.prescriptions)?getTotalFour(items.prescriptions):'' }}元</span></span>
+                                            <span>基金支付金额：<span style="color:red;">{{ items.curPrescriptions.order.fund_pay_sumamt?items.curPrescriptions.order.fund_pay_sumamt:''}}元</span></span>
+                                            <span>个人账户支付金额：<span style="color:red;">{{ items.curPrescriptions.order.acct_pay?items.curPrescriptions.order.acct_pay:''}}元</span></span>
                                             <span>个人支付金额：<span style="color:red;">{{ items.curPrescriptions.order.psn_cash_pay?items.curPrescriptions.order.psn_cash_pay:''}}元</span></span>
                                             <span>个人账户金额：<span style="color:red;">{{ items.curPrescriptions.order.account_price?items.curPrescriptions.order.account_price:''}}元</span></span>
 

src/xt_pages/outpatientRegistration/index.vue

@@ -136,16 +136,16 @@
                         </el-select>
                     </el-form-item>
 
-                    <!--<el-form-item label="医疗类别：" :validate-event="is_Name" prop="medicalCare">-->
-                        <!--<el-select v-model="form.medicalCare" placeholder="请选择">-->
-                            <!--<el-option-->
-                                    <!--v-for="(item,index) in medical_care"-->
-                                    <!--:key="index"-->
-                                    <!--:label="item.label"-->
-                                    <!--:value="item.value">-->
-                            <!--</el-option>-->
-                        <!--</el-select>-->
-                    <!--</el-form-item>-->
+                    <el-form-item label="医疗类别：" :validate-event="is_Name" prop="medicalCare">
+                        <el-select v-model="form.medicalCare" placeholder="请选择">
+                            <el-option
+                                    v-for="(item,index) in medical_care"
+                                    :key="index"
+                                    :label="item.label"
+                                    :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
 
                     <el-form-item label="医生：" prop="doctor" :validate-event="is_Name">
                         <el-select v-model="form.doctor" placeholder="请选择" @change="changeDoctor">
@@ -1502,6 +1502,7 @@
       if(this.$store.getters.xt_user.org_id == 9504 ||  this.$store.getters.xt_user.org_id == 10028 ||  this.$store.getters.xt_user.org_id == 10138){
         this.form.certificates = 2;
         this.form.id_card_type = 1
+        this.form.medicalCare = 11
       }else{
         this.form.settlementValue = 1;
         this.form.registrationFee = 0;