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

package-lock.json

@@ -2639,9 +2639,9 @@
       }
     },
     "commander": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz",
-      "integrity": "sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw=="
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.0.tgz",
+      "integrity": "sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA=="
     },
     "commondir": {
       "version": "1.0.1",
@@ -3778,9 +3778,9 @@
       }
     },
     "dompurify": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.5.tgz",
-      "integrity": "sha512-mLPd29uoRe9HpvwP2TxClGQBzGXeEC/we/q+bFlmPPmj2p2Ugl3r6ATu/UU1v77DXNcehiBg9zsr1dREyA/dJQ==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.6.tgz",
+      "integrity": "sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==",
       "optional": true,
       "requires": {
         "@types/trusted-types": "^2.0.7"
@@ -3875,9 +3875,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.5.152",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.152.tgz",
-      "integrity": "sha512-xBOfg/EBaIlVsHipHl2VdTPJRSvErNUaqW8ejTq5OlOlIYx1wOllCHsAvAIrr55jD1IYEfdR86miUEt8H5IeJg==",
+      "version": "1.5.155",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.155.tgz",
+      "integrity": "sha512-ps5KcGGmwL8VaeJlvlDlu4fORQpv3+GIcF5I3f9tUKUlJ/wsysh6HU8P5L1XWRYeXfA0oJd4PyM8ds8zTFf6Ng==",
       "dev": true
     },
     "elegant-spinner": {

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1502,6 +1502,7 @@
                                   ? monitor_record.ultrafiltration_volume
                                   : ""
                               }}
+                              
                             </span>
 
                           </td>
@@ -1662,7 +1663,7 @@
                     </table>
                   </td>
                 </tr>
-                <tr v-if="org_id != 10402 && org_id != 10206 && org_id != 0 && org_id != 10644 && org_id!=10567">
+                <tr v-if="org_id != 10402 && org_id != 10206 && org_id != 0 && org_id != 10644 && org_id!=10567&& org_id!=9478">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
@@ -1785,7 +1786,7 @@
                   </td>
                 </tr>
 
