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

src/api/dialysis.js

 }
 
 export function postSoulution(params) {
-  console.log("params",params)
+  console.log('params', params)
   return request({
     url: '/api/dialysis/soulution',
     method: 'Post',
 }
 
 export function CreateGroupAdvice(id, groupno, advices) {
- 
   return request({
     url: '/api/advice_remind/create?id=' + id + '&groupno=' + groupno,
     method: 'post',

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

           </template>
         </el-table-column>
       </el-table>
+
+
       <el-table
         v-else
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         this.groupSelectRow = row
       }
       ,
-      openDeleteGroupAdvice() {
+      openDeleteGroupAdvice(val) {
+        console.log("val2323233232",this.groupSelectRow)
         if (this.groupSelectRow === null) {
           this.$message.error('未选择要删除的医嘱内容')
           return
         }
+        if(this.groupSelectRow.execution_state == 1){
+           this.$message.error("已执行的医嘱无法删除!")
+           return
+        }
         this.DeleteGroupAdvice(this.groupSelectRow.groupno)
 
         // this.$confirm('确认删除些条医嘱内容?', '删除医嘱内容', {
       ,
 
       openEditGroupAdvice() {
+        console.log("医嘱泪奔23332233223",this.groupSelectRow)
         if (this.groupSelectRow === null) {
           this.$message.error('未选择要修改的医嘱内容')
           return
       cellMouseEnter: function(row, column, event) {
         console.log("数据是",row)
         this.currentRow = row
-        // this.groupSelectRow = row
+        this.groupSelectRow = row
         // this.sameRowArr.forEach((arr, i) => {
         //   if (arr.indexOf(row.index) != -1) {
         //     this.hoverOrderArr = arr

src/xt_pages/user/dialysisSolution.vue

         epo:"",
         epo_count:"",
         max_ultrafiltration_rate:"",
-
+   
       },
       childPlan: {
         mode: '',
       this.addPlan.hemodialysis_machine = row.hemodialysis_machine + ''
       this.addPlan.perfusion_apparatus = row.perfusion_apparatus + ''
       this.addPlan.max_ultrafiltration_rate = row.max_ultrafiltration_rate
+
+      // this.addPlan.oxygen_uptake = row.oxygen_uptake
+      // this.addPlan.hemodialysis_pipelines = row.hemodialysis_pipelines
+      // this.addPlan.hemodialysis_pipelines_count = row.hemodialysis_pipelines_count
+      // this.addPlan.puncture_needle = row.puncture_needle
+      // this.addPlan.puncture_needle_count = row.puncture_needle_count
+      // this.addPlan.epo = row.epo
+      // this.addPlan.epo_count = row.epo_count
       if(row.blood_flow_volume!="" || row.blood_flow_volume!=undefined){
         this.addPlan.blood_flow_volume = row.blood_flow_volume.toString()
       }
     
       this.addPlan.remark = row.remark
 
-      // this.addPlan.hemodialysis_pipelines  = row.hemodialysis_pipelines
+      this.addPlan.hemodialysis_pipelines  = row.hemodialysis_pipelines
 
-      // if(row.hemodialysis_pipelines_count!="" || row.hemodialysis_pipelines_count!=undefined){
-      //   this.addPlan.hemodialysis_pipelines_count  = row.hemodialysis_pipelines_count.toString()
-      // }
+      if(row.hemodialysis_pipelines_count!="" || row.hemodialysis_pipelines_count!=undefined){
+        this.addPlan.hemodialysis_pipelines_count  = row.hemodialysis_pipelines_count.toString()
+      }
      
-      // this.addPlan.puncture_needle  = row.puncture_needle
+      this.addPlan.puncture_needle  = row.puncture_needle
 
-      // if(row.puncture_needle_count!=null || row.puncture_needle_count!=undefined){
-      //   this.addPlan.puncture_needle_count = row.puncture_needle_count.toString()
-      // }
+      if(row.puncture_needle_count!=null || row.puncture_needle_count!=undefined){
+        this.addPlan.puncture_needle_count = row.puncture_needle_count.toString()
+      }
      
-      // this.addPlan.epo  = row.epo
+      this.addPlan.epo  = row.epo
 
-      // if(row.epo_count!="" || row.epo_count!=undefined){
-      //   this.addPlan.epo_count  = row.epo_count.toString()
-      // }
+      if(row.epo_count!="" || row.epo_count!=undefined){
+        this.addPlan.epo_count  = row.epo_count.toString()
+      }
     
       if(row.dialyzer_perfusion_apparatus!="" ||  row.dialyzer_perfusion_apparatus!=undefined){
          this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString()
       this.dialysis_dialyszers = row.dialysis_dialyszers
       this.addPlan.oxygen_uptake = row.oxygen_uptake
       this.addPlan.max_ultrafiltration_rate = row.max_ultrafiltration_rate
+      this.addPlan.oxygen_flow = row.oxygen_flow
+      this.addPlan.oxygen_time = row.oxygen_time
       if(row.oxygen_uptake == 1){
         this.oxygenShow = true
       }