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

src/api/config.js

@@ -71,6 +71,7 @@ export function getSystemPrescription(params) {
 
 
 export function postSystemPrescription(params) {
+  console.log("params2222222",params)
   return request({
     url: '/api/systemprescription/commit',
     method: 'post',

src/xt_pages/data/prescription.vue

@@ -231,12 +231,26 @@
 
                   <el-col :span="8">
                     <el-form-item label="透析器/灌流器：">
-
                       <el-input
                         v-model="addPlan.dialyzer_perfusion_apparatus" @focus="showInnerDialog('5')"></el-input>
                     </el-form-item>
                   </el-col>
 
+
+                  <el-col :span="8">
+                    <el-form-item label="透析器：">
+                      <el-input
+                        v-model="dialysis_dialyszers" @focus="showInnerDialog('6')"></el-input>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="8">
+                    <el-form-item label="灌流器：">
+                      <el-input
+                        v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>
+                    </el-form-item>
+                  </el-col>
+
                   <el-col :span="8">
                     <el-form-item label="碳酸氢盐（mmol/L）: " prop="bicarbonate">
                       <el-input v-model="addPlan.bicarbonate"></el-input>
@@ -803,7 +817,9 @@ export default {
         displace_liqui_part: "",
         displace_liqui_value: "",
         ultrafiltration: "",
-        blood_access: ""
+        blood_access: "",
+        dialysis_dialyszers:"",
+        dialysis_irrigation:""
       },
       system_prescription: [],
       isEdit: false,
@@ -831,7 +847,9 @@ export default {
       body_fluid_option: [],
       special_medicine_option: [],
       displace_liqui_part_option: [],
-      blood_access_option: []
+      blood_access_option: [],
+      dialysis_dialyszers:"",
+      dialysis_irrigation:"",
     };
   },
   computed: {},
@@ -845,6 +863,28 @@ export default {
           this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
           this.InnerDialogProps.selected = this.addPlan.dialyzer_perfusion_apparatus
           this.InnerDialogProps.isShowTextArea = false
+          break
+         case '6':
+           for(let i=0;i<this.dialyzers.length;i++){
+               this.dialyzers[i].name = this.dialyzers[i].specification_name
+           }
+          this.InnerDialogProps.values = this.dialyzers
+          this.InnerDialogProps.titles = '透析器'
+          this.InnerDialogProps.type = 'dialyzers'
+          this.InnerDialogProps.selected = this.dialysis_dialyszers
+          this.InnerDialogProps.isShowTextArea = false
+        
+          break
+        case '7':
+          for(let i=0;i<this.irrigations.length;i++){
+             this.irrigations[i].name = this.irrigations[i].specification_name
+           }
+          this.InnerDialogProps.values = this.irrigations
+          this.InnerDialogProps.titles = '灌流器'
+          this.InnerDialogProps.type = 'irrigations'
+          this.InnerDialogProps.selected = this.dialysis_irrigation
+          this.InnerDialogProps.isShowTextArea = false
+        
           break
       }
     },
@@ -854,7 +894,12 @@ export default {
         case 'dialyzer_perfusion_apparatus':
           this.addPlan.dialyzer_perfusion_apparatus = val.value.join(',')
           break
-
+        case 'dialyzers':
+          this.dialysis_dialyszers = val.value.join(',')
+         break
+        case 'irrigations':
+          this.dialysis_irrigation = val.value.join(',')
+        break
       }
     },
     innerDialogCancle: function() {
@@ -915,7 +960,10 @@ export default {
         displace_liqui_part: "",
         displace_liqui_value: "",
         ultrafiltration: "",
-        blood_access: ""
+        blood_access: "",
+        stockType:[],
+        irrigations:[],
+        dialyzers:[],
       };
 
       for (const key in tempAddPlan) {
@@ -973,6 +1021,10 @@ export default {
             }
           }
           this.addPlan.mode = id;
+          this.addPlan.dialysis_dialyszers = prescription.dialysis_dialyszers
+          this.addPlan.dialysis_irrigation = prescription.dialysis_irrigation
+          this.dialysis_dialyszers = prescription.dialysis_dialyszers
+          this.dialysis_irrigation = prescription.dialysis_irrigation
         }
       });
     },
@@ -991,12 +1043,43 @@ export default {
           return false;
         } else {
           this.system_prescription = response.data.data.prescriptions;
-
+          
           for (let i = 0; i < this.system_prescription.length; i++) {
             if (this.system_prescription[i].mode == 1) {
               this.isEdit = true;
             }
           }
+          this.stockType =  response.data.data.stockType
+          console.log("2333555555555",this.stockType)
+          if(this.stockType.length >0 ){
+               var arr = []
+                var arrTwo = []
+                for(let i=0;i<this.stockType.length;i++){
+                  if(this.stockType[i].stock_attribute == 2){
+                      arr.push(this.stockType[i])
+                  }
+                  if(this.stockType[i].stock_attribute == 3){
+                      arrTwo.push(this.stockType[i])
+                  }
+                }
+                var dialyzator = []
+                var irrigation = []
+                for(let i=0;i<arr.length;i++){
+                  for(let j=0;j<arr[i].GoodInfo.length;j++){
+                      dialyzator.push(arr[i].GoodInfo[j])
+                  }
+                }
+                console.log("透析器",dialyzator)
+                this.dialyzers = dialyzator
+
+                for(let i=0;i<arrTwo.length;i++){
+                  for(let j=0;j<arrTwo[i].GoodInfo.length;j++){
+                      irrigation.push(arrTwo[i].GoodInfo[j])
+                  }
+                }
+                console.log("灌流器",irrigation)
+                this.irrigations = irrigation
+          }
         }
       });
     },