-                <tr v-if="org_id == 10402">
+                <tr v-if="org_id == 10402 || org_id == 9478">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
@@ -3190,12 +3191,12 @@ export default {
 
 
 
-            if (this.org_id == 10206 || this.org_id == 0 || this.org_id == 10644 || this.org_id == 10567) {
+            if (this.org_id == 10206 || this.org_id == 0 || this.org_id == 10644 || this.org_id == 10567 || this.org_id == 9478) {
               console.log("this.records[recordIndex].his_project", this.records[recordIndex].his_project)
               var delghThree = 0
               let his_project = []
               this.records[recordIndex].his_project.map(item => {
-                if (this.org_id == 0 || this.org_id == 10644 || this.org_id == 10567) {
+                if (this.org_id == 0 || this.org_id == 10644 || this.org_id == 10567 || this.org_id == 9478) {
                   console.log("item====================", item)
                   if (item.type == 2) {
                     if (item.project.is_show == 1) {

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,8 +17,8 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445 ||  this.$store.getters.xt_user.template_info.org_id == 10495 ||  this.$store.getters.xt_user.template_info.org_id == 10597  ||  this.$store.getters.xt_user.template_info.org_id == 10599 ||  this.$store.getters.xt_user.template_info.org_id == 10612 ||  this.$store.getters.xt_user.template_info.org_id == 10617 ||  this.$store.getters.xt_user.template_info.org_id == 10702 ||  this.$store.getters.xt_user.template_info.org_id == 10697 ||  this.$store.getters.xt_user.template_info.org_id == 10635 ||  this.$store.getters.xt_user.template_info.org_id == 10721 ||  this.$store.getters.xt_user.template_info.org_id == 10727 ||  this.$store.getters.xt_user.template_info.org_id == 10751 || this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10757) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445  &&  this.$store.getters.xt_user.template_info.org_id!= 10495 &&  this.$store.getters.xt_user.template_info.org_id!= 10597  &&  this.$store.getters.xt_user.template_info.org_id!= 10599  &&  this.$store.getters.xt_user.template_info.org_id!= 10612  &&  this.$store.getters.xt_user.template_info.org_id!= 10617  &&  this.$store.getters.xt_user.template_info.org_id!= 10702  &&  this.$store.getters.xt_user.template_info.org_id!= 10697 &&  this.$store.getters.xt_user.template_info.org_id!= 10635 &&  this.$store.getters.xt_user.template_info.org_id!= 10721 &&  this.$store.getters.xt_user.template_info.org_id!= 10727&&  this.$store.getters.xt_user.template_info.org_id!= 10751 &&  this.$store.getters.xt_user.template_info.org_id!= 10752 &&  this.$store.getters.xt_user.template_info.org_id!= 10742 && this.$store.getters.xt_user.template_info.org_id!= 10757"  >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445 ||  this.$store.getters.xt_user.template_info.org_id == 10495 ||  this.$store.getters.xt_user.template_info.org_id == 10597  ||  this.$store.getters.xt_user.template_info.org_id == 10599 ||  this.$store.getters.xt_user.template_info.org_id == 10612 ||  this.$store.getters.xt_user.template_info.org_id == 10617 ||  this.$store.getters.xt_user.template_info.org_id == 10702 ||  this.$store.getters.xt_user.template_info.org_id == 10697 ||  this.$store.getters.xt_user.template_info.org_id == 10635 ||  this.$store.getters.xt_user.template_info.org_id == 10721 ||  this.$store.getters.xt_user.template_info.org_id == 10727 ||  this.$store.getters.xt_user.template_info.org_id == 10751 || this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10757|| this.$store.getters.xt_user.template_info.org_id == 9779) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445  &&  this.$store.getters.xt_user.template_info.org_id!= 10495 &&  this.$store.getters.xt_user.template_info.org_id!= 10597  &&  this.$store.getters.xt_user.template_info.org_id!= 10599  &&  this.$store.getters.xt_user.template_info.org_id!= 10612  &&  this.$store.getters.xt_user.template_info.org_id!= 10617  &&  this.$store.getters.xt_user.template_info.org_id!= 10702  &&  this.$store.getters.xt_user.template_info.org_id!= 10697 &&  this.$store.getters.xt_user.template_info.org_id!= 10635 &&  this.$store.getters.xt_user.template_info.org_id!= 10721 &&  this.$store.getters.xt_user.template_info.org_id!= 10727&&  this.$store.getters.xt_user.template_info.org_id!= 10751 &&  this.$store.getters.xt_user.template_info.org_id!= 10752 &&  this.$store.getters.xt_user.template_info.org_id!= 10742 && this.$store.getters.xt_user.template_info.org_id!= 10757&& this.$store.getters.xt_user.template_info.org_id!= 9779"  >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

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

@@ -49,7 +49,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): " :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')"
-              v-if="(this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10693  || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727|| this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10757) && this.$store.getters.xt_user.template_info.org_id != 10624"  >
+              v-if="(this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10693  || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727|| this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10757|| this.$store.getters.xt_user.template_info.org_id == 9779) && this.$store.getters.xt_user.template_info.org_id != 10624"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')">

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

@@ -387,7 +387,7 @@
                 org_id == 10599 || 
                 org_id == 10612 ||
                 org_id == 10617 ||
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id == 10740 || org_id == 10742|| org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766) &&
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id == 10740 || org_id == 10742|| org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766 || org_id==9779) &&
                 org_id!=10387
             "
           >
@@ -458,7 +458,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766 && org_id!=9779)
               || org_id == 10387
             "
           >
@@ -529,7 +529,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id ==10702 || org_id ==10740 || org_id == 10742 || org_id == 10745||org_id ==10751 || org_id == 10752 || org_id == 10757 || org_id == 10766)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id ==10702 || org_id ==10740 || org_id == 10742 || org_id == 10745||org_id ==10751 || org_id == 10752 || org_id == 10757 || org_id == 10766 || org_id == 9779)
                 && org_id!=10387
             "
           >
@@ -584,7 +584,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740&& org_id!=10742&& org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740&& org_id!=10742&& org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766&& org_id!=9779) ||
               org_id == 10387
             "
           >
@@ -800,7 +800,8 @@
                 org_id == 10395 ||
                 org_id == 10206 ||
                 org_id == 10751 ||
-                org_id == 10752 
+                org_id == 10752 ||
+                org_id == 9779 
                 )
             "
           >
@@ -837,7 +838,8 @@
               org_id!=10395  &&
               org_id!=10206 &&
               org_id!=10751 &&
