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

src/router/modules/dialysis.js

@@ -1106,6 +1106,19 @@ export default {
         noCache: true
       }
     },
+    {//80
+      path: '/dialysis/print/batch/eighty',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_eighty'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_eighty',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
+    
     {
       path: '/dialysis/flow',
       component: () => import('@/xt_pages/dialysis/dialysisFlow'),

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1208,8 +1208,8 @@
                               : "/"
                           }}
                         </div>
-                        <span v-if="org_id!=10598"> ml</span>
-                        <span v-if="org_id==10598"> L</span>
+                        <span v-if="org_id!=10598 && org_id!=10471"> ml</span>
+                        <span v-if="org_id==10598 || org_id ==10471"> L</span>
                       </div>
                       <div class="inline_block" style="flex: 1">
                         干体重：
@@ -1406,11 +1406,14 @@
                         <span v-if="record.prescription.anticoagulant == 15"
                           >mg</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 14"
+                          >iu</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 16"
                           >mg</span
                         >
                         <span v-if="record.prescription.anticoagulant == 17"
-                          >mg</span
+                          >iu</span
                         >
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
@@ -1473,6 +1476,9 @@
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg/h</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 14"
+                          >iu/h</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 15"
                           >mg/h</span
                         >
@@ -1480,7 +1486,7 @@
                           >mg/h</span
                         >
                         <span v-if="record.prescription.anticoagulant == 17"
-                          >mg/h</span
+                          >iu/h</span
                         >
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
@@ -1523,6 +1529,9 @@
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg</span
                         >
+                        <span v-if="record.prescription.anticoagulant == 14"
+                          >iu</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 15"
                           >mg</span
                         >
@@ -1530,7 +1539,7 @@
                           >mg</span
                         >
                         <span v-if="record.prescription.anticoagulant == 17"
-                          >mg</span
+                          >iu</span
                         >
                       </div>
                       <div class="inline_block" style="margin-left: 20px">
@@ -1728,7 +1737,10 @@
                           </td>
                           <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</td>
                           <td width="50" v-if=" org_id ==0 || org_id ==10489">超滤率<br />(ml/h)</td>
-                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683">超滤量<br />(ml)</td>
+                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683">超滤量<br />
+                            <span v-if="org_id!=10471"> (ml)</span>
+                            <span v-if="org_id==10471">L</span>
+                          </td>
                           <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0">超滤率<br />(ml/h)</td>
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -519,6 +519,26 @@
           type="primary"
           >批量打印</el-button>
       </template>
+      <!-- this.org_id == 10206 || this.org_id ==0 || this.org_id==9671 -->
+      <!-- <template v-if="this.template_id == 80">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印80</el-button>
+      </template> -->
+      <template v-if="(this.org_id == 10206 || this.org_id ==0)&& this.template_id == 80">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button>
+      </template>
+
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -1892,7 +1912,7 @@ export default {
     // this.template_id = this.$store.getters.xt_user.template_info.template_id;
   },
   methods: {
-   
+
     printOrder(){
       this.$router.push({ path: "/dialysis/dialysisRecordPrint",query:{page:this.listQuery.page,limit:this.listQuery.limit,schedul_type:this.listQuery.schedul_type,partition_type:this.listQuery.partition_type,schedul_time:this.listQuery.schedul_time,keywords:this.listQuery.keywords,start_time:this.listQuery.start_time,end_time:this.listQuery.end_time}} );
     },
@@ -1902,9 +1922,15 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          var template = response.data.data.template;
-          this.template_id = template.template_id;
-          console.log("templage-i233232323232322323233232323223",this.template_id)
+          if(this.org_id == 10206 || this.org_id ==0){
+            this.template_id = 80
+            console.log("templage-i233232323232322323233232323223",this.template_id)
+          }else{
+            var template = response.data.data.template;
+            this.template_id = template.template_id;
+            
+          }
+          
         }
       });
     },
