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

@@ -3,6 +3,8 @@
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
+
+
         <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
             <div class="mainLeft">
 
@@ -11,7 +13,23 @@
                  <p>已收费：<span  style="color: red">{{cal_two}}</span>人</p>
                  <p>已退费：<span  style="color: red">{{cal_three}}</span>人</p>
                </div> -->
-                <div class="mainCell">
+                <!--<el-date-picker-->
+                        <!--v-model="record_date"-->
+                        <!--prefix-icon="el-icon-date"-->
+                        <!--@change="changeTimeTwo"-->
+                        <!--:editable="false"-->
+                        <!--style="width: 150px;"-->
+                        <!--type="date"-->
+                        <!--:picker-options="pickerOptions"-->
+                        <!--placeholder="选择开始时间"-->
+                        <!--align="right"-->
+                        <!--format="yyyy-MM-dd"-->
+                        <!--value-format="yyyy-MM-dd">-->
+                <!--</el-date-picker>-->
+
+
+
+                <div class="mainCell" style="margin: 10px">
                     <el-radio-group v-model="radio" @change="changeRadio">
                         <!-- <el-radio :label=1>未收费</el-radio>
                         <el-radio :label=2>已收费</el-radio>
@@ -503,11 +521,11 @@
                                                             </el-button>
 
 
-                                                            <!--<el-button-->
-                                                            <!--v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990"-->
-                                                            <!--size="small" @click="open(11)" type="primary"-->
-                                                            <!--&gt;撤销明细-->
-                                                            <!--</el-button>-->
+                                                            <el-button
+                                                            v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990"
+                                                            size="small" @click="open(11)" type="primary"
+                                                            >撤销明细
+                                                            </el-button>
 
                                                         </div>
                                                     </div>
@@ -3706,7 +3724,7 @@
                       }
                       this.all_table_data.push(obj)
 
-                      if(obj.name == "刘伟琼"){
+                      if(obj.name == "许德范"){
                         console.log(obj)
 
                       }
@@ -3845,23 +3863,19 @@
                 }
                 this.all_patient = this.patientTableData
                 break
-
               case 2:
                 this.patientTableData = []
                 for (let i = 0; i < this.all_table_data.length; i++) {
                   if (this.all_table_data[i].order_status == 2) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
-
                 }
                 this.all_patient = this.patientTableData
-
                 break
               case 4:
                 this.patientTableData = []
                 this.patientTableData = this.all_table_data
                 this.all_patient = this.patientTableData
-
                 break
             }
 
@@ -4501,6 +4515,9 @@
 
           }
         })
+      },changeTimeTwo(){
+        this.getPatientList()
+
       },
       sz_open(index, med_type, order, prescriptions) {
         switch (index) {