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/details/assessmentAfter.vue

         <li v-if="isShow('实际置换量')">
           <label>实际置换量 : </label>
           <span class="content">{{ actual_displacement }}</span>
-          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id != 13">ml</span>
+          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id != 13 || this.$store.getters.xt_user.template_info.template_id == 40">ml</span>
           <span class="unit" v-else>L</span>
         </li>
         <li v-if="isShow('压迫后内瘘震颤')">

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

         <el-row :gutter="20"> -->
 
         <el-col :span="8" v-if="isShow('实际置换量')">
-          <el-form-item v-if="this.template_id == 20 || this.template_id == 21" label="实际置换量(ml): ">
+          <el-form-item v-if="this.template_id == 20 || this.template_id == 21 || this.template_id == 40" label="实际置换量(ml): ">
             <el-input v-model="form.actual_displacement"></el-input>
           </el-form-item>
           <el-form-item v-else label="实际置换量(L): ">

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

           </el-col>
 
           <el-col :span="8" v-if="anticoagulant.shouji != -1 && isShows('首剂')">
-
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id != 10157' :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
-              <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
-                        v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
-              <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
-                        v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
-            </el-form-item>
-
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10157' :label="'首剂(mg) : '">
-              <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
-                        v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
-              <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
-                        v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
-            </el-form-item>
+            <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
+              <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987 ' :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
+                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                          v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
+                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                          v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
+              </el-form-item>
+
+              <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987' :label="'首剂(mg) : '">
+                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                          v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
+                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                          v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
+              </el-form-item>
+            </div>
+            <div v-else>
+              <el-form-item :label="'首剂(mg) : '">
+                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                          v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
+                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                          v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
+              </el-form-item>
+            </div>
+            
           </el-col>
 
 
           <el-col :span="8" v-if="anticoagulant.weichi != -1 && isShows('维持')">