@@ -2701,6 +2727,7 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/fortyThree" });
       } else if (this.template_id == 48) {
         this.$router.push({ path: "/dialysis/print/batch/fortyeight" });
+        // this.$router.push({ path: "/dialysis/print/batch/eight" });
       }else if (this.template_id == 51) {
         this.$router.push({ path: "/dialysis/print/batch/fiftyOne" });
       }else if (this.template_id == 53) {
@@ -2741,6 +2768,9 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/seventyeight" });
       }else if (this.template_id == 79) {
         this.$router.push({ path: "/dialysis/print/batch/seventynine" });
+      }else if ((this.org_id == 10206 || this.org_id ==0)&& this.template_id == 80) {
+        //  this.template_id == 80
+        this.$router.push({ path: "/dialysis/print/batch/eighty" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -20,8 +20,8 @@
           <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!=10387 " 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 == 10387"  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!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 " 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 == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471"  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!=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==10387" width="50px"> 超滤率 <br />(L/h) </th>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -988,7 +988,7 @@
         >
         </div>
       </template>
-      <template v-if="org_template_info.template_id == 80">
+      <template v-if="org_template_info.template_id == 80 && (org_id == 10206 || org_id == 0)">
         <div>
           <el-button
           :loading="loading"
@@ -1000,6 +1000,20 @@
         >
         </div>
       </template>
+
+      <!-- <template v-if="org_id == 10206 || org_id ==0 || org_id==9671 ">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template> -->
+      
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1522,8 +1536,11 @@
           </DialysisPrintOrderSeventynine>
 
           <DialysisPrintOrdereighty v-bind:childResponse="childResponse"
-            v-if="org_template_info.template_id == 80">
+            v-if="org_template_info.template_id == 80 && (org_id == 10206 || org_id == 0)">
           </DialysisPrintOrdereighty>
+          <!-- <DialysisPrintOrdereighty v-bind:childResponse="childResponse"
+            v-if="org_id == 10206 || org_id == 0 || org_id==9671">
+          </DialysisPrintOrdereighty> -->
         </div>
       </el-container>
     </div>
@@ -1835,6 +1852,7 @@ export default {
       zone_options: [{ id: 0, text: "全部" }],
       zoneVal: 0,
       x_tdate:'',
+      org_id:'',
     };
   },
   methods: {
@@ -2417,7 +2435,9 @@ export default {
           style: style4,
           scanStyles: false,
         });
-      }else if (this.org_template_info.template_id == 80) {
+      }
+      else if (this.org_template_info.template_id == 80 && (this.org_id == 10206 || this.org_id ==0)) {
+        console.log('this.org_template_info.template_id == 80',this.org_template_info.template_id);
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",
@@ -2425,6 +2445,14 @@ export default {
           scanStyles: false,
         });
       }