-              org_id!=10752
+              org_id!=10752 &&
+              org_id!=9779
             "
           >
             <template slot-scope="scope">
@@ -2014,7 +2016,7 @@
             :span="8"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id ==10644 || org_id == 10721 || org_id ==10727 || org_id ==10206 || org_id == 10731 || org_id == 10744 || org_id == 10766 || org_id == 10768) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id ==10644 || org_id == 10721 || org_id ==10727 || org_id ==10206 || org_id == 10731 || org_id == 10744 || org_id == 10766 || org_id == 10768 || org_id == 9779) &&
               org_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -2032,7 +2034,8 @@
               org_id!=10395 &&
               org_id!=10414 &&
               org_id!=10751 &&
-              org_id!=10752
+              org_id!=10752 
+             
             "
           >
             <el-form-item label="置换量(L)：" :prop="isName('置换量')"
@@ -2063,7 +2066,7 @@
                 org_id ==10432 ||
                 org_id ==10445 ||
                 org_id == 10395 || org_id == 10751 || org_id == 10752) &&
-                org_id!=10694 && org_id!=10697 && org_id!=10721 && org_id!=10727 && org_id!=10744
+                org_id!=10694 && org_id!=10697 && org_id!=10721 && org_id!=10727 && org_id!=10744 && org_id!=9779
             "
           >
             <el-form-item label="置换量(ml)：" :prop="isName('置换量')"

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -20,11 +20,11 @@
           <th v-if="isShow('血流量1')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('跨膜压1')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 || this.$store.getters.xt_user.template_info.org_id == 10766) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 &&this.$store.getters.xt_user.template_info.org_id!=10742 &&this.$store.getters.xt_user.template_info.org_id!=10740 &&this.$store.getters.xt_user.template_info.org_id!=10745 || this.$store.getters.xt_user.template_info.org_id == 10757" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752&& this.$store.getters.xt_user.template_info.org_id!=10766) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471 ||   this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10757"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 || this.$store.getters.xt_user.template_info.org_id == 10766) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 &&this.$store.getters.xt_user.template_info.org_id!=10742 &&this.$store.getters.xt_user.template_info.org_id!=10740 &&this.$store.getters.xt_user.template_info.org_id!=10745 || this.$store.getters.xt_user.template_info.org_id == 10757 || this.$store.getters.xt_user.template_info.org_id == 9779" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752&& this.$store.getters.xt_user.template_info.org_id!=10766&& this.$store.getters.xt_user.template_info.org_id!=9779) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471 ||   this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10757"  width="76px"> 超滤量(L) </th>
           <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10757|| this.$store.getters.xt_user.template_info.org_id == 10766) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 && this.$store.getters.xt_user.template_info.org_id!=10740 && this.$store.getters.xt_user.template_info.org_id!=10742&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752&& this.$store.getters.xt_user.template_info.org_id!=10766&& this.$store.getters.xt_user.template_info.org_id!=10757 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10757|| this.$store.getters.xt_user.template_info.org_id == 10766|| this.$store.getters.xt_user.template_info.org_id == 9779) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 && this.$store.getters.xt_user.template_info.org_id!=10740 && this.$store.getters.xt_user.template_info.org_id!=10742&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752&& this.$store.getters.xt_user.template_info.org_id!=10766&& this.$store.getters.xt_user.template_info.org_id!=10757 && this.$store.getters.xt_user.template_info.org_id!=9779) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('钠浓度1')" width="92px">钠浓度(mmol/L)</th>
@@ -34,8 +34,8 @@
           <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702 && org_id !=10721 && org_id !=10727 && org_id !=10206 && org_id!=10751&& org_id!=10752 && org_id!=10766) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换率1')" width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10731 && org_id!=10744 && org_id!=10766&& org_id!=10768" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445  && this.$store.getters.xt_user.template_info.org_id != 10751&& this.$store.getters.xt_user.template_info.org_id != 10752) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567 || org_id == 10644 || org_id == 10731 || org_id == 10744 || org_id == 10766 || org_id == 10768" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 9779 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10731 && org_id!=10744 && org_id!=10766&& org_id!=10768" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445  && this.$store.getters.xt_user.template_info.org_id != 10751&& this.$store.getters.xt_user.template_info.org_id != 10752&& this.$store.getters.xt_user.template_info.org_id != 9779) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567 || org_id == 10644 || org_id == 10731 || org_id == 10744 || org_id == 10766 || org_id == 10768" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('置换量1')" width="92px"  > 置换量(L)  </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if=" isShow('SpO₂') && org_id == 9829" width="92px" > SpO₂(%) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1627,14 +1627,24 @@
                             <span v-if="org_id != 10644 && org_id != 0">{{ monitor.ultrafiltration_rate ?
                               monitor.ultrafiltration_rate : "" }}</span>
                             <span v-if="org_id == 10644">
