XMLWAN 4 år sedan
förälder
incheckning
c46571a676

+ 4 - 3
src/xt_pages/data/prescription.vue Visa fil

237
                   </el-col>
237
                   </el-col>
238
 
238
 
239
 
239
 
240
-                  <el-col :span="8">
240
+                  <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 3877">
241
                     <el-form-item label="透析器:">
241
                     <el-form-item label="透析器:">
242
                       <el-input
242
                       <el-input
243
                         v-model="dialysis_dialyszers" @focus="showInnerDialog('6')"></el-input>
243
                         v-model="dialysis_dialyszers" @focus="showInnerDialog('6')"></el-input>
244
                     </el-form-item>
244
                     </el-form-item>
245
                   </el-col>
245
                   </el-col>
246
 
246
 
247
-                  <el-col :span="8">
247
+                  <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 3877">
248
                     <el-form-item label="灌流器:">
248
                     <el-form-item label="灌流器:">
249
                       <el-input
249
                       <el-input
250
                         v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>
250
                         v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>
1175
     )
1175
     )
1176
     this.getAllSystemPrescription();
1176
     this.getAllSystemPrescription();
1177
     this.getSystemPrescription(this.addPlan.mode);
1177
     this.getSystemPrescription(this.addPlan.mode);
1178
-
1178
+    
1179
+   
1179
   },
1180
   },
1180
   watch: {
1181
   watch: {
1181
     "addPlan.dialysis_duration": function() {
1182
     "addPlan.dialysis_duration": function() {

+ 6 - 1
src/xt_pages/dialysis/PatientBox.vue Visa fil

57
         <p>目标超滤量:{{ schedule.prescription ? schedule.prescription.target_ultrafiltration : '' }}
57
         <p>目标超滤量:{{ schedule.prescription ? schedule.prescription.target_ultrafiltration : '' }}
58
        
58
        
59
         </p>
59
         </p>
60
-        <p :title="schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : ''">透析器/灌流器:{{ schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : '' }}</p>
60
+        <p :title="schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : ''">
61
+          透析器/灌流器:{{ schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : '' }}
62
+           <span v-if="schedule.prescription!=null">{{schedule.prescription?schedule.prescription.dialysis_dialyszers:''}}</span>
63
+           <span v-if="schedule.prescription!=null && schedule.prescription.dialysis_irrigation!=''">/</span>
64
+           <span v-if="schedule.prescription!=null">{{schedule.prescription?schedule.prescription.dialysis_irrigation:''}}</span>
65
+        </p>
61
       </div>
66
       </div>
62
       <div class="function" :class="functionColor(schedule)" :id="modeColor(schedule.mode_id)">
67
       <div class="function" :class="functionColor(schedule)" :id="modeColor(schedule.mode_id)">
63
         <ul>
68
         <ul>

+ 3 - 2
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Visa fil

3493
         }
3493
         }
3494
       },
3494
       },
3495
       stockType:function(){
3495
       stockType:function(){
3496
-
3496
+        console.log("stockType",this.stockType)
3497
         var arr = []
3497
         var arr = []
3498
         var arrTwo = []
3498
         var arrTwo = []
3499
         for(let i=0;i<this.stockType.length;i++){
3499
         for(let i=0;i<this.stockType.length;i++){
3519
            }
3519
            }
3520
         }
3520
         }
3521
         this.irrigations = irrigation
3521
         this.irrigations = irrigation
3522
-
3522
+        console.log("透析器",this.dialyzers)
3523
+        console.log("灌流器",this.irrigations)
3523
       }
3524
       }
3524
     }
3525
     }
3525
   }
3526
   }

+ 11 - 1
src/xt_pages/dialysis/dialysisDoctorAdvice.vue Visa fil

114
         <el-table-column prop="date" label="透析器" align="center" min-width="26px">
114
         <el-table-column prop="date" label="透析器" align="center" min-width="26px">
115
           <template slot-scope="scope">
115
           <template slot-scope="scope">
116
             <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
116
             <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
117
+            <span v-if="scope.row.dialysis_dialyszers!=''">{{scope.row.dialysis_dialyszers}}</span>
118
+            <span v-if="scope.row.dialysis_irrigation!=''">{{scope.row.dialysis_irrigation}}</span>
117
           </template>
119
           </template>
