批量打印

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -13,7 +13,7 @@
           </div>
           <div class="infoMain">
               <div style="margin-bottom: 10px;">门诊号：{{hisPatient.number?hisPatient.number:""}}</div>
-              <div style="margin-bottom: 10px;">科室：{{getDepart(hisPatient.departments)?getDepart(hisPatient.departments):''}}</div>
+              <div style="margin-bottom: 10px;">科室：{{getDepart(item.info.departments)?getDepart(item.info.departments):''}}</div>
               <div style="margin-bottom: 10px;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div>
               <div style="margin-bottom: 10px;">电话：{{item.patient.phone}}</div>
               <div>地址：{{item.patient.home_address}}</div>
@@ -23,7 +23,7 @@
               <div class="Rp">Rp:</div>
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
                   <div class="drugsOne">{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
-                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
+                  <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;{{it.day}}天</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -104,8 +104,8 @@
                     <template slot-scope="scope">
                       <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.is_return == 2" :disabled="true">已退号</el-button>
-                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 3" >已就诊</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>
                     </template>
                 </el-table-column>
@@ -250,7 +250,7 @@ export default {
             ],
             start_time:moment().format("YYYY-MM-DD"),
             end_time:moment().format("YYYY-MM-DD"),
-            limit:20,
+            limit:10,
             page:1,
             total:0,
             departMent:[],
@@ -352,7 +352,8 @@ export default {
             startUnix:'',
 
             dialogVisible:false,
-            form:{}
+            form:{},
+            is_Name:false
         }
     },
     created(){
@@ -410,11 +411,11 @@ export default {
         },
        handleSizeChange(val) {
           this.limit = val
-          this.getList()
+          this.getlist()
        },
         handleCurrentChange(val) {
         this.page = val
-        this.getList()
+        this.getlist()
         },
         getlist(){
           var params = {