-                              <span v-if="monindex == 0">{{ monitor.ultrafiltration_volume ?
-                                monitor.ultrafiltration_volume : "0" }}</span>
-                              <span v-if="monindex == monitors.length - 1">{{ monitor.ultrafiltration_volume ?
-                                monitor.ultrafiltration_volume : "" }}</span>
-                              <span v-if="(monindex != monitors.length - 1 && monindex != 0)">{{
-                                monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</span>
-                                <!-- {{ monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:"" }} -->
-                            </span>
+                              <span v-if="monitor.patient_id == 39872 && monitor.monitoring_date == 1747670400">
+                                 <span v-if="monindex == 1">
+                                      0
+                                 </span>
+                                 <span v-if="monindex != 1">
+                                  {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
+                                 </span>
+                              </span>
+                              <span v-if="monitor.patient_id!=39872 && monitor.monitoring_date!=1747670400">
+                                  <span v-if="monindex == 0">{{ monitor.ultrafiltration_volume ?
+                                  monitor.ultrafiltration_volume : "0" }}</span>
+                                  <span v-if="monindex == monitors.length - 1">{{ monitor.ultrafiltration_volume ?
+                                    monitor.ultrafiltration_volume : "" }}</span>
+                                  <span v-if="(monindex != monitors.length - 1 && monindex != 0)">{{
+                                    monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</span>
+                                </span>
+                              </span>
+                             
                           </td>
                           <td v-if="
                             (prescription.mode_id == 2 ||

src/xt_pages/stock/detail/stockInDetail.vue

@@ -320,7 +320,7 @@
       <!-- 操作按钮区域 -->
       <div class="operation-buttons" style="margin-bottom: 10px;">
         <el-button type="primary" @click="toGoodPrint">打印</el-button>
-        <!-- <el-button type="primary" @click="toPrint">导出</el-button> -->
+        <el-button type="primary" @click="toExportList">导出</el-button>
       </div>
       
       <!-- 表格区域 -->
@@ -407,7 +407,7 @@
 
         <el-table-column prop="purchasePrice" label="经销商" width="100" align="center">
           <template slot-scope="scope">
-             {{getDealerName(scope.row.dealer_name) }}
+             {{getDealerName(scope.row.dealer) }}
           </template>
         </el-table-column>
 
@@ -708,7 +708,9 @@ export default {
            }
         } 
       }
+      
       console.log("打印数据=====",this.printData)
+
     },
     BatchPrintAction(){
       this.dialogVisible = true
@@ -764,8 +766,11 @@ export default {
       getGoodWarehosueInPrintList(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-
+          this.tablePrintData = []
           this.tablePrintData = list
+
+          this.printData = []
+          this.printData = list
           var manufacturerList = response.data.data.manufacturerList
           this.manufacturerList = []
           this.manufacturerList = manufacturerList
@@ -1493,6 +1498,51 @@ export default {
        this.houseList = []
        this.GetCancelStock()
        this.getGoodDetailPrintList()
+     },
+     toExportList(){
+
+      
+        
+       
+        if(this.printData!=null && this.printData.length>0){
+           for(let i=0;i<this.printData.length;i++){
+              this.printData[i].index = i+1
+              this.printData[i].directory_code = this.getSocialSecurityDirectoryCode(this.printData[i].good_id)
+              this.printData[i].good_name = this.getGoodName(this.printData[i].good_id)
+              this.printData[i].specification_name = this.getSpecificationName(this.printData[i].good_id)
+              this.printData[i].packing_unit =  this.getPackingUnit(this.printData[i].good_id)
+
+              this.printData[i].product_date_name =  this.getTime(this.printData[i].product_date)
+              this.printData[i].expiry_date_name =  this.getTime(this.printData[i].expiry_date)
+
+              this.printData[i].manufacturer_name  = this.getManufactuerName(this.printData[i].manufacturer) 
+
+              this.printData[i].dealer_name =this.getDealerName(this.printData[i].dealer) 
+
+              this.printData[i].ctime_name = this.getTime(this.printData[i].ctime)
+
+              this.printData[i].total_price = (this.printData[i].price * this.printData[i].warehousing_count).toFixed(2)
+           }
+        }
+
+      
+
+      
+        import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['序号','医保编码', '耗材名称','耗材规格','单位', '批号','生产日期','有效日期','进货单价','入库数量','入库金额','零售价','生产厂家','经销商','入库时间','备注']
+        const filterVal = ['index','directory_code', 'good_name','specification_name','packing_unit', 'number','product_date_name','expiry_date_name','price','warehousing_count','total_price','packing_price','manufacturer_name','dealer_name','ctime_name','remark']
+
+
+        const data = this.formatJson(filterVal, this.printData)
+
+
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '耗材入库明细'
+          })
+            this.downloadLoading = false
+        })
      }
   }
 };

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