118
         </el-table-column>
120
         </el-table-column>
119
         <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
121
         <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
234
         </el-table-column>
236
         </el-table-column>
235
         <el-table-column prop="date" label="透析器" align="center" min-width="26px">
237
         <el-table-column prop="date" label="透析器" align="center" min-width="26px">
236
           <template slot-scope="scope">
238
           <template slot-scope="scope">
237
-            <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
239
+            <span>
240
+              {{ scope.row.dialyzer_perfusion_apparatus }}
241
+              <span v-if="scope.row.dialysis_dialyszers!=''">{{scope.row.dialysis_dialyszers}}</span>
242
+              <span v-if="scope.row.dialysis_irrigation!=''">{{scope.row.dialysis_irrigation}}</span>
243
+            </span>
238
           </template>
244
           </template>
239
         </el-table-column>
245
         </el-table-column>
240
         <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
246
         <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
496
                 it.name = item.patient.name
502
                 it.name = item.patient.name
497
                     if(item.prescription != null){
503
                     if(item.prescription != null){
498
                        it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
504
                        it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
505
+                       it.dialysis_dialyszers = item.prescription.dialysis_dialyszers
506
+                       it.dialysis_irrigation = item.prescription.dialysis_irrigation
499
                     }
507
                     }
500
                     it.schedule_type = item.schedule_type
508
                     it.schedule_type = item.schedule_type
501
                     it.zoneId = item.device_number.zone.id
509
                     it.zoneId = item.device_number.zone.id
554
                 it.name = item.patient.name
562
                 it.name = item.patient.name
555
                     if(item.prescription != null){
563
                     if(item.prescription != null){
556
                        it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
564
                        it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
565
+                       it.dialysis_dialyszers = item.prescription.dialysis_dialyszers
566
+                       it.dialysis_irrigation = item.prescription.dialysis_irrigation
557
                     }
567
                     }
558
                     it.schedule_type = item.schedule_type
568
                     it.schedule_type = item.schedule_type
559
                     it.zoneId = item.device_number.zone.id
569
                     it.zoneId = item.device_number.zone.id

+ 4 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue Visa fil

509
                     <td width="140">透析器/灌流器型号:</td>
509
                     <td width="140">透析器/灌流器型号:</td>
510
                     <td width="">
510
                     <td width="">
511
                       <div class="under-line">
511
                       <div class="under-line">
512
-                          <span v-if="org_id ==9987 || org_id== 3877 || org_id == 4 || org_id == 9671">{{prescription.dialysis_dialyszers}}/{{prescription.dialysis_irrigation}}</span>
512
+                          <span v-if="org_id ==9987 || org_id== 3877 || org_id == 4 || org_id == 9671">
513
+                            <span>{{prescription.dialysis_dialyszers}}</span>
514
+                            <span v-if="prescription.dialysis_irrigation!=''">/{{prescription.dialysis_irrigation}}</span>
515
+                          </span>
513
                         &nbsp;<span else>{{ prescription.dialyzer_perfusion_apparatus }}</span> 
516
                         &nbsp;<span else>{{ prescription.dialyzer_perfusion_apparatus }}</span> 
514
                       </div>
517
                       </div>
515
                     </td>
518
                     </td>

+ 25 - 0
src/xt_pages/stock/stockOutOrderAdd.vue Visa fil

126
               </el-form-item>
126
               </el-form-item>
127
             </template>
127
             </template>
128
           </el-table-column>
128
           </el-table-column>
129
+           <el-table-column min-width="35" align="center">
130
+            <template slot="header" slot-scope="scope">
131
+              <span>耗材名称</span>
132
+            </template>
133
+
134
+            <template slot-scope="scope">
135
+              <el-form-item style="padding-top: 15px">
136
+                <el-input
137
+                  placeholder=""
138
+                  v-model="scope.row.good_id"
139
+                  :value="typeNameOne(scope.row.good_id)"
140
+                ></el-input>
141
+              </el-form-item>
142
+            </template>
143
+          </el-table-column>
144
+          
129
           <el-table-column min-width="35" align="center">
145
           <el-table-column min-width="35" align="center">
130
             <template slot="header" slot-scope="scope">
146
             <template slot="header" slot-scope="scope">
131
               <span>规格名称<span style="color: red">*</span></span>