+      // else if (this.org_id == 10206 || this.org_id ==0 || org_id==9671) {
+      //   printJS({
+      //     printable: "dialysis-print-box-1",
+      //     type: "html",
+      //     style: style2,
+      //     scanStyles: false,
+      //   });
+      // }
        else if (this.org_template_info.template_id == 199 ) {
         printJS({
           printable: "dialysis-print-box-1",
@@ -2626,7 +2654,6 @@ export default {
     },
     getDialysisRecord() {
       this.loading = true;
-
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.childResponse = response;
@@ -2634,10 +2661,17 @@ export default {
           this.date = response.data.data.patientInfo.DialysisSchedule.schedule_date
           this.patient_id = response.data.data.patientInfo.DialysisSchedule.patient_id
           this.patient_name = response.data.data.patientInfo.name
-          console.log('kkkkkkk222222',this.org_template_info);
+          
+          // this.org_template_info.template_id= response.data.data.org_template_info.template_id
           // console.log('this.org_template_info是数据',response.data.data.org_template_info.template_id);
-          this.org_template_info = response.data.data.org_template_info;
-           this.org_template_info.template_id= response.data.data.org_template_info.template_id
+          if(this.org_id !=10206 &&this.org_id !=0){
+            this.org_template_info.template_id= response.data.data.org_template_info.template_id
+            this.org_template_info = response.data.data.org_template_info;
+          }else{
+            this.org_template_info = response.data.data.org_template_info;
+            this.org_template_info.template_id= 80
+          }
+          console.log('kkkkkkk222222',this.org_template_info);
           this.loading = false;
           //   this.adminUser = response.data.data.users
           //   this.users = response.data.data.users
@@ -3294,6 +3328,7 @@ export default {
     },
   },
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id
     // console.log("this.$store.getters.xt_user.org.id",this.$store.getters.xt_user.org.id)
     var schedule_type_selected = this.$store.getters.schedule_type_selected;
     var zone_selected = this.$store.getters.zone_selected;
@@ -3357,7 +3392,6 @@ export default {
       this.queryParams.xtdate = xtdate;
       this.queryParams.xtno = xtno;
       this.queryParams.patient_id = patient_id
-      // console.log('wwwwww121212',this.org_template_info.template_id);
       this.getDialysisRecord();
     } else {
       this.$message.error("参数不齐");

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1444,7 +1444,11 @@
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
-                      <span v-if="prescription.anticoagulant == 14">mg</span>
+                      <span v-if="prescription.anticoagulant == 14">
+                       <span v-if="org_id!=10644">mg</span> 
+                       <span v-if="org_id==10644">iu</span> 
+                      </span>
+                      <span v-if="prescription.anticoagulant == 17">iu</span>
                     </span>
 
                     <span v-if="org_id==9675 || org_id==10447 || org_id==9829 || org_id==10440 || org_id==10469 || org_id == 10471 || org_id == 10460">
@@ -1459,7 +1463,11 @@
                      <span v-if="prescription.anticoagulant == 10">iu</span>
                      <span v-if="prescription.anticoagulant == 11">iu</span>
                      <span v-if="prescription.anticoagulant == 13">iu</span>
-                     <span v-if="prescription.anticoagulant == 14">mg</span>
+                     <span v-if="prescription.anticoagulant == 14">
+                      <span v-if="org_id!=10644">mg</span> 
+                      <span v-if="org_id==10644">iu</span> 
+                     </span>
+                     <span v-if="prescription.anticoagulant == 17">iu</span>
 
                     </span>
                     </div>
@@ -1501,7 +1509,11 @@
                         <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg/h</span>
                         <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                           <span v-if="prescription.anticoagulant == 1">mg/h</span>
-                          <span v-if="prescription.anticoagulant == 14">mg/h</span>
+                          <span v-if="prescription.anticoagulant == 14">
+                            <span v-if="org_id!=10644">mg/h</span> 
+                            <span v-if="org_id==10644">iu/h</span> 
+                          </span>
+                          <span v-if="prescription.anticoagulant == 17">iu/h</span>
                       </span>
                       <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
@@ -1515,7 +1527,11 @@
                           <span v-if="prescription.anticoagulant == 10">iu/h</span>
                           <span v-if="prescription.anticoagulant == 11">iu/h</span>
                           <span v-if="prescription.anticoagulant == 13">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 14">mg/h</span>
+                          <span v-if="prescription.anticoagulant == 14">
+                            <span v-if="org_id!=10644">mg/h</span> 
+                            <span v-if="org_id==10644">iu/h</span> 
+                          </span>
+                          <span v-if="prescription.anticoagulant == 17">iu/h</span>
                       </span>
                     </div>
                     <div
@@ -1584,7 +1600,11 @@
                       <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
                       <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
-                      <span v-if="prescription.anticoagulant == 14">mg</span>
+                      <span v-if="prescription.anticoagulant == 14">
+                        <span v-if="org_id!=10644">mg</span> 
+                        <span v-if="org_id==10644">iu</span> 
+                      </span>
+                      <span v-if="prescription.anticoagulant == 17">iu</span>
                      </span>
                     <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471|| org_id == 10460">
                        <span v-if="prescription.anticoagulant == 2">mg</span>
@@ -1598,7 +1618,11 @@
                        <span v-if="prescription.anticoagulant == 10">iu</span>
                       <span v-if="prescription.anticoagulant == 11">iu</span>
                       <span v-if="prescription.anticoagulant == 13">iu</span>
-                      <span v-if="prescription.anticoagulant == 14">mg/h</span>
+                      <span v-if="prescription.anticoagulant == 14">
+                        <span v-if="org_id!=10644">mg</span> 
+                        <span v-if="org_id==10644">iu</span> 
+                      </span>
+                      <span v-if="prescription.anticoagulant == 17">iu</span>
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px" v-if="org_id!=9675 && org_id!=10447">
@@ -1822,7 +1846,11 @@
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
                         <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</td>
                         <td width="50" v-if="org_id ==10489">超滤率<br/>(ml/h)</td>
-                        <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 10600&& org_id != 10683">超滤量<br />(ml)</td>
+                        <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 10600&& org_id != 10683">
+                          超滤量<br />
+                         <span v-if="org_id == 10471">L</span>
+                         <span v-if="org_id != 10471"> (ml)</span>
+                        </td>
                         <td width="50" v-if="org_id == 10600 || org_id ==10598 || org_id ==10683">超滤率<br/>(ml/h)</td>
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 ">累计超滤量<br />(ml)</td>
                         <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0 && org_id!=10206" width="50">

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -135,18 +135,6 @@
                       <div class="under_line" style="width: 60%; text-align: center">
                         {{predialysis.machine_type ? predialysis.machine_type : ""}}
                       </div>
-                      
-                      <!-- 透前症状：
-                      <div
-                        class="under_line"
-                        style="width: 150px; text-align: center"
-                      >
-                        {{
-                          predialysis.symptom_before_dialysis
-                            ? predialysis.symptom_before_dialysis
-                            : "/"
-                        }}
-                      </div> -->
                     </div>
                     <div class="inline_block" style="flex: 1">
                       透析机号：
@@ -302,8 +290,8 @@
                         style="width: 70px; text-align: center"
                       >
                         <span> {{
-                          prescription.displace_liqui_value
-                            ? prescription.displace_liqui_value
+                          prescription.replacement_total
+                            ? prescription.replacement_total
                             : "/"
                         }}
                         </span>
@@ -438,12 +426,8 @@
                       <div class="under_line"
                         style="width: 150px; text-align: center"
                       >
-                       {{
-                          prescription.anticoagulant_name
-                            ? prescription.anticoagulant_name
-                            : "/"
-                        }}
-                        
+                        <span v-if="prescription.anticoagulant_name== '低分子肝素钙'">低分子量肝素钙</span>
+                        <span v-if="prescription.anticoagulant_name!= '低分子肝素钙'">{{prescription.anticoagulant_name}}</span>
                       </div>
                     </div>
                     <div class="inline_block" style="flex: 1;"
@@ -459,7 +443,10 @@
                             : "/"
                         }}
                       </div>
-                      {{ getshouji(prescription.anticoagulant) }}
+                      <span v-if="prescription.anticoagulant!=''">
+                        {{ getshouji(prescription.anticoagulant) }}
+                      </span>
+                      
                     </div>
                     <div class="inline_block" style="flex: 1;">
                       追加：
@@ -472,7 +459,10 @@
                             : "0"
                         }}
                       </div>
-                      {{ getweichi(prescription.anticoagulant) }}
+                      <span v-if="prescription.anticoagulant!=''">
+                        {{ getweichi(prescription.anticoagulant) }}
+                      </span>
+                      
                     </div>
                     <div class="inline_block" style="flex: 1;"
                       v-if="prescription.anticoagulant == 5"
@@ -518,7 +508,10 @@
                             : "/"
                         }}
                       </div>