@@ -352,7 +352,7 @@
       <!-- 操作按钮区域 -->
       <div class="operation-buttons" style="margin-bottom: 10px;">
         <el-button type="primary" @click="toGoodPrint">打印</el-button>
-        <!-- <el-button type="primary" @click="toPrint">导出</el-button> -->
+        <el-button type="primary" @click="toExportList">导出</el-button> 
       </div>
       
       <!-- 表格区域 -->
@@ -593,7 +593,6 @@ export default {
   },
   methods: {
     getGoodCode(val){
-      console.log("val-----",val)
       var newArr = []
       var total = 0
       if(val!=undefined){
@@ -693,9 +692,12 @@ export default {
            } 
 
            this.tablePrintData = []
-           console.log("drugInfo==========",drugInfo)
+           
            this.tablePrintData = drugInfo
 
+           this.printData = []
+           this.printData = drugInfo
+
           
          }
       })
@@ -941,7 +943,7 @@ export default {
             ctime:"",
             total_price:total_price.toFixed(2),
           });
-          console.log("drugInOrder232332322323233232322332322332",drugInOrder)
+         
           this.cancelStockDate = drugInOrder
            let objInfo = {}
           drugInOrder.forEach((item,index)=>{
@@ -1006,6 +1008,7 @@ export default {
             var list = response.data.data.list
             this.tabelePrintList = []
             this.tabelePrintList = list
+          
             this.manufacturerList = response.data.data.manufacturerList
             this.dealerList = response.data.data.dealerList
           }   
@@ -1148,6 +1151,35 @@ export default {
        this.houseList = []
        this.getlist()
        this.getDrugWarehouseInfoPrint()
+     },
+     toExportList(){
+
+      if(this.printData!=null && this.printData.length>0){
+           for(let i=0;i<this.printData.length;i++){
+              this.printData[i].index = i+1
+    
+              this.printData[i].product_date_name =  this.getTime(this.printData[i].product_date)
+              this.printData[i].expiry_date_name =  this.getTime(this.printData[i].expiry_date)
+
+              this.printData[i].ctime_name = this.getTime(this.printData[i].ctime)
+
+              this.printData[i].total_price = (this.printData[i].price * this.printData[i].warehousing_count).toFixed(2)
+           }
+        }
+
+        import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['序号','医保编码', '药品名称','药品规格','入库数量','单位','进货单价','入库金额','零售价','批号','生产日期','有效日期','生产厂家','经销商','入库时间','备注']
+        const filterVal = ['index','social_security_directory_code', 'drug_name','specification_name','warehousing_count','max_unit','price','total_price','retail_price','batch_number','product_date_name','expiry_date_name','manufacturer_name','dealer_name','ctime_name','remark']
+
+        const data = this.formatJson(filterVal, this.printData)
+         
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '药品入库明细'
+          })
+            this.downloadLoading = false
+        })
      }
   }
 };

src/xt_pages/user/components/PatientDetail.vue

@@ -193,7 +193,7 @@
                 </el-form-item>
               </el-col>
 
-            <el-col :span="8">
+            <!-- <el-col :span="8" >
               <el-form-item label="本人电话: " class="is-required">
                 <el-input
                   v-model="form.phone"
@@ -201,7 +201,24 @@
                   disabled
                 ></el-input>
               </el-form-item>
