XMLWAN 4 лет назад
Родитель
Сommit
f438511a3b

+ 2 - 2
src/xt_pages/outpatientDoctorStation/template/printOne.vue Просмотреть файл

13
           </div>
13
           </div>
14
           <div class="infoMain">
14
           <div class="infoMain">
15
               <div style="margin-bottom: 10px;">门诊号:{{hisPatient.number?hisPatient.number:""}}</div>
15
               <div style="margin-bottom: 10px;">门诊号:{{hisPatient.number?hisPatient.number:""}}</div>
16
-              <div style="margin-bottom: 10px;">科室:{{getDepart(hisPatient.departments)?getDepart(hisPatient.departments):''}}</div>
16
+              <div style="margin-bottom: 10px;">科室:{{getDepart(item.info.departments)?getDepart(item.info.departments):''}}</div>
17
               <div style="margin-bottom: 10px;">医保卡号:{{item.hisPatient.number?item.hisPatient.number:""}}</div>
17
               <div style="margin-bottom: 10px;">医保卡号:{{item.hisPatient.number?item.hisPatient.number:""}}</div>
18
               <div style="margin-bottom: 10px;">电话:{{item.patient.phone}}</div>
18
               <div style="margin-bottom: 10px;">电话:{{item.patient.phone}}</div>
19
               <div>地址:{{item.patient.home_address}}</div>
19
               <div>地址:{{item.patient.home_address}}</div>
23
               <div class="Rp">Rp:</div>
23
               <div class="Rp">Rp:</div>
24
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
24
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
25
                   <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>
25
                   <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>
26
-                  <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>
26
+                  <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>
27
               </div>
27
               </div>
28
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
28
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
29
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
29
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>

+ 7 - 6
src/xt_pages/outpatientRegistration/registrationHistory.vue Просмотреть файл

104
                     <template slot-scope="scope">
104
                     <template slot-scope="scope">
105
                       <el-button size="mini" type="primary" v-if="scope.row.record_date < startUnix" :disabled="true">已过号</el-button> 
105
                       <el-button size="mini" type="primary" v-if="scope.row.record_date < startUnix" :disabled="true">已过号</el-button> 
106
                       <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> 
106
                       <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> 
107
-                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 2" :disabled="true">已退号</el-button>
108
-                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 3" >已就诊</el-button>  
107
+                      <el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 2" :disabled="true">已退号</el-button>
108
+                      <el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 3" :disabled="true">已就诊</el-button>  
109
                       <el-button size="mini" type="primary" @click="open(scope.row)">详情</el-button>
109
                       <el-button size="mini" type="primary" @click="open(scope.row)">详情</el-button>
110
                     </template>
110
                     </template>
111
                 </el-table-column>
111
                 </el-table-column>
250
             ],
250
             ],
251
             start_time:moment().format("YYYY-MM-DD"),
251
             start_time:moment().format("YYYY-MM-DD"),
252
             end_time:moment().format("YYYY-MM-DD"),
252
             end_time:moment().format("YYYY-MM-DD"),
253
-            limit:20,
253
+            limit:10,
254
             page:1,
254
             page:1,
255
             total:0,
255
             total:0,
256
             departMent:[],
256
             departMent:[],
352
             startUnix:'',
352
             startUnix:'',
353
 
353
 
354
             dialogVisible:false,
354
             dialogVisible:false,
355
-            form:{}
355
+            form:{},
356
+            is_Name:false
356
         }
357
         }
357
     },
358
     },
358
     created(){
359
     created(){
410
         },
411
         },
411
        handleSizeChange(val) {
412
        handleSizeChange(val) {
412
           this.limit = val
413
           this.limit = val
413
-          this.getList()
414
+          this.getlist()
414
        },
415
        },
415
         handleCurrentChange(val) {
416
         handleCurrentChange(val) {
416
         this.page = val
417
         this.page = val
417
-        this.getList()
418
+        this.getlist()
418
         },
419
         },
419
         getlist(){
420
         getlist(){
420
           var params = {
421
           var params = {