浏览代码

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

csx 3 年前
父节点
当前提交
4ca89a3c6f
共有 1 个文件被更改,包括 15 次插入10 次删除
  1. 15 10
      src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

+ 15 - 10
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue 查看文件

132
                                                             >预结算
132
                                                             >预结算
133
                                                             </el-button>
133
                                                             </el-button>
134
                                                             <el-button
134
                                                             <el-button
135
-                                                                    v-if="items.prescriptions[0].order.order_status = 1 && this.hisPatientInfo.balance_accounts_type != 2"
135
+                                                                    v-if="items.prescriptions[0].order.order_status = 1 && hisPatientInfo.balance_accounts_type != 2"
136
                                                                     size="small" @click="open(11)" type="primary"
136
                                                                     size="small" @click="open(11)" type="primary"
137
                                                             >撤销明细
137
                                                             >撤销明细
138
                                                             </el-button>
138
                                                             </el-button>
139
+                                                            <div>{{ items.curPrescriptions.order.order_status}}</div>
140
+                                                            <div>{{ items.prescriptions[0].order.order_status}}</div>
141
+
142
+
139
                                                             <el-button v-loading="loadingtwo"
143
                                                             <el-button v-loading="loadingtwo"
140
-                                                                       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"
144
+                                                                       v-if="(hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3"
141
                                                                        size="small"
145
                                                                        size="small"
142
-                                                                       @click="open(4,items.med_type,items.prescriptions[0].order,items.prescriptions)"
146
+                                                                       @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions)"
143
                                                                        type="primary">收费
147
                                                                        type="primary">收费
144
                                                             </el-button>
148
                                                             </el-button>
145
                                                         </div>
149
                                                         </div>
294
                                                                     type="primary"
298
                                                                     type="primary"
295
                                                             >预结算
299
                                                             >预结算
296
                                                             </el-button>
300
                                                             </el-button>
297
-                                                            <el-button
298
-                                                                    v-if="items.curMonthPrescriptions.order.order_status == 1 && this.hisPatientInfo.balance_accounts_type != 2"
299
-                                                                    size="small" @click="open(11)" type="primary"
300
-                                                            >撤销明细
301
-                                                            </el-button>
301
+                                                            <!--<el-button-->
302
+                                                                    <!--v-if="items.curMonthPrescriptions.order.order_status == 1"-->
303
+                                                                    <!--size="small" @click="open(11)" type="primary"-->
304
+                                                            <!--&gt;撤销明细-->
305
+                                                            <!--</el-button>-->
302
 
306
 
303
                                                             <el-button v-loading="loadingtwo"
307
                                                             <el-button v-loading="loadingtwo"
304
                                                                        v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) || items.curMonthPrescriptions.order.order_status == 1 ||  items.curMonthPrescriptions.order.order_status == 3"
308
                                                                        v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) || items.curMonthPrescriptions.order.order_status == 1 ||  items.curMonthPrescriptions.order.order_status == 3"
416
                 width="30%"
420
                 width="30%"
417
         >
421
         >
418
             <span>是否修改医疗类型</span>
422
             <span>是否修改医疗类型</span>
419
-            <el-select style="width:50%;" v-model="temp_med_type" placeholder="医疗类型" v-else @change="changevalue">
423
+            <el-select style="width:50%;" v-model="temp_med_type" placeholder="医疗类型"  @change="changevalue">
420
                 <el-option
424
                 <el-option
421
                         v-for="(item,index) in register"
425
                         v-for="(item,index) in register"
422
                         :key="index"
426
                         :key="index"
3407
             this.editableTabsValue = this.getPName(this.big_prescriptions[0].med_type, 1)
3411
             this.editableTabsValue = this.getPName(this.big_prescriptions[0].med_type, 1)
3408
           }
3412
           }
3409
 
3413
 
3410
-          // console.log(this.big_prescriptions)
3414
+          console.log(this.big_prescriptions)
3415
+          console.log(this.big_prescriptions[0].curPrescriptions.order_status)
3411
 
3416
 
3412
           //
3417
           //
3413
           // if (this.prescriptions.length > 0) {
3418
           // if (this.prescriptions.length > 0) {