-            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id != 10157">
-              <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
-                        v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
-              <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
-                        v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
-            </el-form-item>
-            <el-form-item :label="'维持(mg/h) : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10157">
-              <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
-                        v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
-              <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
-                        v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
-            </el-form-item>
+              <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
+                <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987">
+                  <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                            v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
+                  <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                            v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
+                </el-form-item>
+                <el-form-item :label="'维持(mg/h) : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987">
+                  <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                            v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
+                  <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                            v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
+                </el-form-item>
+              </div>
+              <div v-else>
+                <el-form-item :label="'维持(mg/h) : '">
+                  <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                            v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
+                  <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                            v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
+                </el-form-item>
+              </div>
+            
           </el-col>
 
           <el-col :span="8" v-if="anticoagulant.zongliang != -1 && isShows('总量')">
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id != 10157' :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
-              <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
-                        v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
-              <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
-                        v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
-            </el-form-item>
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10157' :label="'总量(mg) : '">
-              <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
-                        v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
-              <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
-                        v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
-            </el-form-item>
+            <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
+              <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987' :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
+                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                          v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
+                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                          v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
+              </el-form-item>
+              <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987' :label="'总量(mg) : '">
+                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                          v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
+                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                          v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
+              </el-form-item>
+            </div>
+            <div v-else>
+              <el-form-item :label="'总量(mg) : '">
+                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
+                          v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
+                <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
+                          v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
+              </el-form-item>
+            </div>
+            
           </el-col>
 
 
       },
       show(pre,schedual,last,his_is_open) {
         console.log("pre222222",pre)
-       
+        if(pre!=undefined){
+          if(pre.oxygen_uptake == 1){
+             this.oxygenShow = true
+          }
+        if(pre.oxygen_uptake == 2){
+            this.oxygenShow = false
+            this.prescription.oxygen_flow = ""
+            this.prescription.oxygen_time = ""
+         }
+        }
         if(his_is_open == 1){
           this.is_open = 0
         }
         if (pre.anticoagulant == 3) {
           this.dialysisPrescription.anticoagulant = '低分子肝素'
         }
+
         // 入口
         var pre = pre
         this.dialysisPrescription.mode_id = this.$route.query.mode_id

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

             </table>
 
 
+           <table class="table-box">
+              <tbody>
+              <tr>
+                <td width="50">吸氧:</td>
+                <td width="10">需</td>
+                <td width="40">
+                  <label-box :isChecked="prescription.oxygen_uptake == 1 ? true : false"></label-box>
+                  &nbsp;
+                </td>
+                <td width="50">流量:</td>
+                <td width="40">
+                    <div class="under-line">
+                        &nbsp;{{ prescription.oxygen_flow ? prescription.oxygen_flow : "" }}
+                    </div>
+                </td>
+                <td width="30">L/分</td>
+                <td width="50">
+                  <div class="under-line">
+                    &nbsp;{{ prescription.oxygen_time ? prescription.oxygen_time : "" }}
+                  </div>
+                </td>
+                <td width="30">h</td>
+                <td width="10">无</td>
+                <td width="30">
+                  <label-box :isChecked="prescription.oxygen_uptake ==2 ? true : false"></label-box>
+                  &nbsp;
+                </td>
+                <td></td>
+                <td></td>
+              </tr>
+              </tbody>
+            </table>
+
+
             <!-- <table class="table-box">
               <tbody>
                 <tr>

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFour.vue

                         </div>
                     </div>
                 </div>
+                
                 <div class="row" style="padding: 2px 0;line-height:23px;">
                   <div class="inline_block" style="flex:1;">
                     置换方式：

src/xt_pages/user/dialysisSolution.vue

          </el-col>
 
 
-        <el-col :span="8" v-if="isShows('血浆分离器')">
-             <el-form-item label="血浆分离器:">
-               <el-input v-model="addPlan.bilirubin_adsorption_column" @focus="showInnerDialog('9')"></el-input>
+          <el-col :span="8" v-if="isShows('吸氧')">
+              <el-form-item label="吸氧：">
+                <el-select v-model="addPlan.oxygen_uptake" placeholder="请选择" @change="changeOxygenList">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <el-option
+                  v-for="(item, index) in  oxygenList "
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          
+           <el-col :span="8" v-if="isShows('吸氧') && oxygenShow == true">
+             <el-form-item label="吸氧流量(L/分)：">
+                <el-input v-model="addPlan.oxygen_flow"></el-input>
              </el-form-item>
-         </el-col>
+          </el-col>
+         
+         <el-col :span="8" v-if="isShows('吸氧') && oxygenShow == true">
+             <el-form-item label="吸氧时长(h）：">
+                <el-input v-model="addPlan.oxygen_time"></el-input>
+             </el-form-item>
+          </el-col>
 
           <el-col :span="8" v-if="isShows('目标KT/V')">
             <el-form-item label="目标KT/V">
           </el-col>
         </el-row>
 
-
+    
     
 
 
         dialysis_irrigation:'',
         plasma_separator:"",
         bilirubin_adsorption_column:"",
+        oxygen_uptake:"",
+        oxygen_flow:"",
+        oxygen_time:"",
+
       },
       childPlan: {
         mode: '',
      dialysis_irrigation:"",
      plasmaSeparatorList:[],
      bilirubinAdsorptionColumn:[],
+     oxygenList:[
+      {id:1,name:"需"},
+      {id:2,name:"无"}
+     ],
+     oxygenShow:false,
     }
   },
   watch: {
       this.addPlan.dialysis_dialyszers = row.dialysis_dialyszers
       this.dialysis_irrigation = row.dialysis_irrigation
       this.dialysis_dialyszers = row.dialysis_dialyszers
+      this.addPlan.oxygen_uptake = row.oxygen_uptake
+      if(row.oxygen_uptake == 1){
+        this.oxygenShow = true
+      }
+      if(row.oxygen_uptake == 2){
+        this.oxygenShow = false
+      }
+      this.addPlan.oxygen_flow = row.oxygen_flow
+      this.addPlan.oxygen_time = row.oxygen_time
      if(row.body_fluid == 0){
        this.addPlan.body_fluid = ""
       }else{
               ultrafiltration: '',
               blood_access: '',
               plasma_separator:"",
+              oxygen_time:"",
+              oxygen_uptake:"",
+              oxygen_flow:"",
             }
 
             for (const key in tempAddPlan) {
         }
       }
       return name
-    }
+    },
+    changeOxygenList(val){
+      if(val == 1){
+       this.oxygenShow = true
+     }
+    if(val == 2){
+      this.oxygenShow = false
+      this.addPlan.oxygen_flow = ""
+      this.addPlan.oxygen_time = ""
+     }
+    },
   },
   created() {
     const id = this.$route.params && this.$route.params.id