Browse Source

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

see999 3 years ago
parent
commit
4effd23043

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue View File

1073
         this.check = response.data.data.check
1073
         this.check = response.data.data.check
1074
         this.xtdate = response.data.data.xtdate
1074
         this.xtdate = response.data.data.xtdate
1075
         this.predialysis = response.data.data.PredialysisEvaluation
1075
         this.predialysis = response.data.data.PredialysisEvaluation
1076
-        console.log("透前评估",this.predialysis)
1076
+        // console.log("透前评估",this.predialysis)
1077
         this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
1077
         this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
1078
           this.predialysis.blood_access_part_opera_id
1078
           this.predialysis.blood_access_part_opera_id
1079
         )
1079
         )

+ 2 - 2
src/xt_pages/workforce/components/tableWeeks.vue View File

219
             </el-table-column>
219
             </el-table-column>
220
             <el-table-column label="透析器/灌流器" min-width="100" align="center">
220
             <el-table-column label="透析器/灌流器" min-width="100" align="center">
221
                 <template slot-scope="scope">
221
                 <template slot-scope="scope">
222
-          <span v-if="org_id!=9987&&org_id!=10131&&org_id!=10215">
222
+          <span v-if="org_id!=9987&&org_id!=10131&&org_id!=10215 &&org_id!=10233 ">
223
              <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">
223
              <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">
224
                 <span>{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
224
                 <span>{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
225
           </span>
225
           </span>
226
 
226
 
227
           <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.id > 0 ">{{getDialysisDialyszerPerfusion(scope.row.patient_id)}}</span>
227
           <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.id > 0 ">{{getDialysisDialyszerPerfusion(scope.row.patient_id)}}</span>
228
           </span>
228
           </span>
229
-                    <span v-if="org_id==10131 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id,scope.row.mode_id,scope.row.solution)}}</span>
229
+                    <span v-if="org_id==10131 || org_id == 10215 || org_id == 10233">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id,scope.row.mode_id,scope.row.solution)}}</span>
230
                     {{scope.row.prescription.dialysis_dialyszers}}
230
                     {{scope.row.prescription.dialysis_dialyszers}}
231
                     <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
231
                     <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
232
                     <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>
232
                     <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>

+ 2 - 2
src/xt_pages/workforce/remind_print.vue View File

63
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
63
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
64
                   <span v-if="org_id!=9987">
64
                   <span v-if="org_id!=9987">
65
                      <span > 
65
                      <span > 
66
-                       <span v-if="org_id!=10131 && org_id!=10215 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
66
+                       <span v-if="org_id!=10131 && org_id!=10215 && org_id!=10233 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
67
                      
67
                      
68
-                       <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(main_collection.patient_id,main_collection.mode_id,main_collection.solution)}}</span>
68
+                       <span v-if="org_id==10131 || org_id==9671 || org_id == 10215 || org_id == 10233">{{getDialysisDialyszerPerfusionOne(main_collection.patient_id,main_collection.mode_id,main_collection.solution)}}</span>
69
                       </span>
69
                       </span>
70
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
70
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
71
                   </span>
71
                   </span>