-                      {{ getzongliang(prescription.anticoagulant) }}
+                      <span v-if="prescription.anticoagulant!=''">
+                        {{ getzongliang(prescription.anticoagulant) }}
+                      </span>
+                      
                     </div>
                   </div>
 
@@ -678,7 +671,7 @@
                   </table>
                 </td>
               </tr>
-              <tr v-if="org_id!=10206">
+              <tr>
                 <td style="padding: 0; position: relative" colspan="2">
                   <table class="inside_table">
                     <tbody>
@@ -709,48 +702,32 @@
                         <td style="font-size: 16px" width="10%">时间</td>
                       </tr>
 
-                      <tr style="page-break-inside: avoid;"
-                        v-for="(advice, advice_index) in doctor_advices"
+                      <tr
+                        v-for="(advice, advice_index) in new_doctor_advice_list"
                         :key="advice_index"
                       >
                         <td height="32px">
                           <span v-if="advice.start_time">
                             {{ getTime(advice.start_time, "{h}:{i}") }}
                           </span>
-                          <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
+
                         </td>
-                        <td
-                          height="32px"
-                          colspan="2"
-                          class="advice-name"
-                          style="padding-left: 7px"
+                        <td height="32px" colspan="2"
+                          class="advice-name" style="padding-left: 7px"
                         >
