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/outpatientChargesManagement.vue

@@ -294,7 +294,6 @@
 
                                                 <span>个人账户金额：<span style="color:red;">{{ items.curPrescriptions.order.account_price?items.curPrescriptions.order.account_price:''}}元</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>
@@ -302,7 +301,6 @@
                                         </div>
                                     </div>
 
-
                                 </div>
                                 <div class="centerRight">
                                     <p class="centerRightTitle" style="padding-top: 10px;"
@@ -621,7 +619,7 @@
                                         <!--<li style="width:100%;" v-if="activeName == 'second'">总费用：{{ getTotalTwo() }}-->
                                         <!--</li>-->
 
-                                        <li style="width:100%;">判断结果：{{info.diagnosis}}</li>
+                                        <li style="width:100%;">判断结果：{{GetDiagnosisName(info.diagnosis)}}</li>
                                         <!--<li style="width:100%;">是否有传染病：</li>-->
                                         <!--<li style="width:100%;">血压：</li>-->
                                     </ul>
@@ -947,6 +945,11 @@
       changevalue(val) {
         this.$forceUpdate()
 
+      },  GetDiagnosisName(ids){
+
+
+
+
       },
       query() {
         if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
@@ -4673,10 +4676,11 @@
               var that = this
               axios.get('http://127.0.0.1:9532/sz/api/detail/cancel', {
                 params: {
-                  order_id: this.order.id,
+                  order_id: order.id,
                   record_time: this.record_date,
                   admin_user_id: this.$store.getters.xt_user.user.id,
-                  patient_id: this.patientInfo.id
+                  patient_id: this.patientInfo.id,
+                  his_patient_id:this.hisPatientInfo.id,
 
                 }
               })

src/xt_pages/outpatientCharges/summary.vue

@@ -89,6 +89,16 @@
                         <div>{{getMedType(scope.row.med_type)}}</div>
                     </template>
                 </el-table-column>
+
+                <el-table-column align="center" width="90" prop="name" label="收费类型">
+                    <template slot-scope="scope">
+                        <div v-if="scope.row.his_patient.balance_accounts_type != 2">医保</div>
+                        <div v-if="scope.row.his_patient.balance_accounts_type == 2">自费</div>
+                    </template>
+                </el-table-column>
+
+
+
                 <el-table-column align="center" width="100" prop="name" label="收费日期">
                     <template slot-scope="scope">
                         {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}