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/batch_print/batch_print_order_fortyOne.vue

@@ -439,33 +439,53 @@
                                 L
                             </div>
                             </div>
-                            <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
-                            <div class="inline_block" style="flex:1.4">
+                            <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" v-if="org_id == 10233">
+                              <div class="inline_block" style="flex:1">
                                 血管通路：
-                                <div class="under_line" style="width: 300px;text-align: center;">
-                                <!-- {{record.prescription.blood_access_part_opera_name}} -->
-                                {{ QueryPartById(record.prescription && record.prescription.blood_access ? record.prescription.blood_access : 0) }}
+                                <div class="under_line" style="width: 260px;text-align: center;">
+                                  {{ QueryPartById(record.assessment_before_dislysis && record.assessment_before_dislysis.blood_access_part_opera_id ? record.assessment_before_dislysis.blood_access_part_opera_id : 0)}}
                                 </div>
-                            </div>
-                            <div class="inline_block" style="flex:1">
-                                透析机型：
-                                <div class="under_line" style="width: 150px;text-align: center;">
-                                {{ record.assessment_before_dislysis.machine_type ? record.assessment_before_dislysis.machine_type : '' }}
-                                </div>
-                            </div>
-                            <div class="inline_block" style="flex:1">
-                                机号：
-                                <div class="under_line" style="width: 60px;text-align: center;">
-                                {{
-                                    record.dialysis_order &&
-                                    record.dialysis_order.device_number &&
-                                    record.dialysis_order.device_number.number.length >
-                                    0
-                                    ? record.dialysis_order.device_number.number
-                                    : record.device_number.number
-                                }}
+                              </div>
+                              <div class="inline_block" style="flex:1">
+                                血管通路部位：
+                                <div class="under_line" style="width: 160px;text-align: center;">
+                                  {{record.assessment_before_dislysis.blood_access_part_id}}
                                 </div>
+                              </div>
                             </div>
+                            <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+                              <div class="inline_block" style="flex:1" v-if="org_id != 10233">
+                                  血管通路：
+                                  <div class="under_line" style="width: 260px;text-align: center;">
+                                  <!-- {{record.prescription.blood_access_part_opera_name}} -->
+                                  {{ QueryPartById(record.prescription && record.prescription.blood_access ? record.prescription.blood_access : 0) }}
+                                  </div>
+                              </div>
+                              <div class="inline_block" style="flex:1">
+                                  透析机型：
+                                  <div class="under_line" style="width: 150px;text-align: center;">
+                                  {{ record.assessment_before_dislysis.machine_type ? record.assessment_before_dislysis.machine_type : '' }}
+                                  </div>
+                              </div>
+                              <div class="inline_block" style="flex:1">
+                                  机号：
+                                  <div class="under_line" style="width: 60px;text-align: center;">
+                                  {{
+                                      record.dialysis_order &&
+                                      record.dialysis_order.device_number &&
+                                      record.dialysis_order.device_number.number.length >
+                                      0
+                                      ? record.dialysis_order.device_number.number
+                                      : record.device_number.number
+                                  }}
+                                  </div>
+                              </div>
+                              <div v-if="org_id == 10233" class="inline_block" style="flex:1;margin-left:10px;">
+                                透析器/灌流器：
+                                <div class="under_line" style="width: 120px;text-align: center;">
+                                  {{ record.prescription.dialyzer_perfusion_apparatus ? record.prescription.dialyzer_perfusion_apparatus : "" }}
+                                </div>
+                              </div>
                             </div>
                             <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                             <div class="inline_block" style="flex:1;">
@@ -695,8 +715,8 @@
                                 <td style="line-height:16px;padding:0px;">
                                     <div style="min-height:20px;line-height:20px; overflow:hidden;">
                                     <span v-if="getTime(monitor.operate_time, '{h}:{i}')" style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