-                          <span v-if="advice.parent_id > 0">---></span>
-                          <span>{{ advice.advice_name }}</span>
-                          <span v-if="advice && advice.advice_desc"
-                            >({{ advice.advice_desc
-                            }}{{ advice.drug_spec_unit }})</span
-                          >
-                          <span v-if="advice.prescribing_number"
-                            >&nbsp;&nbsp; {{ advice.prescribing_number
-                            }}{{ advice.prescribing_number_unit }}</span
-                          >
-                          <span v-if="advice.single_dose != 0"
-                            >{{ advice.single_dose
-                            }}{{ advice.single_dose_unit }}</span
-                          >
-                          <span v-if="advice.parent_id == 0">{{
-                            advice.delivery_way
-                          }}</span>
-                          <span v-if="advice.parent_id == 0">{{
-                            advice.execution_frequency
-                          }}</span>
-                          <span
-                            v-if="
-                              advice.parent_id == 0 && advice.remark.length > 0
-                            "
-                            >({{ advice.remark }})</span
-                          >
+                         <span v-for="(it,i) in advice.child" :key="i">
+                           <span v-if="it && it.advice_name">{{ it.advice_name}}</span>
+                           <span v-if="it && it.advice_desc">({{ it.advice_desc}}{{ it.drug_spec_unit }})</span>
+                           <span v-if="it.prescribing_number">{{ it.prescribing_number}}{{ it.prescribing_number_unit }}</span>
+                           <span v-if="it.single_dose != 0">{{ it.single_dose}}{{ it.single_dose_unit }}</span>
+                           <span v-if="it && it.delivery_way">{{ it.delivery_way }}</span>
+                           <span v-if="it && it.execution_frequency">{{ it.execution_frequency }}</span>
+                           <span v-if="it&& it.remark">{{ it.remark }}</span>&nbsp;&nbsp;&nbsp;
+
+                         </span>
+
+
+
                         </td>
 
                         <td height="32px">
@@ -767,8 +744,9 @@
                               v-else
                             />
                           </span>
+
                         </td>
-                     
+
                         <td height="32px">
                           <span v-if="advice!=null && advice.execution_staff>0">
                             <span
@@ -784,16 +762,72 @@
                             />
                           </span>
                         </td>
-                       
                         <td height="32px">
-                          <span>
-                             {{
-                              getTime(advice.execution_time, "{h}:{i}")
-                             }}
+                          <span v-if="advice.execution_time">{{
+                            getTime(advice.execution_time, "{h}:{i}")
+                          }}</span>
+                        </td>
+                      </tr>
+
+                      <tr
+                        v-for="(advice, advice_index) in projectsOne"
+                        :key="advice_index"
+                      >
+                        <td height="32px;padding:1px 1px" width="10%">
+                          <span v-if="advice.start_time">
+                            {{ getTime(advice.start_time, "{h}:{i}") }}
                           </span>
-              
                         </td>
-                        
+                        <td colspan="2"
+                          class="advice-name"
+                          style="
+                            letter-spacing: 5px;
+                            text-align: center;
+                            font-weight: 520;
+                            font-size: 14px;
+                            padding: 0px 8px;
+                            line-height: 30px;
+                            width: 200px;
+                          "
+                        >
+                          <span v-if="advice.type == 2"> {{advice && advice.project? advice.project.project_name: ""}} {{ advice.count }} {{ advice.unit }}</span>
+                          <span v-if="advice.type == 3"> {{advice && advice.good_info? advice.good_info.good_name: ""}} {{ advice.count }} {{ advice.unit }}</span>
+                        </td>
+                      <td height="32px">
+                        <span
+                          v-if="setAdminUserES(advice.doctor) == ''"
+                          >{{ getAdminUser(advice.doctor) }}</span
+                        >
+                        <img
+                          style="height: 30px"
+                          :src="setAdminUserES(advice.doctor)"
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </td>
+                      <td height="32px">
+                        <span
+                          v-if="
+                            setAdminUserES(advice.execution_staff) == ''
+                          "
+                          >{{
+                            getAdminUser(advice.execution_staff)
+                          }}</span
+                        >
+                        <img
+                          style="height: 30px"
+                          :src="setAdminUserES(advice.execution_staff)"
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </td>
+                        <td height="32px">
+                          <span v-if="advice.execution_time">{{
+                            getTime(advice.execution_time, "{h}:{i}")
+                          }}</span>
+                        </td>
                       </tr>
 
                     </tbody>
@@ -824,10 +858,7 @@
               </tr>
               <tr>
                 <td colspan="7">
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                  >
+                  <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                     <div class="inline_block" style="flex: 1">
                       T：
                       <div
@@ -926,9 +957,7 @@
                     </div>
                   </div>
 
-                  <div class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                  >
+                  <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                     <div class="inline_block" style="flex: 2.5">
                       透析器凝血：
                       <div
