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/allListTemplate/printOne.vue

@@ -1,7 +1,7 @@
 <template>
     <div id="allList-print" class="allList-print">
         <div v-for='(i,index) in pageArr.length' :key="index">
-            <div class="allListTitle">翁源沅胜透析中心费用汇总</div>
+            <div class="allListTitle">{{$store.getters.xt_user.org.org_name}}费用汇总</div>
             <div class="allListInfo">
             <div>患者姓名：{{patient.name}}</div>
             <div>透析号：{{patient.dialysis_no}}</div>
@@ -108,7 +108,7 @@
         }else if(this.list.length > 13){
             this.page = parseInt(this.list.length / 13)
             let num = this.list.length % 13
-            for (var i=0;i<this.page;i++){ 
+            for (var i=0;i<this.page;i++){
                 this.pageArr.push(13)
             }
             if(num != 0){

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

@@ -1,7 +1,7 @@
 <template>
     <div id="list-print" class="list-print">
         <div v-for='(i,index) in pageArr.length' :key="index">
-        <div class="listTitle">翁源沅胜透析中心费用清单</div>
+        <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用清单</div>
         <div class="listInfo">
 
             <div>患者姓名：{{patient.name}}</div>

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -102,8 +102,8 @@
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作" width="180">
                     <template slot-scope="scope">
-                      <el-button size="mini" type="primary" v-if=" scope.row.order.order_status == 0 && scope.row.record_date < startUnix" :disabled="true">已过号</el-button>
-                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 1 && scope.row.record_date >= startUnix && scope.row.order.order_status != 2" @click ="toReturnPatient(scope.row.id)">退号</el-button>
+                      <el-button size="mini" type="primary" v-if=" scope.row.record_date < startUnix" :disabled="true">已过号</el-button>
+                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 1 && scope.row.record_date >= startUnix" @click ="toReturnPatient(scope.row.id)">退号</el-button>
                       <el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 2" :disabled="true">已退号</el-button>
                       <el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 3" :disabled="true">已就诊</el-button>
                       <el-button size="mini" type="primary" @click="open(scope.row)">详情</el-button>