@@ -1024,6 +1107,8 @@ export default {
     savePrescription: function() {
       this.addPlan.anticoagulant_zongliang = this.addPlan.anticoagulant_zongliang.toString();
       if (!this.isEdit) {
+        this.addPlan.dialysis_dialyszers = this.dialysis_dialyszers
+        this.addPlan.dialysis_irrigation = this.dialysis_irrigation
         postSystemPrescription(this.addPlan).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
@@ -1043,6 +1128,8 @@ export default {
           }
         });
       } else {
+          this.addPlan.dialysis_irrigation = this.dialysis_irrigation
+          this.addPlan.dialysis_dialyszers  = this.dialysis_dialyszers
         updateSystemPrescription(this.addPlan.id, this.addPlan).then(
           response => {
             if (response.data.state == 0) {

src/xt_pages/data/showConfig.vue

@@ -150,7 +150,7 @@ export default {
   },
   created() {
     var filedList = store.getters.xt_user.fileds;
-
+    
     for (let i = 0; i < filedList.length; i++) {
       switch (filedList[i].module) {
         case 1:

src/xt_pages/dialysis/PatientBox.vue

@@ -115,6 +115,7 @@
       :dry_weight="lastDryWeightDislysis"
       :schedual="temp_schedual"
       :date='date'
+      :stockType="stockType"
     ></dialysis-prescription-dialog>
     <treatment-summary-dialog
       title="治疗小结"
@@ -225,6 +226,7 @@ export default {
       temp_schedual: null,
       date:'',
       modedata:0,
+      stockType:"",
     };
   },
   props: {
@@ -391,7 +393,7 @@ export default {
         var resp = rs.data;
         if (resp.state == 1) {
           var patient = resp.data.patient; // 患者信息
-          console.log("患者信息",patient)
+         
           var schedual = resp.data.schedual; // 患者排班信息
           var prescription = resp.data.prescription; // 透析处方
           if(prescription!=null){
@@ -411,10 +413,10 @@ export default {
              }
            }
           var doctor_advices = resp.data.doctor_advices; // 临时医嘱
-          //console.log("力气-------", doctor_advices);
+          
           var double_check = resp.data.double_check; // 双人核对
           var assessment_after_dislysis = resp.data.assessment_after_dislysis; // 透后评估
-          //console.log("透后品谷数", assessment_after_dislysis);
+        
           var treatment_summary = resp.data.treatment_summary; // 治疗小结
           var monitor_records = resp.data.monitor_records; // 透析监测
           var dialysis_order = resp.data.dialysis_order; // 透析记录
@@ -447,7 +449,10 @@ export default {
           var lastDryWeightDislysis = resp.data.lastDryWeightDislysis;
 
           var system_prescribe = resp.data.system_prescribe;
-
+          
+          var stockType =  resp.data.stockType
+          this.stockType = stockType
+          console.log("元单快乐222222",this.stockType)
           
           this.$refs.prescription.setLastRecord(
             schedual,
@@ -601,7 +606,7 @@ export default {
       this.$emit("advice");
     },
     open(schedual){
-      console.log("中国2222222",this)
+     
      
       this.date = schedual.schedule_date
       this.patient_id = schedual.patient_id

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -75,6 +75,18 @@
           <span class="unit"></span>
         </li>
 
+        <li v-if="isShow('透析器')">
+          <label>透析器 : </label>
+          <span class="content">{{ dialysis_dialyszers }}</span>
+          <span class="unit"></span>
+        </li>
+
+        <li v-if="isShow('灌流器')">
+          <label>灌流器 : </label>
+          <span class="content">{{ dialysis_irrigation }}</span>
+          <span class="unit"></span>
+        </li>
+
         <li v-if="isShow('透析前使用特殊药物')">
           <label>透析前使用特殊药物: </label>
           <span class="content">{{ special_medicine }}</span>
@@ -332,6 +344,9 @@ export default {
     },
     device_number_map: {
       type: Object
+    },
+    preparestock:{
+      type:Array
     }
   },
   computed: {
@@ -494,6 +509,46 @@ export default {
         'dialyzer_perfusion_apparatus'
       )
     },
+    dialysis_dialyszers:function(){
+
+      var str = this.getValueStr('dialysis_dialyszers','dialysis_dialyszers')
+       console.log("str",str)
+      var arr = str.split(",")
+
+      if (arr.length >0) {
+         for(let i=0;i<arr.length;i++){
+           for(let j=0;j<this.preparestock.length;j++){
+              if(arr[i] == this.preparestock[j].specification_name){
+                 arr[i] = arr[i]+"("+this.preparestock[j].commdity_code+")"
+              }
+           }
+         }
+      }
+      console.log("arr00000",arr)
+      var strs = arr.join(',')
+      console.log("strs",strs)
+      return strs
+    },
+    dialysis_irrigation:function(){
+        var str = this.getValueStr('dialysis_irrigation','dialysis_irrigation')
+       console.log("str",str)
+      var arr = str.split(",")
+
+      if (arr.length >0) {
+         for(let i=0;i<arr.length;i++){
+           for(let j=0;j<this.preparestock.length;j++){
+              if(arr[i] == this.preparestock[j].specification_name){
+                 arr[i] = arr[i]+"("+this.preparestock[j].commdity_code+")"
+              }
+           }
+         }
+      }
+      console.log("arr00000",arr)
+      var strs = arr.join(',')
+      console.log("strs",strs)
+      return strs
+      // return this.getValueStr('dialysis_irrigation','dialysis_irrigation')
+    },
     body_fluid: function() {
       var id = this.getValueStr('body_fluid', 'body_fluid')
       if (id == 0) {
@@ -572,6 +627,7 @@ export default {
     }
   },
   created() {
+
     var perfusion_apparatus = this.$store.getters.perfusion_apparatus
     var map = {}
     for (let index = 0; index < perfusion_apparatus.length; index++) {

src/xt_pages/dialysis/details/NavIgation.vue

@@ -88,6 +88,7 @@
       :last_prescription="last_dialysis_prescribe"
       :dry_weight="last_dryWeight_dislysis"
       :schedual="temp_schedual"
+      :stockType="stockType"
       :lastAssessment="lastAssessment"
     ></dialysis-prescription-dialog>
 
@@ -99,7 +100,7 @@
       :prescription="prescription"
       :double_check="double_check"
       :admin_users="admin_users"
-    
+
     ></double-check-dialog>
 
     <accepts-treatment-dialog
@@ -512,6 +513,12 @@ export default {
         return [];
       }
     },
+    stockType:{
+      type:Array,
+      default:()=>{
+        return [];
+      }
+    },
     lastAssessment:{
      // 最后一条血管通路(处理今天录的)
      type: Object,

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

@@ -1262,6 +1262,7 @@
       this.humor_excessive_symptom_array = getDataConfig('hemodialysis', 'humor_excessive_symptom')
       // console.log("血管通路部位",this.blood_access_part_opera)
       this.internal_fistula = getDataConfig('hemodialysis', 'internal_fistula')
+      console.log("内瘘222222",this.internal_fistula)
       this.internal_fistula_skin = getDataConfig('hemodialysis', 'internal_fistula_skin')
       this.puncture_method = getDataConfig('hemodialysis', 'puncture_method')
       this.machineType = getDataConfig('hemodialysis', 'machine_type')

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

@@ -252,7 +252,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          
+
 
            <el-col :span="8" v-if="isShows('置换速度')" v-show="totalShow">
             <el-form-item label="置换速度(ml/min)">
@@ -262,7 +262,7 @@
             </el-form-item>
           </el-col>
 
- 
+
           <el-col
             :span="8"
             v-if="anticoagulant.gaimingcheng != -1 && isShows('钙名称')"
@@ -368,18 +368,18 @@
             </el-form-item>
           </el-col>
 
-          <!-- <el-col :span="8" v-if="isShows('透析器')">
+          <el-col :span="8" v-if="isShows('透析器')">
              <el-form-item label="透析器:">
-                  <el-input v-model="dialysisPrescription.dialyzers" @focus="showInnerDialog('7')"></el-input>
+                  <el-input v-model="dialysisPrescription.dialysis_dialyszers" @focus="showInnerDialog('7')"></el-input>
              </el-form-item>
           </el-col>
 
-ß
+
           <el-col :span="8" v-if="isShows('灌流器')">
              <el-form-item label="灌流器:">
-                  <el-input v-model="dialysisPrescription.irrigation" @focus="showInnerDialog('8')"></el-input>
+                  <el-input v-model="dialysisPrescription.dialysis_irrigation" @focus="showInnerDialog('8')"></el-input>
              </el-form-item>
-          </el-col> -->
+          </el-col>
 
           <el-col :span="8" v-if="isShows('体液过多症状')">
             <el-form-item label="体液过多症状：">
@@ -400,10 +400,7 @@
             </el-form-item>
           </el-col>
 
-          <!-- </el-row>
-
 
-          <el-row :gutter="20" > -->
 
           <el-col :span="8" v-if="isShows('体液过多其他症状')">
             <el-form-item label="体液过多其他症状">
@@ -440,9 +437,7 @@
             </el-form-item>
           </el-col>
 
-          <!-- </el-row>
 
-          <el-row :gutter="20" > -->
           <el-col :span="8">
             <el-form-item
               label="置换液："
@@ -530,281 +525,6 @@
 
             </el-form-item>
           </el-col>
-
-
-          <!-- </el-row>
-          <el-row :gutter="20" > -->
-          <!--          <el-col :span="8" v-if="isShows('实际超滤量')">-->
-          <!--            <el-form-item label="实际超滤量(L)">-->
-          <!--              <el-input v-model="dialysisPrescription.ultrafiltration"></el-input>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-
-          <!--透析耗材-->
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('血液透析干粉') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="血液透析干粉：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.niprocart"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-                <!--<el-option-->
-                  <!--v-for="(option, index) in niprocart_info"-->
-                  <!--:key="index + 'p'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('一次性使用动静脉穿刺针') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="一次性使用动静脉穿刺针：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.jms"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in jms_info"-->
-                  <!--:key="index + 'a'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('内瘘管翼状针') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="内瘘管翼状针：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.fistula_needle_set"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in fistula_needle_set_info"-->
-                  <!--:key="index + 's'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('内瘘管翼状针16G') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="内瘘管翼状针16G：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.fistula_needle_set_16"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in fistula_needle_set_16_info"-->
-                  <!--:key="index + 'd'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('一次性使用血液灌流器') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="一次性使用血液灌流器：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.hemoperfusion"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in hemoperfusion_info"-->
-                  <!--:key="index + 'f'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('空心纤维血液透析器') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="空心纤维血液透析器：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.dialyser_sterilised"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in dialyser_sterilised_info"-->
-                  <!--:key="index + 'g'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('中空纤维透析器') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="中空纤维透析器：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.filtryzer"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in filtryzer_info"-->
-                  <!--:key="index + 'h'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="8" v-if="isShows('透析器') && config.is_open == 1">-->
-            <!--<el-form-item label="透析器：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.dialyzers"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in dialyzers_info"-->
-                  <!--:key="index + 1"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="8" v-if="isShows('注射器') && config.is_open == 1">-->
-            <!--<el-form-item label="注射器：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.injector"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in injector_info"-->
-                  <!--:key="index + 'j'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('体外循环血路管') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="体外循环血路管：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.bloodlines"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in bloodlines_info"-->
-                  <!--:key="index + 'k'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col-->
-            <!--:span="8"-->
-            <!--v-if="isShows('血液净化补液管路(置换管)') && config.is_open == 1"-->
-          <!--&gt;-->
-            <!--<el-form-item label="血液净化补液管路(置换管)：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.tubing_hemodialysis"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in tubingHemodialysis_info"-->
-                  <!--:key="index + 'x'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="8" v-if="isShows('护理包') && config.is_open == 1">-->
-            <!--<el-form-item label="护理包：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.package"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in safe_package_info"-->
-                  <!--:key="index + 'z'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-          <!--<el-col :span="8" v-if="isShows('A液') && config.is_open == 1">-->
-            <!--<el-form-item label="A液：">-->
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.a_liquid"-->
-                <!--placeholder="请选择"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(option, index) in aliquid_info"-->
-                  <!--:key="index + 'c'"-->
-                  <!--:label="option.GoodInfo.specification_name"-->
-                  <!--:value="option.GoodInfo.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            <!--</el-form-item>-->
-          <!--</el-col>-->
-
-
-
-
-
         </el-row>
 
         <el-row :gutter="20">
@@ -1162,6 +882,12 @@
         }
       },
       scheudle_mode:Number,
+     stockType:{
+        type:Array,
+        default:()=>{
+          return [];
+        }
+      },
       lastAssessment: {
         type: Object,
         default: () => {
@@ -1287,6 +1013,8 @@
           nucleoprotamine:"",//鱼精蛋白
           no_heparin_remarks:"",
           blood:"",
+          dialysis_dialyszers:"",
+          dialysis_irrigation:"",
           irrigation:"",
           antioxidant_commodity_name:"",
           displace_speed:"",
@@ -1311,7 +1039,7 @@
         doctorAdvices: [],
         dialyzerPerfusionApparatus: [],
         bloods:[],
-        irrigation:[],
+        irrigations:[],
         dialyzers:[],
       }
     },
@@ -1378,6 +1106,25 @@
 
            case '7': // 透析器
 
+            for(let i=0;i<this.dialyzers.length;i++){
+               this.dialyzers[i].name = this.dialyzers[i].specification_name
+            }
+            this.InnerDialogProps.values = this.dialyzers
+            this.InnerDialogProps.titles = '透析器'
+            this.InnerDialogProps.type = 'dialyzers'
+            this.InnerDialogProps.selected = this.dialysisPrescription.dialysis_dialyszers
+            this.InnerDialogProps.isShowTextArea = false
+            break
+           case '8':
+           for(let i=0;i<this.irrigations.length;i++){
+             this.irrigations[i].name = this.irrigations[i].specification_name
+           }
+            this.InnerDialogProps.values = this.irrigations
+            this.InnerDialogProps.titles = '透析器'
+            this.InnerDialogProps.type = 'irrigations'
+            this.InnerDialogProps.selected = this.dialysisPrescription.dialysis_irrigation
+            this.InnerDialogProps.isShowTextArea = false
+            break
         }
       },
       innerDialogComfirm: function(val) {
@@ -1389,6 +1136,12 @@
           case 'blood':
             this.dialysisPrescription.blood = val.value.join(',')
            break
+          case 'dialyzers':
+           this.dialysisPrescription.dialysis_dialyszers = val.value.join(',')
+          break
+          case 'irrigations':
+           this.dialysisPrescription.dialysis_irrigation = val.value.join(',')
+          break
         }
       },
       innerDialogCancle: function() {
@@ -1490,7 +1243,7 @@
           'hemodialysis',
           'dialyzer_perfusion_apparatus'
         )
-
+        console.log("3333333",this.dialyzerPerfusionApparatus)
         this.bloods = getDataConfig(
           'hemodialysis',
           'blood'
@@ -1618,6 +1371,7 @@
                 ParamsQuery['mode'] = '3'
               }
             }
+
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -1838,7 +1592,7 @@
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
       show(pre,schedual,last,his_is_open) {
-     
+
         if(his_is_open == 1){
           this.is_open = 0
         }
@@ -1911,8 +1665,8 @@
         } else {
           last_weight_after = this.last_record.weight_after
         }
-        
- 
+
+
 
         if (this.predialysis == null || this.predialysis.id == 0) {
           if(last != null) {
@@ -1934,7 +1688,7 @@
 
             weight_before = 0
 
-           
+
           }
 
         } else {
@@ -1960,11 +1714,11 @@
         //               if(this.last_prescription.blood_access_part_opera_id == this.blood_access_option[i].name){
         //                 blood_id = this.blood_access_option[i].id
         //               }
-        //           }   
+        //           }
         //            this.dialysisPrescription.blood_access = blood_id
         //       }
         //     }
-           
+
         //  }
 
         if (weight_before > 0 && last_weight_after > 0) {
@@ -2050,7 +1804,7 @@
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = '1'
 
-            console.log("第一")
+            console.log("第一",ParamsQuery)
             postPrescription(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -3738,7 +3492,35 @@
           }
         }
       },
+      stockType:function(){
 
+        var arr = []
+        var arrTwo = []
+        for(let i=0;i<this.stockType.length;i++){
+          if(this.stockType[i].stock_attribute == 2){
+              arr.push(this.stockType[i])
+          }
+          if(this.stockType[i].stock_attribute == 3){
+              arrTwo.push(this.stockType[i])
+          }
+        }
+        var dialyzator = []
+        var irrigation = []
+        for(let i=0;i<arr.length;i++){
+          for(let j=0;j<arr[i].GoodInfo.length;j++){
+              dialyzator.push(arr[i].GoodInfo[j])
+          }
+        }
+        this.dialyzers = dialyzator
+
+        for(let i=0;i<arrTwo.length;i++){
+           for(let j=0;j<arrTwo[i].GoodInfo.length;j++){
+              irrigation.push(arrTwo[i].GoodInfo[j])
+           }
+        }
+        this.irrigations = irrigation
+
+      }
     }
   }
 </script>

src/xt_pages/dialysis/details/index.vue

@@ -267,6 +267,7 @@
         :system_prescribe="system_prescribe"
         :his_is_open="his_is_open"
         :lastAssessment="lastAssessment"
+        :stockType="stockType"
       >
       </nav-igation>
 
@@ -283,6 +284,7 @@
         :prescription="prescription"
         :solution="solution"
         :device_map="device_map"
+        :preparestock="preparestock"
         title="透析处方"
       ></dialysis-prescription>
 
@@ -681,7 +683,8 @@ export default {
       curPatient:{},
 
       queueConfig:{},
-      stockType:[]
+      stockType:[],
+      preparestock:[]
     }
   },
   created() {
@@ -971,22 +974,22 @@ export default {
 
       this.doctor_advices = []
       getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
-        
+
         var resp = rs.data
         if (resp.state == 1) {
           var patient = resp.data.patient // 患者信息
           var schedual = resp.data.schedual // 患者排班信息
-        
+
           var prescription = resp.data.prescription // 透析处方
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
               prescription.body_fluid = 0
             }
           }
-        
+
           var solution = resp.data.solution // 透析方案
           var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
-         
+
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
            console.log("透器评估",predialysis_evaluation)
           if (predialysis_evaluation != null) {
@@ -1018,7 +1021,7 @@ export default {
           var aliquid_info = resp.data.aliquid_info
 
           var lastPredialysisEvaluation = resp.data.lastPredialysisEvaluation
-        
+
           if (lastPredialysisEvaluation != null) {
             if (lastPredialysisEvaluation.blood_access_part_id == -2) {
               lastPredialysisEvaluation.blood_access_part_id = 0
@@ -1028,9 +1031,9 @@ export default {
           var lastAssessmentAfterDislysis = resp.data.lastAssessmentAfterDislysis
           var lastDialysisPrescribe = resp.data.lastDialysisPrescribe
           var lastDryWeightDislysis = resp.data.lastDryWeightDislysis
-         
+
           var system_prescribe = resp.data.system_prescribe
-           
+
           var lastAssessment =  resp.data.lastAssessment
           console.log("最后一次血管通路",lastAssessment)
           this.$refs.nav.setLastRecord(
@@ -1115,19 +1118,26 @@ export default {
           this.dialysis_order =
             dialysis_order == null ? { id: 0 } : dialysis_order
 
-         
+
 
           this.admin_users = resp.data.doctors
           this.devices = resp.data.devices
           this.device_numbers = resp.data.device_numbers
 
           var his_doctor_advices = resp.data.his_advices
-          
+
           this.his_is_open = resp.data.is_open_config.is_open
           console.log(this.his_is_open)
-          
-      
-          
+
+
+
+          var stockType =  resp.data.stockType
+          this.stockType = stockType
+          console.log("stockTYPW",stockType)
+
+          var prepare = resp.data.prepare
+          this.preparestock = prepare
+          console.log("prepare222222",prepare)
           for (let i = 0; i <  this.doctor_advices.length; i++){
             this.doctor_advices[i]['origin'] = 1
           }

src/xt_pages/stock/Dialog/goodTypeDialog.vue

@@ -12,15 +12,18 @@
       <el-row>
         <el-col>
           <el-form-item label="耗材属性">
-              <el-radio v-model="formValue.stock_attribute" label="1">无</el-radio>
-              <el-radio v-model="formValue.stock_attribute" label="2">透析器</el-radio>
-              <el-radio v-model="formValue.stock_attribute" label="3">灌流器</el-radio>
+            
+              <el-radio-group v-model="formValue.stock_attribute" @change="changeRadio">
+                  <el-radio label="1">无</el-radio>
+                  <el-radio label="2">透析器</el-radio>
+                  <el-radio label="3">灌流器</el-radio>
+              </el-radio-group>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col>
-          <el-form-item label="耗材出库" prop="out_stock">
+          <el-form-item label="耗材出库" prop="out_stock" v-show="showAttribute">
              <el-radio v-model="formValue.out_stock" label="1">是</el-radio>
              <el-radio v-model="formValue.out_stock" label="2">否</el-radio>
           </el-form-item>     
@@ -67,7 +70,8 @@ export default {
         ]
       },
        out_stock: '1',
-       stock_attribute:"1"
+       stock_attribute:"1",
+       showAttribute:false
     };
   },
   props: {
@@ -84,7 +88,15 @@ export default {
     }
   },
   methods: {
-    show:function(){
+    show:function(val){
+      console.log("val22222222",this.formValue)
+      if(this.formValue.stock_attribute == "1"){
+        this.showAttribute = false
+      }
+      if(this.formValue.stock_attribute == "2" || this.formValue.stock_attribute =="3"){
+        this.showAttribute = true
+      }
+   
       this.visibility = true
 
     },hide:function(){
@@ -109,20 +121,35 @@ export default {
       form['out_stock'] = this.formValue.out_stock;
       form["stock_attribute"] = this.formValue.stock_attribute
       return form;
+    },
+
+    changeRadio(val){
+      if(val == 1){
+        this.showAttribute = false
+      }
+      if(val == 2 || val == 3){
+        this.showAttribute = true
+      }
     }
   },
+  
   watch: {
     visibility(val) {
-      !val &&
-        setTimeout(() => {
+      
+      !val && setTimeout(() => {
+        
           this.$refs["formValue"].resetFields();
           this.formValue.remark = "";
           this.formValue.type_name = "";
           this.formValue.stock_attribute="1";
           this.formValue.out_stock = "1"
-        }, 0);
-    }
-  }
+       }, 0);
+    },
+    
+   
+  },
+
+ 
 };
 </script>
 

src/xt_pages/stock/config/goodType.vue

@@ -339,12 +339,13 @@ export default {
         });
       } else if (val.isCreated == 1) {
         //新增
-        console.log("val22222",val)
+        
        
         createGoodType(val).then(response => {
           
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
+            // this.$message.error(response.data.msg);
+            this.$message.error("透析器或灌流器商品类型已存在!")
             return false;
           } else {
             this.$refs.dialog.hide();

src/xt_pages/stock/index.vue

@@ -13,7 +13,7 @@
           <!--<el-tab-pane label="经销商">-->
             <!--<dealer></dealer>-->
           <!--</el-tab-pane>-->
-          <el-tab-pane label="商品类型" name="first">
+          <el-tab-pane label="耗材类型" name="first">
             <good-type></good-type>
           </el-tab-pane>
           <!--<el-tab-pane label="商品信息">-->

src/xt_pages/user/dialysisSolution.vue

@@ -85,7 +85,7 @@
             <span>{{ getAdminUserName(scope.row.registrars_id) }}</span>
           </template>
         </el-table-column>
-        
+
         <el-table-column
           prop="created_time"
           align="center"
@@ -215,7 +215,7 @@
               <el-input v-model="addPlan.blood_flow_volume"></el-input>
             </el-form-item>
           </el-col>
-       
+
 
           <el-col :span="8" v-if="isShows('透析液配方')">
             <el-form-item label="透析液配方:">
@@ -229,7 +229,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-         
+
           <el-col :span="8" v-if="isShows('抗凝剂')">
             <el-form-item label="抗凝剂:" prop="anticoagulant">
               <el-select
@@ -349,6 +349,21 @@
             </el-form-item>
           </el-col>
 
+
+
+
+          <el-col :span="8" v-if="isShows('透析器')">
+            <el-form-item label="透析器:">
+              <el-input v-model="dialysis_dialyszers" @focus="showInnerDialog('6')"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('灌流器')">
+             <el-form-item label="灌流器:">
+               <el-input v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>
+             </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShows('碳酸氢盐')">
             <el-form-item label="碳酸氢盐（mmol/L）: " prop="bicarbonate">
               <el-input v-model="addPlan.bicarbonate"></el-input>
@@ -689,7 +704,9 @@ export default {
         displace_liqui_part: '',
         displace_liqui_value: '',
         ultrafiltration: '',
-        blood_access: ''
+        blood_access: '',
+        dialysis_dialyszers:'',
+        dialysis_irrigation:'',
       },
       childPlan: {
         mode: '',
@@ -812,11 +829,16 @@ export default {
         page: 1,
         limit: 10,
         id: 0
-      }
+      },
+     stockType:[],
+     irrigations:[],
+     dialyzers:[],
+     dialysis_dialyszers:'',
+     dialysis_irrigation:"",
     }
   },
   watch: {
-   
+
    'dialysisTimeShow':function(){
       var val = this.addPlan.dialysis_duration_hour+":"+this.addPlan.dialysis_duration_minute
       var valTime = val.split(':')
@@ -826,7 +848,7 @@ export default {
    },
 
     'addPlan.dialysis_duration': function() {
-    
+
       this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
         this.addPlan.anticoagulant_shouji,
         this.addPlan.dialysis_duration,
@@ -834,7 +856,7 @@ export default {
       )
     },
     'addPlan.anticoagulant_shouji': function() {
-      
+
       this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
         this.addPlan.anticoagulant_shouji,
         this.addPlan.dialysis_duration,
@@ -852,7 +874,7 @@ export default {
   },
 
 
-  
+
   components: {
     MultiSelectBox,
     tableTitle,
@@ -868,15 +890,47 @@ export default {
           this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
           this.InnerDialogProps.selected = this.addPlan.dialyzer_perfusion_apparatus
           this.InnerDialogProps.isShowTextArea = false
+          break
+        case '6':
+           for(let i=0;i<this.dialyzers.length;i++){
+               this.dialyzers[i].name = this.dialyzers[i].specification_name
+           }
+           console.log("2222222",this.dialyzers)
+          this.InnerDialogProps.values = this.dialyzers
+          this.InnerDialogProps.titles = '透析器'
+          this.InnerDialogProps.type = 'dialyzers'
+          this.InnerDialogProps.selected = this.dialysis_dialyszers
+          this.InnerDialogProps.isShowTextArea = false
+
+          break
+        case '7':
+          for(let i=0;i<this.irrigations.length;i++){
+             this.irrigations[i].name = this.irrigations[i].specification_name
+           }
+          this.InnerDialogProps.values = this.irrigations
+          this.InnerDialogProps.titles = '灌流器'
+          this.InnerDialogProps.type = 'irrigations'
+          this.InnerDialogProps.selected = this.dialysis_irrigation
+          this.InnerDialogProps.isShowTextArea = false
+
           break
       }
     },
     innerDialogComfirm: function(val) {
+
       this.InnerDialogProps.visibility = false
       switch (val.type) {
         case 'dialyzer_perfusion_apparatus':
           this.addPlan.dialyzer_perfusion_apparatus = val.value.join(',')
           break
+        case 'dialyzers':
+          this.dialysis_dialyszers = val.value.join(',')
+          console.log("3333333",this.addPlan.dialysis_dialyszers)
+
+          break
+        case 'irrigations':
+          this.dialysis_irrigation = val.value.join(',')
+          break
 
       }
     },
@@ -892,7 +946,7 @@ export default {
     },
 
     selectnDialysisTime(val) {
-     
+
       var valTime = val.split(':')
       this.addPlan.dialysis_duration = parseFloat(valTime[0]) + parseFloat((valTime[1] / 60).toFixed(2))
       console.log("透析时长",this.addPlan.dialysis_duration)
@@ -1177,7 +1231,7 @@ export default {
         }
       })
     },
-    submitEditSolution(formName) {
+      submitEditSolution(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
           let mode = '2'
@@ -1187,6 +1241,8 @@ export default {
           ) {
             mode = '3'
           }
+          this.addPlan.dialysis_dialyszers = this.dialysis_dialyszers
+          this.addPlan.dialysis_irrigation = this.dialysis_irrigation
           console.log("2233333",this.addPlan)
           
           editPatientDialysisSolution(this.patientID,this.addPlan.id,this.addPlan, mode).then(response => {
@@ -1223,11 +1279,14 @@ export default {
       })
     },
     submitNewSolution(formName) {
-     
+
       this.addPlan.anticoagulant_zongliang = this.addPlan.anticoagulant_zongliang.toString()
       this.$refs[formName].validate(valid => {
         if (valid) {
           const mode = '1'
+          this.addPlan.dialysis_dialyszers = this.dialysis_dialyszers
+          this.addPlan.dialysis_irrigation = this.dialysis_irrigation
+          console.log("add",this.addPlan)
           createPatientDialysisSolution(
             this.patientID,
             this.addPlan,
@@ -1291,13 +1350,13 @@ export default {
         }else{
           this.addPlan.anticoagulant = row.anticoagulant
         }
-        
+
       }
       this.addPlan.replacement_total = row.replacement_total
 
       this.addPlan.target_ktv = row.target_ktv.toString()
       this.addPlan.target_ultrafiltration = row.target_ultrafiltration.toString()
-      
+
       this.addPlan.dialysis_duration = parseFloat(row.dialysis_duration_hour) + parseFloat((row.dialysis_duration_minute / 60).toFixed(2))
       this.addPlan.dialysis_duration_hour = row.dialysis_duration_hour
       this.addPlan.dialysis_duration_minute = row.dialysis_duration_minute
@@ -1317,7 +1376,10 @@ export default {
       this.addPlan.remark = row.remark
 
       this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString()
-
+      this.addPlan.dialysis_irrigation = row.dialysis_irrigation
+      this.addPlan.dialysis_dialyszers = row.dialysis_dialyszers
+      this.dialysis_irrigation = row.dialysis_irrigation
+      this.dialysis_dialyszers = row.dialysis_dialyszers
      if(row.body_fluid == 0){
        this.addPlan.body_fluid = ""
       }else{
@@ -1333,6 +1395,10 @@ export default {
 
       this.addPlan.registrars_id = row.registrars_id
       this.addPlan.created_time =  row.created_time
+      this.addPlan.dialysis_irrigation = row.dialysis_irrigation
+      this.addPlan.dialysis_dialyszers = row.dialysis_dialyszers
+      this.dialysis_irrigation = row.dialysis_irrigation
+      this.dialysis_dialyszers = row.dialysis_dialyszers
       this.dialogVisible = true
       this.isEdit = true
       if(row.dialysate_formulation==0){
@@ -1461,6 +1527,39 @@ export default {
         if (response.data.state == 1) {
           this.tableData = response.data.data.solutions
           this.total = response.data.data.total
+
+            this.stockType = response.data.data.stockType
+            console.log("2333555555555",this.stockType)
+            if(this.stockType.length >0 ){
+               var arr = []
+                var arrTwo = []
+                for(let i=0;i<this.stockType.length;i++){
+                  if(this.stockType[i].stock_attribute == 2){
+                      arr.push(this.stockType[i])
+                  }
+                  if(this.stockType[i].stock_attribute == 3){
+                      arrTwo.push(this.stockType[i])
+                  }
+                }
+                var dialyzator = []
+                var irrigation = []
+                for(let i=0;i<arr.length;i++){
+                  for(let j=0;j<arr[i].GoodInfo.length;j++){
+                      dialyzator.push(arr[i].GoodInfo[j])
+                  }
+                }
+                console.log("透析器",dialyzator)
+                this.dialyzers = dialyzator
+
+                for(let i=0;i<arrTwo.length;i++){
+                  for(let j=0;j<arrTwo[i].GoodInfo.length;j++){
+                      irrigation.push(arrTwo[i].GoodInfo[j])
+                  }
+                }
+                console.log("灌流器",irrigation)
+                this.irrigations = irrigation
+            }
+
         }
       })
     },
@@ -1688,7 +1787,8 @@ export default {
     }
 
     this.GetDeviceData()
-
+    this.fetchAllAdminUsers()
+    this.fetchPatientDialysisSolutions()
     this.modeOptions = this.$store.getters.treatment_mode
     this.anticoagulantsSet = this.$store.getters.anticoagulants_set
     this.replacementWays = this.$store.getters.replacement_ways
@@ -1714,8 +1814,7 @@ export default {
 
     this.queryParams.id = this.patientID
     // this.fetchAllDoctorAndNurse();
-    this.fetchAllAdminUsers()
-    this.fetchPatientDialysisSolutions()
+
   }
 }
 </script>

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -79,9 +79,10 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column label="透析器" min-width="100" align="center">
+      <el-table-column label="透析器/灌流器" min-width="100" align="center">
         <template slot-scope="scope">
           {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
+          {{scope.row.prescription.dialysis_dialyszers}} / {{scope.row.prescription.dialysis_irrigation}}
         </template>
       </el-table-column>
       <el-table-column label="抗凝剂" min-width="100" align="center">
@@ -254,7 +255,7 @@ export default {
              scheduleData[i].sort = scheduleData[i].number.sort
            }
           var arr =   scheduleData.sort(this.compare('sort'))
-          // console.log("元旦快乐",arr)
+           console.log("元旦快乐",arr)
           this.scheduleData = arr
         
          

src/xt_pages/workforce/components/tableWeeks.vue

@@ -25,7 +25,7 @@
           </li>
         </ul>
       </div>
-      
+
       <div  class="title"><span class="name">班 次</span> :</div>
       <div class="time">
         <ul class>
@@ -79,11 +79,14 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column label="透析器" min-width="100" align="center">
+      <el-table-column label="透析器/灌流器" min-width="100" align="center">
         <template slot-scope="scope">
           {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
+
+          {{scope.row.prescription.dialysis_dialyszers}}/{{scope.row.prescription.dialysis_irrigation}}
         </template>
       </el-table-column>
+
       <el-table-column label="抗凝剂" min-width="100" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.prescription.anticoagulant === 1">无肝素</span>
@@ -208,7 +211,7 @@ export default {
   },
   watch: {
     weekTime: function() {
-     
+
       var theType = this.weekType(this.weekTime);
       this.getSchedules(theType);
     }
@@ -232,7 +235,7 @@ export default {
           week_type:this.week_type,
           week_time:this.week_time,
         }
-       
+
       getScheduleWeekDay(params).then(response => {
         this.scheduleData = [];
         if (response.data.state == 1) {
@@ -241,7 +244,9 @@ export default {
              scheduleData[i].sort = scheduleData[i].number.sort
            }
           var arr = scheduleData.sort(this.compare('sort'))
-          
+
+          var arr =   scheduleData.sort(this.compare('sort'))
+        //  console.log("元旦快乐",arr)
           this.scheduleData = arr
         } else {
           this.$message.error("网络错误");

src/xt_pages/workforce/next_remind_print.vue

@@ -38,7 +38,7 @@
                   <td width="70">班次</td>
                   <td width="70">机号</td>
                   <td width="120">透析模式</td>
-                  <td width="100">透析器</td>
+                  <td width="100">透析器/灌流器</td>
                   <td width="120">抗凝剂</td>
                   <td width="100">总量</td>
                   <td width="300">长期医嘱</td>
@@ -60,7 +60,7 @@
                 </td>
                 <td :width="td_1_width">
                   {{main_collection.prescription.dialyzer_perfusion_apparatus}}
-
+                  {{main_collection.prescription.dialysis_dialyszers}} / {{main_collection.prescription.dialysis_irrigation}}
 
                 </td>
                 <td :width="td_1_width">

src/xt_pages/workforce/remind_print.vue

@@ -38,7 +38,7 @@
                   <td width="70">班次</td>
                   <td width="70">机号</td>
                   <td width="120">透析模式</td>
-                  <td width="100">透析器</td>
+                  <td width="100">透析器/灌流器</td>
                   <td width="120">抗凝剂</td>
                   <td width="100">总量</td>
                   <td width="300">长期医嘱</td>
@@ -60,7 +60,7 @@
                 </td>
                 <td :width="td_1_width">
                   {{main_collection.prescription.dialyzer_perfusion_apparatus}}
-
+                  {{main_collection.prescription.dialysis_dialyszers}} / {{main_collection.prescription.dialysis_irrigation}}
 
                 </td>
                 <td :width="td_1_width">