147
               <span>规格名称<span style="color: red">*</span></span>
447
       }
463
       }
448
       return name;
464
       return name;
449
     },
465
     },
466
+    typeNameOne:function(good_info_id){
467
+       let name = ''
468
+      for (let i = 0; i < this.goodInfo.length; i++) {
469
+        if (this.goodInfo[i].id == good_info_id) {
470
+          name = this.goodInfo[i].good_name
471
+        }
472
+      }
473
+      return name
474
+    },
450
     specificationName: function(good_info_id) {
475
     specificationName: function(good_info_id) {
451
       let name = ''
476
       let name = ''
452
       for (let i = 0; i < this.goodInfo.length; i++) {
477
       for (let i = 0; i < this.goodInfo.length; i++) {

+ 3 - 2
src/xt_pages/workforce/components/nextTableWeeks.vue Visa fil

81
       </el-table-column>
81
       </el-table-column>
82
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
82
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
83
         <template slot-scope="scope">
83
         <template slot-scope="scope">
84
-          {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
85
-          {{scope.row.prescription.dialysis_dialyszers}} / {{scope.row.prescription.dialysis_irrigation}}
84
+          <span > {{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
85
+          {{scope.row.prescription.dialysis_dialyszers}}
86
+          <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{scope.row.prescription.dialysis_irrigation}}</span>
86
         </template>
87
         </template>
87
       </el-table-column>
88
       </el-table-column>
88
       <el-table-column label="抗凝剂" min-width="100" align="center">
89
       <el-table-column label="抗凝剂" min-width="100" align="center">

+ 3 - 2
src/xt_pages/workforce/components/tableWeeks.vue Visa fil

82
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
82
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
83
         <template slot-scope="scope">
83
         <template slot-scope="scope">
84
           {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
84
           {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
85
-
86
-          {{scope.row.prescription.dialysis_dialyszers}}/{{scope.row.prescription.dialysis_irrigation}}
85
+          {{scope.row.prescription.dialysis_dialyszers}}
86
+          <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{scope.row.prescription.dialysis_irrigation}}</span>
87
         </template>
87
         </template>
88
       </el-table-column>
88
       </el-table-column>
89
 
89
 
454
     //   week_type: this.week_type
454
     //   week_type: this.week_type
455
     // };
455
     // };
456
     this.getScheduleWeekDay();
456
     this.getScheduleWeekDay();
457
+    console.log("org2222222",this.$store.getters.xt_user.org.id)
457
   }
458
   }
458
 };
459
 };
459
 </script>
460
 </script>

+ 2 - 1
src/xt_pages/workforce/next_remind_print.vue Visa fil

60
                 </td>
60
                 </td>
61
                 <td :width="td_1_width">
61
                 <td :width="td_1_width">
62
                   {{main_collection.prescription.dialyzer_perfusion_apparatus}}
62
                   {{main_collection.prescription.dialyzer_perfusion_apparatus}}
63
-                  {{main_collection.prescription.dialysis_dialyszers}} / {{main_collection.prescription.dialysis_irrigation}}
63
+                  {{main_collection.prescription.dialysis_dialyszers}} 
64
+                  <span v-if="main_collection.prescription.dialysis_irrigation!=''">/ {{main_collection.prescription.dialysis_irrigation}}</span>
64
 
65
 
65
                 </td>
66
                 </td>
66
                 <td :width="td_1_width">
67
                 <td :width="td_1_width">

+ 2 - 1
src/xt_pages/workforce/remind_print.vue Visa fil

60
                 </td>
60
                 </td>
61
                 <td :width="td_1_width">
61
                 <td :width="td_1_width">
62
                   {{main_collection.prescription.dialyzer_perfusion_apparatus}}
62
                   {{main_collection.prescription.dialyzer_perfusion_apparatus}}
63
-                  {{main_collection.prescription.dialysis_dialyszers}} / {{main_collection.prescription.dialysis_irrigation}}
63
+                  {{main_collection.prescription.dialysis_dialyszers}} 
64
+                  <span v-if="main_collection.prescription.dialysis_irrigation!=''">/ {{main_collection.prescription.dialysis_irrigation}}</span>
64
 
65
 
65
                 </td>
66
                 </td>
66
                 <td :width="td_1_width">
67
                 <td :width="td_1_width">