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

.gitignore

@@ -8,3 +8,4 @@ dist/
 .idea/modules.xml
 .idea/vcs.xml
 .idea/workspace.xml
+.DS_Store

src/router/modules/dialysis.js

@@ -328,6 +328,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/thirtyTwo',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_thirtyTwo',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/twentyTwo_one',
       component: () =>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -209,6 +209,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 32">
+        <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">
@@ -775,8 +785,10 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/twenty" });
       } else if (this.template_id == 22) {
         this.$router.push({ path: "/dialysis/print/batch/twentyTwo" });
-      }else if (this.template_id == 30) {
+      } else if (this.template_id == 30) {
         this.$router.push({ path: "/dialysis/print/batch/thirty" });
+      } else if (this.template_id == 32) {
+        this.$router.push({ path: "/dialysis/print/batch/thirtyTwo" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -113,7 +113,7 @@
                 <tbody>
                   <tr>
                     <td width="70">入科方式:</td>
-                    <td width="190">
+                    <td width="240">
                       <div>
                         <label-box style="margin-left:15px;" v-for="(item, index) in way_arr" :key="index" :isChecked="receiverTreatmentAccess.way == item.id ? true : false" :showValue="item.name"></label-box>
                         <!--&nbsp-->
@@ -127,7 +127,7 @@
 
                     <td width='20'></td>
                     <td width="50">意识:</td>
-                    <td width="140">
+                    <td width="240">
                       <div style="display:flex;">
                         <label-box style="margin-left:15px;" v-for="(item, index) in consciousness_arr" :key="index" :isChecked="receiverTreatmentAccess.consciousness == item.id ? true : false" :showValue="item.name"></label-box>
 
@@ -143,31 +143,7 @@
                         <!--showValue='模糊'></label-box>-->
                       </div>
                     </td>
-                    <td width="40">出血:</td>
-                    <td width="40">
-                      <div>
-                        <label-box :isChecked="predialysis.is_hemorrhage == 2 ? true : false" showValue="无"></label-box>
-                      </div>
-                    </td>
-                    <td width="200">
-                      <div>
-                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('牙龈出血') > -1 ? true : false" showValue="牙龈出血"></label-box>
-                        &nbsp;
-                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('瘀斑') > -1 ? true : false" showValue="瘀斑"></label-box>
-                        &nbsp;
-                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('经期') > -1 ? true : false" showValue="经期"></label-box>
-                        
-                        
-                      </div>
-                    </td>
-                    <td width="50">
-                      <div>
-                        <label-box :isChecked="predialysis.hemorrhage_other != '' ? true : false" showValue="其他"></label-box>
-                      </div>
-                    </td>
-                    <td width="100">
-                        <div class="under-line">&nbsp;{{ predialysis.hemorrhage_other ? predialysis.hemorrhage_other : '' }}</div>
-                    </td>
+                    
                     <td></td>
                   </tr>
                 </tbody>
@@ -188,7 +164,7 @@
                     </td>
                     <td width='40'>针眼:</td>
                     <td width='10'>A</td>
-                    <td width='120'>
+                    <td width='70'>
                         <div class="under-line">&nbsp;
                             <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('A1')>-1">A1,</span>
                             <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('A2')>-1">A2,</span>
@@ -199,7 +175,7 @@
                         </div>
                     </td>
                     <td width='10'>V</td>
-                    <td width='120'>
+                    <td width='70'>
                         <div class="under-line">&nbsp;
                             <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('V1')>-1">V1,</span>
                             <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('V2')>-1">V2,</span>
@@ -209,21 +185,31 @@
                             <span v-if="predialysis.pinholing && predialysis.pinholing.indexOf('V6')>-1">V6</span>
                         </div>
                     </td>
-                    <td width='80'>内瘘位置：</td>
-                    <td width="280">
+                    <td width="40">出血:</td>
+                    <td width="40">
                       <div>
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-左') > -1 ? true : false) : false" showValue="左"></label-box>
-                        &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-右') > -1 ? true : false) : false" showValue="右"></label-box>
-                        &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-前臂') > -1 ? true : false) : false" showValue="前臂"></label-box>
-                        &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-上臂') > -1 ? true : false) : false" showValue="上臂"></label-box>
+                        <label-box :isChecked="predialysis.is_hemorrhage == 2 ? true : false" showValue="无"></label-box>
+                      </div>
+                    </td>
+                    <td width="200">
+                      <div>
+                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('牙龈出血') > -1 ? true : false" showValue="牙龈出血"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-下肢') > -1 ? true : false) : false" showValue="下肢"></label-box>
+                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('瘀斑') > -1 ? true : false" showValue="瘀斑"></label-box>
                         &nbsp;
+                        <label-box :isChecked="predialysis.is_hemorrhage == 1 && predialysis.hemorrhage.indexOf('经期') > -1 ? true : false" showValue="经期"></label-box>
+                        
+                        
+                      </div>
+                    </td>
+                    <td width="50">
+                      <div>
+                        <label-box :isChecked="predialysis.hemorrhage_other != '' ? true : false" showValue="其他"></label-box>
                       </div>
                     </td>
+                    <td width="100">
+                        <div class="under-line">&nbsp;{{ predialysis.hemorrhage_other ? predialysis.hemorrhage_other : '' }}</div>
+                    </td>
                     <td></td>
                   </tr>
                 </tbody>
@@ -254,6 +240,21 @@
                         <label-box :isChecked="predialysis.internal_fistula_skin.indexOf('红肿') > -1 ? true : false" showValue="红肿"></label-box>
                       </div>
                     </td>
+                    <td width='80'>内瘘位置：</td>
+                    <td width="280">
+                      <div>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-左') > -1 ? true : false) : false" showValue="左"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-右') > -1 ? true : false) : false" showValue="右"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-前臂') > -1 ? true : false) : false" showValue="前臂"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-上臂') > -1 ? true : false) : false" showValue="上臂"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('内瘘-下肢') > -1 ? true : false) : false" showValue="下肢"></label-box>
+                        &nbsp;
+                      </div>
+                    </td>
                     <td></td>
                   </tr>
                 </tbody>
@@ -312,15 +313,15 @@
                     <td width='40'>位置</td>
                     <td width="280">
                       <div>
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('置管-左') > -1 ? true : false) : false" showValue="左"></label-box>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('置管-左') > -1 ? true : false) : false" showValue="左"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('置管-右') > -1 ? true : false) : false" showValue="右"></label-box>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('置管-右') > -1 ? true : false) : false" showValue="右"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('置管-颈内') > -1 ? true : false) : false" showValue="颈内"></label-box>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('置管-颈内') > -1 ? true : false) : false" showValue="颈内"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('置管-股V') > -1 ? true : false) : false" showValue="股V"></label-box>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('置管-股V') > -1 ? true : false) : false" showValue="股V"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.blood_access_part_id ? (QueryPartById(predialysis.blood_access_part_id).indexOf('置管-锁骨下') > -1 ? true : false) : false" showValue="锁骨下"></label-box>
+                        <label-box :isChecked="predialysis.blood_access_part_id ? (predialysis.blood_access_part_id.indexOf('置管-锁骨下') > -1 ? true : false) : false" showValue="锁骨下"></label-box>
                         &nbsp;
                       </div>
                     </td>
