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/DialysisPrescription.vue

           <span class="content">{{this.prescription.bilirubin_adsorption_column}}</span>
         </li>
 
+        <li v-if="isShow('吸氧')">
+          <label>吸氧:</label>
+          <span class="content">
+            <span v-if="this.prescription.oxygen_uptake == 1">需</span>
+            <span v-if="this.prescription.oxygen_uptake == 2">无</span>
+           </span>
+        </li>
+
+       <li v-if="isShow('吸氧')">
+          <label>吸氧流量(L/分):</label>
+          <span class="content">
+            <span>{{this.prescription.oxygen_flow}}</span>
+           </span>
+        </li>
+       
+        <li v-if="isShow('吸氧')">
+          <label>吸氧时长(h):</label>
+          <span class="content">
+            <span>{{this.prescription.oxygen_time}}</span>
+           </span>
+        </li>
+       
       </ul>
     </div>
     <div style="color:#34495e;margin: 12px 100px 0 100px;">备注: <span style="color:#409eff;">{{ note }}</span></div>

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

                 <el-input v-model="dialysisPrescription.replacement_flow"></el-input>
              </el-form-item>
           </el-col>
-         
 
+          <el-col :span="8" v-if="isShows('吸氧')">
+              <el-form-item label="吸氧：">
+                <el-select v-model="dialysisPrescription.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="dialysisPrescription.oxygen_flow"></el-input>
+             </el-form-item>
+          </el-col>
+         
+         <el-col :span="8" v-if="isShows('吸氧') && oxygenShow == true">
+             <el-form-item label="吸氧时长(h）：">
+                <el-input v-model="dialysisPrescription.oxygen_time"></el-input>
+             </el-form-item>
+          </el-col>
        
         </el-row>
 
           replacement_flow:"",
           plasma_separator:"",
           bilirubin_adsorption_column:"",
+          oxygen_uptake:"",
+          oxygen_flow:"",
+          oxygen_time:"",
         },
 
         anticoagulant: {
         illnessList:[],
         plasmaSeparatorList:[],
         bilirubinAdsorptionColumn:[],
+        oxygenList:[
+         {id:1,name:"需"},
+         {id:2,name:"无"}
+        ],
+        oxygenShow:false,
       }
     },
     methods: {
+      changeOxygenList(val){
+          if(val == 1){
+            this.oxygenShow = true
+          }
+          if(val == 2){
+            this.oxygenShow = false
+            this.prescription.oxygen_flow = ""
+            this.prescription.oxygen_time = ""
+          }
+       },
       changeTime:function(val){
         this.advice_start_time = val
 
       },
       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
         this.irrigations = irrigation
         console.log("透析器",this.dialyzers)
         console.log("灌流器",this.irrigations)
-      }
+      },
     },
     created(){
       

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