-                                        <template v-if="(record.dialysis_order && monitor.operate_time == record.dialysis_order.start_time)">【开始透析】引血100ml/min</template>
-                                        <span v-if="record.dialysis_order && monitor.operate_time == record.dialysis_order.end_time">【结束透析】回血100ml/min</span> 
+                                        <template v-if="(record.dialysis_order && monitor.operate_time == record.dialysis_order.start_time)">【开始透析】<span v-if="org_id != 10233"> 引血100ml/min</span></template>
+                                        <span v-if="record.dialysis_order && monitor.operate_time == record.dialysis_order.end_time">【结束透析】<span v-if="org_id != 10233"> 回血100ml/min</span></span> 
                                         {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
                                     </span>
                                     </div>
@@ -894,6 +914,7 @@ export default {
     var xtuser = this.$store.getters.xt_user
     // console.log('xtuser', xtuser)
     this.orgname = xtuser.org.org_name
+    this.org_id = this.$store.getters.xt_user.org.id
     //   this.orgname = "遂溪方济医院";
     this.modeOptions = this.$store.getters.treatment_mode
     //   this.replacementWays = this.$store.getters.replacement_ways;

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

@@ -1969,7 +1969,7 @@
           this.is_open = 0
         }
         
-        if(this.$store.getters.xt_user.org.id == 10101){
+        if(this.$store.getters.xt_user.org.id == 10101 || this.$store.getters.xt_user.org.id == 10233){
           if (this.predialysis.id > 0 && this.predialysis.created_time > 0) {
             var date = new Date(this.predialysis.created_time * 1000)
             var year = date.getFullYear()

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -416,8 +416,22 @@
                     L
                   </div>
                 </div>
+                <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" v-if="org_id == 10233">
+                  <div class="inline_block" style="flex:1">
+                    血管通路：
+                    <div class="under_line" style="width: 260px;text-align: center;">
+                      {{predialysis.blood_access_part_opera_name}}
+                    </div>
+                  </div>
+                  <div class="inline_block" style="flex:1" v-if="org_id == 0">
+                    血管通路部位：
+                    <div class="under_line" style="width: 120px;text-align: center;">
+                      {{predialysis.blood_access_part_id}}
+                    </div>
+                  </div>
+                </div>
                 <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
-                  <div class="inline_block" style="flex:1.5">
+                  <div class="inline_block" style="flex:1.5" v-if="org_id != 10233">
                     血管通路：
                     <div class="under_line" style="width: 260px;text-align: center;">
                       {{prescription.blood_access_part_opera_name}}
@@ -1059,7 +1073,7 @@ export default {
         this.check = response.data.data.check
         this.xtdate = response.data.data.xtdate
         this.predialysis = response.data.data.PredialysisEvaluation
-        // console.log("透前评估",this.predialysis)
+        console.log("透前评估",this.predialysis)
         this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
           this.predialysis.blood_access_part_opera_id
         )

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -179,7 +179,7 @@
             {{scope.row.count}}
           </template>
         </el-table-column>
-        <el-table-column label="总价5555" align="center">
+        <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             <!-- {{scope.row.price * scope.row.count}} -->
             {{scope.row.total_price}}
@@ -233,7 +233,6 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
     var start_time = window.sessionStorage.getItem('start_out_time')
-    console.log("start",start)
      var end_time =  window.sessionStorage.getItem('end_out_time')
     if(start_time!=null){
        this.start_time = start_time   

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -148,7 +148,7 @@
           <span v-if="org_id!=9987" >
              <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus!=''">
                 <span v-if="org_id!=10131&& org_id !=10215">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
-                <span v-if="org_id==10131 || org_id == 10215">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
+                <span v-if="org_id==10131 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id,scope.row.mode_id,scope.row.solution)  }}</span>
               
               </span>
              <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ getDialysisDialyszerPerfusion(scope.row.patient_id) }}</span>
@@ -629,18 +629,18 @@ export default {
         }
        return name
     },
-     getDialysisDialyszerPerfusionOne(patient_id){
-        var name = ""
-        for(let i=0;i<this.scheduleData.length;i++){
-          if(patient_id == this.scheduleData[i].patient_id){
-            var arrLength = this.scheduleData[i].dialysissolution.length
-            if(arrLength > 0){
-               name = this.scheduleData[i].dialysissolution[arrLength - 1].dialyzer_perfusion_apparatus
-            }
+    getDialysisDialyszerPerfusionOne(patient_id,mode_id,solution) {
+        var name = ''
+        for (let i = 0; i < solution.length; i++) {
+          if (mode_id == solution[i].mode_id) {
+         
+            name = solution[i].dialyzer_perfusion_apparatus
+            
           }
         }
-       return name
-    },
+        console.log('name', name)
+        return name
+      },
     changeZone(val){
       this.zone = val
       this.getNextScheduleWeekDay()

src/xt_pages/workforce/components/tableWeeks.vue

@@ -226,7 +226,7 @@
 
           <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.id > 0 ">{{getDialysisDialyszerPerfusion(scope.row.patient_id)}}</span>
           </span>
-                    <span v-if="org_id==10131 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id)}}</span>
+                    <span v-if="org_id==10131 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id,scope.row.mode_id,scope.row.solution)}}</span>
                     {{scope.row.prescription.dialysis_dialyszers}}
                     <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
                     <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>
@@ -1503,17 +1503,14 @@
           }
         }
         return name
-      }
-      ,
-      getDialysisDialyszerPerfusionOne(patient_id) {
+      },
+      getDialysisDialyszerPerfusionOne(patient_id,mode_id,solution) {
         var name = ''
-        for (let i = 0; i < this.scheduleData.length; i++) {
-          if (patient_id == this.scheduleData[i].patient_id) {
-            // var arrLength = this.scheduleData[i].dialysissolution
-            // console.log('病人ID', patient_id, '数组', this.scheduleData[i].dialysissolution)
-            // if (arrLength > 0) {
-            name = this.scheduleData[i].dialysissolution.dialyzer_perfusion_apparatus
-            // }
+        for (let i = 0; i < solution.length; i++) {
+          if (mode_id == solution[i].mode_id) {
+         
+            name = solution[i].dialyzer_perfusion_apparatus
+            
           }
         }
         console.log('name', name)

src/xt_pages/workforce/next_remind_print.vue

@@ -64,7 +64,7 @@
                  <span v-if="org_id!=9987">
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''">
                         <span v-if="org_id!=10131 && org_id!=10215">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
-                         <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
+                         <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(main_collection.patient_id,main_collection.mode_id,main_collection.solution)  }}</span>
                      </span>
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span>
                   </span>
@@ -417,18 +417,18 @@
         }
        return name
      },
-     getDialysisDialyszerPerfusionOne(patient_id){
-        var name = ""
-        for(let i=0;i<this.scheduleData.length;i++){
-          if(patient_id == this.scheduleData[i].patient_id){
-            var arrLength = this.scheduleData[i].dialysissolution.length
-            if(arrLength > 0){
-               name = this.scheduleData[i].dialysissolution[arrLength - 1].dialyzer_perfusion_apparatus
-            }
+     getDialysisDialyszerPerfusionOne(patient_id,mode_id,solution) {
+        var name = ''
+        for (let i = 0; i < solution.length; i++) {
+          if (mode_id == solution[i].mode_id) {
+         
+            name = solution[i].dialyzer_perfusion_apparatus
+            
           }
         }
-       return name
-     }
+        console.log('name', name)
+        return name
+      },
     }
   }
 </script>

src/xt_pages/workforce/remind_print.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div class="main-contain">
     <div class="position">
@@ -63,12 +62,12 @@
 
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
                   <span v-if="org_id!=9987">
-                     <span >
-                       <span v-if="org_id!=10131 && org_id!=10215 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
-
-                       <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
+                     <span > 
+                       <span v-if="org_id!=10131 && org_id!=10215 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
+                     
+                       <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(main_collection.patient_id,main_collection.mode_id,main_collection.solution)}}</span>
                       </span>
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span>
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
                   </span>
                     {{main_collection.prescription.dialysis_dialyszers}}
                   <span v-if="main_collection.prescription.dialysis_dialyszers!=''&& main_collection.prescription.dialysis_irrigation!='' ">/</span>