@@ -428,7 +429,7 @@
                         <label-box :isChecked="predialysis.edema && predialysis.edema.indexOf('无') > -1 ? true : false" showValue="无"></label-box>
                     </td>
                     <td width='30'>
-                        <label-box :isChecked="predialysis.edema && getEdema(predialysis.edema) != '' ? true : false" showValue=""></label-box>
+                        <label-box :isChecked="predialysis.edema && predialysis.edema.indexOf('无') == -1 ? true : false" showValue=""></label-box>
                     </td>
                     <td width='80'>
                         <div class="under-line">&nbsp;{{ predialysis.edema ? getEdema(predialysis.edema) : '' }}</div>
@@ -600,10 +601,9 @@
                             </td>
                             <td width='60'>
                                 <div class="under-line">
-                                    &nbsp;<span v-if="prescription.anticoagulant == 6">{{ prescription.anticoagulant_zongliang }}</span>
+                                    &nbsp;
                                 </div>
                             </td>
-                            <td width='10'>IU</td>
                             <td width='10'>(</td>
                             <td width='40'>首剂</td>
                             <td width='50'>
@@ -626,7 +626,7 @@
                             <td width='40'>其他</td>
                             <td width='100'>
                                 <div class="under-line">&nbsp;
-                                    <span v-if="prescription.anticoagulant != 1 && prescription.anticoagulant != 2 && prescription.anticoagulant != 6">
+                                    <span v-if="prescription.anticoagulant != 1 && prescription.anticoagulant != 2 && prescription.anticoagulant != 3 && prescription.anticoagulant != 6">
                                         {{ prescription.anticoagulant_name }}
                                     </span>
                                 </div>
@@ -1466,6 +1466,7 @@ export default {
               newStr += item + ','
             }
           })
+          
           return newStr.substring(0, newStr.length - 1)
         }
       }