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

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -1073,7 +1073,7 @@ export default {
         this.check = response.data.data.check
         this.xtdate = response.data.data.xtdate
         this.predialysis = response.data.data.PredialysisEvaluation
-        console.log("透前评估",this.predialysis)
+        // console.log("透前评估",this.predialysis)
         this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
           this.predialysis.blood_access_part_opera_id
         )

src/xt_pages/workforce/components/tableWeeks.vue

@@ -219,14 +219,14 @@
             </el-table-column>
             <el-table-column label="透析器/灌流器" min-width="100" align="center">
                 <template slot-scope="scope">
-          <span v-if="org_id!=9987&&org_id!=10131&&org_id!=10215">
+          <span v-if="org_id!=9987&&org_id!=10131&&org_id!=10215 &&org_id!=10233 ">
              <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">
                 <span>{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
           </span>
 
           <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.id > 0 ">{{getDialysisDialyszerPerfusion(scope.row.patient_id)}}</span>
           </span>
-                    <span v-if="org_id==10131 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id,scope.row.mode_id,scope.row.solution)}}</span>
+                    <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>
                     {{scope.row.prescription.dialysis_dialyszers}}
                     <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
                     <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>

src/xt_pages/workforce/remind_print.vue

@@ -63,9 +63,9 @@
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
                   <span v-if="org_id!=9987">
                      <span > 
-                       <span v-if="org_id!=10131 && org_id!=10215 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
+                       <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> 
                      
-                       <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>
+                       <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>
                       </span>
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
                   </span>