@@ -165,9 +164,9 @@
               list[i].sort = list[i].number.sort
            }
            var arr = list.sort(this.compare('sort'))
-
+            
              this.scheduleData = arr
-
+            
              let a = response.data.data.day
               console.log("a",a)
               var myDate = new Date(a);
@@ -202,8 +201,8 @@
           this.currentDate = str
           }
        })
-
-
+       
+      
     },
     methods: {
       getAdvice:function(doctor_advice) {
@@ -283,7 +282,7 @@
 
           name = name + doctor_advice[i].advice_name + " " + drug_spec + " " + prescribing_number + " " + single_dose + " " + doctor_advice[i].delivery_way + " " + doctor_advice[i].execution_frequency + " " + doctor_advice[i].remark + "\n"
 
-
+        
         }
           return name
 
@@ -291,7 +290,7 @@
         }
 
       },
-
+     
       printAction: function() {
         const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
 
@@ -392,20 +391,18 @@
         }
        return name
      },
-
-     getDialysisDialyszerPerfusionOne(patient_id){
-        var name = ""
-        for(let i=0;i<this.scheduleData.length;i++){
-          if(patient_id == this.scheduleData[i].patient_id){
-            var arrLength = this.scheduleData[i].dialysissolution.length
-            if(arrLength > 0){
-               name = this.scheduleData[i].dialysissolution[arrLength - 1].dialyzer_perfusion_apparatus
-            }
+    getDialysisDialyszerPerfusionOne(patient_id,mode_id,solution) {
+        var name = ''
+        for (let i = 0; i < solution.length; i++) {
+          if (mode_id == solution[i].mode_id) {
+         
+            name = solution[i].dialyzer_perfusion_apparatus
+            
           }
         }
-        console.log("name232333223",name)
-       return name
-     }
+        console.log('name', name)
+        return name
+      },
     },
   }
 </script>