@@ -981,7 +1010,7 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                      <span v-if="org_id!=9675&&org_id!=10447">
+                      <span>
                         {{
                           afterdialysis.weight_after
                             ? parseFloat(
@@ -991,17 +1020,6 @@
                             : "/"
                         }}
                       </span>
-                      <span v-if="org_id ==9675 || org_id==10447">
-                        {{
-                          afterdialysis.weight_after
-                            ? parseFloat(
-                                afterdialysis.weight_after -
-                                  afterdialysis.additional_weight
-                              ).toFixed(1)
-                            : "未称重"
-                        }}
-                      </span>
-
                       </div>
                       kg
                     </div>
@@ -1029,14 +1047,11 @@
                     <div
                       class="inline_block"
                       style="flex: 1"
-                      v-if="org_id != 10223 && org_id!=10375 && org_id!=10598"
                     >
-                      <span v-if="org_id!=10460">
+                      <span>
                           透析中入量(L)：
                        </span>
-                      <span v-if="org_id==10460">
-                        透析中入量(ml)：
-                      </span>
+                      
                       <div
                         class="under_line"
                         style="width: 70px; text-align: center"
@@ -1067,9 +1082,7 @@
                     </div>
                   </div>
 
-                  <div class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                  >
+                  <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                     <div class="inline_block"
                       style="flex: 1; display: inline-block"
                     >
@@ -1091,9 +1104,7 @@
                       </div>
                     </div>
                   </div>
-                  <div class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                  >
+                  <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                     <div class="inline_block"
                       style="flex: 1; display: inline-block"
                     >
@@ -1150,7 +1161,7 @@
                             }}</span
                           >
                           <img
-                            style="height: 35px"
+                            style="height: 30px"
                             :src="
                               setAdminUserES(
                                 dialysisOrder == null
@@ -1318,15 +1329,17 @@
                     </div>
                     <div class="inline_block" style="flex: 1">
                        上机时间
-                      <div
-                        class="under_line"
+                      <div class="under_line"
                         style="width: 80px; text-align: center"
                       >
                         <span style="height: 30px;display: inline-block;">
                           
                         </span>
-                        {{getTime(dialysisOrder.start_time, "{y}-{m}-{d} {h}:{i}") ? 
-                        getTime(dialysisOrder.start_time, "{y}-{m}-{d} {h}:{i}") :''}}
+                        <span v-if="dialysisOrder!=null">
+                          {{getTime(dialysisOrder.start_time, "{y}-{m}-{d} {h}:{i}") ? 
+                          getTime(dialysisOrder.start_time, "{y}-{m}-{d} {h}:{i}") :''}}
+                        </span>
+                        
                       </div>
                     </div>
                     <div class="inline_block" style="flex: 1">
@@ -1336,8 +1349,11 @@
                       >
                         <span style="height: 30px; display: inline-block">
                         </span>
-                        {{ getTime(dialysisOrder.end_time, "{y}-{m}-{d} {h}:{i}") ? 
+                        <span v-if="dialysisOrder!=null">
+                          {{ getTime(dialysisOrder.end_time, "{y}-{m}-{d} {h}:{i}") ? 
                           getTime(dialysisOrder.end_time, "{y}-{m}-{d} {h}:{i}") : "0" }}
+                        </span>
+                        
 
                       </div>
                     </div>
@@ -1541,8 +1557,6 @@
                   >
                    <div v-if="org_id == 0 || org_id == 10440">
 
-
-
                     <div class="inline_block" style="flex: 1">
                       上机护士：
                       <div
@@ -3161,7 +3175,7 @@ export default {
         }
 
         //针对内蒙古阿拉善
-        if(this.org_id ==10206){
+        if(this.org_id ==10206 || this.org_id ==0){
 
           if(this.doctor_advices!=null && this.doctor_advices.length > 0){
 

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -771,6 +771,8 @@ export default {
           const params = {
             stockIn: this.recordInfo.recordData
           };
+          console.log("params---------",params)
+         
           EditDrugWarehouse(
             params,
             this.warehousing_time,

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -966,7 +966,7 @@ export default {
         if(response.data.state == 1){
           var list = response.data.data.list
           this.numberList = list
-          var lastWarehouseInfoTwo = response.data.data.lastWarehouseInfoTwo
+          // var lastWarehouseInfoTwo = response.data.data.lastWarehouseInfoTwo
         }
      })
     },