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

@@ -132,14 +132,18 @@
                                                             >预结算
                                                             </el-button>
                                                             <el-button
-                                                                    v-if="items.prescriptions[0].order.order_status = 1 && this.hisPatientInfo.balance_accounts_type != 2"
+                                                                    v-if="items.prescriptions[0].order.order_status = 1 && hisPatientInfo.balance_accounts_type != 2"
                                                                     size="small" @click="open(11)" type="primary"
                                                             >撤销明细
                                                             </el-button>
+                                                            <div>{{ items.curPrescriptions.order.order_status}}</div>
+                                                            <div>{{ items.prescriptions[0].order.order_status}}</div>
+
+
                                                             <el-button v-loading="loadingtwo"
-                                                                       v-if="(hisPatientInfo.id > 0 && items.prescriptions[0].order.id == 0) || items.prescriptions[0].order.order_status == 1 ||  items.prescriptions[0].order.order_status == 3"
+                                                                       v-if="(hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3"
                                                                        size="small"
-                                                                       @click="open(4,items.med_type,items.prescriptions[0].order,items.prescriptions)"
+                                                                       @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions)"
                                                                        type="primary">收费
                                                             </el-button>
                                                         </div>
@@ -294,11 +298,11 @@
                                                                     type="primary"
                                                             >预结算
                                                             </el-button>
-                                                            <el-button
-                                                                    v-if="items.curMonthPrescriptions.order.order_status == 1 && this.hisPatientInfo.balance_accounts_type != 2"
-                                                                    size="small" @click="open(11)" type="primary"
-                                                            >撤销明细
-                                                            </el-button>
+                                                            <!--<el-button-->
+                                                                    <!--v-if="items.curMonthPrescriptions.order.order_status == 1"-->
+                                                                    <!--size="small" @click="open(11)" type="primary"-->
+                                                            <!--&gt;撤销明细-->
+                                                            <!--</el-button>-->
 
                                                             <el-button v-loading="loadingtwo"
                                                                        v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) || items.curMonthPrescriptions.order.order_status == 1 ||  items.curMonthPrescriptions.order.order_status == 3"
@@ -416,7 +420,7 @@
                 width="30%"
         >
             <span>是否修改医疗类型</span>
-            <el-select style="width:50%;" v-model="temp_med_type" placeholder="医疗类型" v-else @change="changevalue">
+            <el-select style="width:50%;" v-model="temp_med_type" placeholder="医疗类型"  @change="changevalue">
                 <el-option
                         v-for="(item,index) in register"
                         :key="index"
@@ -3407,7 +3411,8 @@
             this.editableTabsValue = this.getPName(this.big_prescriptions[0].med_type, 1)
           }
 
-          // console.log(this.big_prescriptions)
+          console.log(this.big_prescriptions)
+          console.log(this.big_prescriptions[0].curPrescriptions.order_status)
 
           //
           // if (this.prescriptions.length > 0) {