-            </el-col>
+            </el-col> -->
+            <el-col :span="8" :style="isEdit ? 'width:360px' : ''" v-if="org_id!=10138 && org_id!=10278 && org_id!=10537 && org_id!=10610 && org_id!=0">
+                <el-form-item
+                  label="本人电话 : "
+                  prop="phone"
+                >
+                  <el-input v-model="form.phone" maxlength="20" disabled></el-input>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''" v-if="(org_id==10138 || org_id==10278 || org_id==10537 || org_id==10610) && is_show == true">
+                <el-form-item
+                  label="本人电话 : "
+                  prop="phone"
+                >
+                  <el-input v-model="form.phone" maxlength="20" disabled></el-input>
+                </el-form-item>
+              </el-col>
             <el-col :span="8">
               <el-form-item label="家属姓名: ">
                 <el-input
@@ -211,7 +228,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <!-- <el-col :span="8">
               <el-form-item label="家属电话: ">
                 <el-input
                   v-model="form.homeTelephone"
@@ -219,7 +236,28 @@
                   disabled
                 ></el-input>
               </el-form-item>
-            </el-col>
+            </el-col> -->
+
+            <el-col :span="8" :style="isEdit ? 'width:360px' : ''" v-if="org_id!=10138 && org_id!=10278 && org_id!=10537 && org_id!=10610 && org_id!=0">
+                <el-form-item label="家属电话 : ">
+                  <el-input
+                    v-model="form.homeTelephone"
+                    maxlength="20"
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+
+
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''" v-if="(org_id==10138 || org_id==10278  || org_id==10537 || org_id==10610 || org_id==0) && is_show == true">
+                <el-form-item label="家属电话 : ">
+                  <el-input
+                    disabled
+                    v-model="form.homeTelephone"
+                    maxlength="20"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
 
 
             <el-col :span="6">
@@ -1802,6 +1840,7 @@ export default {
       patientType: [{ value: 1, label: "血透患者" }, { value: 2, label: "慢病患者" }, { value: 3, label: "会员患者" },{ value: 4, label: "腹透患者" },{ value: 5, label: "CKD患者" },{ value: 6, label: "其他患者" }],
       fileList:[],
       guploading:false,
+      is_show:true,
     };
   },
   computed: {
@@ -1944,13 +1983,23 @@ export default {
     },
 
     fetchPatient(id) {
-      fetchPatient(id)
-        .then((response) => {
+      fetchPatient(id).then((response) => {
           console.log(response.data.data);
           if (response.data.state === 1) {
+            
             this.$emit("tran-patient-info", response.data.data.patient);
             var patietInfo = response.data.data.patient;
             this.patientVascularAccessOne = response.data.data.patientVascularAccessOne
+            var viewModels = response.data.data.viewModels
+            var is_sub_super_admin = false
+            var user_id = this.$store.getters.xt_user.user.id
+            this.is_show = false
+            for(let i=0;i<viewModels.length;i++){
+              if(user_id == viewModels[i].user_id){
+                  is_sub_super_admin = is_sub_super_admin
+              }
+            }
+            this.is_show = is_sub_super_admin
             console.log("触发了吗无222222", patietInfo);
             this.form.avatar = patietInfo.avatar;
             this.form.name = patietInfo.name;

src/xt_pages/user/components/PatientForm.vue

@@ -1880,7 +1880,9 @@ export default {
               this.form.patient_source = 1
             }
 
-
+            if(this.form.nurse == "NaN"){
+              this.form.nurse = 0
+            }
 
             if(this.form.avatar.indexOf('?imageView2/2/w/500/h/500/q/90')!=-1){
                this.form.avatar = this.form.avatar
@@ -2093,6 +2095,9 @@ export default {
         .then(response => {
           if (response.data.state == 1) {
 
+          
+            this.$emit("tran-patient-info", response.data.data.patient);
+            var patietInfo = response.data.data.patient;
             var viewModels = response.data.data.viewModels
             var is_sub_super_admin = false
             var user_id = this.$store.getters.xt_user.user.id
@@ -2104,8 +2109,6 @@ export default {
               }
             }
             this.is_show = is_sub_super_admin
-            this.$emit("tran-patient-info", response.data.data.patient);
-            var patietInfo = response.data.data.patient;
             this.fileList = []
             var arrNew = []
             if(patietInfo.org_logo!=""){