导出

src/xt_pages/data/prescription.vue

@@ -237,14 +237,14 @@
                   </el-col>
 
 
-                  <el-col :span="8">
+                  <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 3877">
                     <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-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 3877">
                     <el-form-item label="灌流器：">
                       <el-input
                         v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>
@@ -1175,7 +1175,8 @@ export default {
     )
     this.getAllSystemPrescription();
     this.getSystemPrescription(this.addPlan.mode);
-
+    
+   
   },
   watch: {
     "addPlan.dialysis_duration": function() {

src/xt_pages/dialysis/PatientBox.vue

@@ -57,7 +57,12 @@
         <p>目标超滤量:{{ schedule.prescription ? schedule.prescription.target_ultrafiltration : '' }}
        
         </p>
-        <p :title="schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : ''">透析器/灌流器:{{ schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : '' }}</p>
+        <p :title="schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : ''">
+          透析器/灌流器:{{ schedule.prescription ? schedule.prescription.dialyzer_perfusion_apparatus : '' }}
+           <span v-if="schedule.prescription!=null">{{schedule.prescription?schedule.prescription.dialysis_dialyszers:''}}</span>
+           <span v-if="schedule.prescription!=null && schedule.prescription.dialysis_irrigation!=''">/</span>
+           <span v-if="schedule.prescription!=null">{{schedule.prescription?schedule.prescription.dialysis_irrigation:''}}</span>
+        </p>
       </div>
       <div class="function" :class="functionColor(schedule)" :id="modeColor(schedule.mode_id)">
         <ul>

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

@@ -3493,7 +3493,7 @@
         }
       },
       stockType:function(){
-
+        console.log("stockType",this.stockType)
         var arr = []
         var arrTwo = []
         for(let i=0;i<this.stockType.length;i++){
@@ -3519,7 +3519,8 @@
            }
         }
         this.irrigations = irrigation
-
+        console.log("透析器",this.dialyzers)
+        console.log("灌流器",this.irrigations)
       }
     }
   }

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -114,6 +114,8 @@
         <el-table-column prop="date" label="透析器" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
+            <span v-if="scope.row.dialysis_dialyszers!=''">{{scope.row.dialysis_dialyszers}}</span>
+            <span v-if="scope.row.dialysis_irrigation!=''">{{scope.row.dialysis_irrigation}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
@@ -234,7 +236,11 @@
         </el-table-column>
         <el-table-column prop="date" label="透析器" align="center" min-width="26px">
           <template slot-scope="scope">
-            <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
+            <span>
+              {{ scope.row.dialyzer_perfusion_apparatus }}
+              <span v-if="scope.row.dialysis_dialyszers!=''">{{scope.row.dialysis_dialyszers}}</span>
+              <span v-if="scope.row.dialysis_irrigation!=''">{{scope.row.dialysis_irrigation}}</span>
+            </span>
           </template>
         </el-table-column>
         <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
@@ -496,6 +502,8 @@ export default {
                 it.name = item.patient.name
                     if(item.prescription != null){
                        it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+                       it.dialysis_dialyszers = item.prescription.dialysis_dialyszers
+                       it.dialysis_irrigation = item.prescription.dialysis_irrigation
                     }
                     it.schedule_type = item.schedule_type
                     it.zoneId = item.device_number.zone.id
@@ -554,6 +562,8 @@ export default {
                 it.name = item.patient.name
                     if(item.prescription != null){
                        it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+                       it.dialysis_dialyszers = item.prescription.dialysis_dialyszers
+                       it.dialysis_irrigation = item.prescription.dialysis_irrigation
                     }
                     it.schedule_type = item.schedule_type
                     it.zoneId = item.device_number.zone.id

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -509,7 +509,10 @@
                     <td width="140">透析器/灌流器型号:</td>
                     <td width="">
                       <div class="under-line">
-                          <span v-if="org_id ==9987 || org_id== 3877 || org_id == 4 || org_id == 9671">{{prescription.dialysis_dialyszers}}/{{prescription.dialysis_irrigation}}</span>
+                          <span v-if="org_id ==9987 || org_id== 3877 || org_id == 4 || org_id == 9671">
+                            <span>{{prescription.dialysis_dialyszers}}</span>
+                            <span v-if="prescription.dialysis_irrigation!=''">/{{prescription.dialysis_irrigation}}</span>
+                          </span>
                         &nbsp;<span else>{{ prescription.dialyzer_perfusion_apparatus }}</span> 
                       </div>
                     </td>

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -126,6 +126,22 @@
               </el-form-item>
             </template>
           </el-table-column>
+           <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>耗材名称</span>
+            </template>
+
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 15px">
+                <el-input
+                  placeholder=""
+                  v-model="scope.row.good_id"
+                  :value="typeNameOne(scope.row.good_id)"
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          
           <el-table-column min-width="35" align="center">
             <template slot="header" slot-scope="scope">
               <span>规格名称<span style="color: red">*</span></span>
@@ -447,6 +463,15 @@ export default {
       }
       return name;
     },
+    typeNameOne:function(good_info_id){
+       let name = ''
+      for (let i = 0; i < this.goodInfo.length; i++) {
+        if (this.goodInfo[i].id == good_info_id) {
+          name = this.goodInfo[i].good_name
+        }
+      }
+      return name
+    },
     specificationName: function(good_info_id) {
       let name = ''
       for (let i = 0; i < this.goodInfo.length; i++) {

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -81,8 +81,9 @@
       </el-table-column>
       <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}}
+          <span > {{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
+          {{scope.row.prescription.dialysis_dialyszers}}
+          <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{scope.row.prescription.dialysis_irrigation}}</span>
         </template>
       </el-table-column>
       <el-table-column label="抗凝剂" min-width="100" align="center">

src/xt_pages/workforce/components/tableWeeks.vue

@@ -82,8 +82,8 @@
       <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}}
+          {{scope.row.prescription.dialysis_dialyszers}}
+          <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{scope.row.prescription.dialysis_irrigation}}</span>
         </template>
       </el-table-column>
 
@@ -454,6 +454,7 @@ export default {
     //   week_type: this.week_type
     // };
     this.getScheduleWeekDay();
+    console.log("org2222222",this.$store.getters.xt_user.org.id)
   }
 };
 </script>

src/xt_pages/workforce/next_remind_print.vue

@@ -60,7 +60,8 @@
                 </td>
                 <td :width="td_1_width">
                   {{main_collection.prescription.dialyzer_perfusion_apparatus}}
-                  {{main_collection.prescription.dialysis_dialyszers}} / {{main_collection.prescription.dialysis_irrigation}}
+                  {{main_collection.prescription.dialysis_dialyszers}} 
+                  <span v-if="main_collection.prescription.dialysis_irrigation!=''">/ {{main_collection.prescription.dialysis_irrigation}}</span>
 
                 </td>
                 <td :width="td_1_width">

src/xt_pages/workforce/remind_print.vue

@@ -60,7 +60,8 @@
                 </td>
                 <td :width="td_1_width">
                   {{main_collection.prescription.dialyzer_perfusion_apparatus}}
-                  {{main_collection.prescription.dialysis_dialyszers}} / {{main_collection.prescription.dialysis_irrigation}}
+                  {{main_collection.prescription.dialysis_dialyszers}} 
+                  <span v-if="main_collection.prescription.dialysis_irrigation!=''">/ {{main_collection.prescription.dialysis_irrigation}}</span>
 
                 </td>
                 <td :width="td_1_width">