Procházet zdrojové kódy

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

XMLWAN před 4 roky
rodič
revize
e30f50d435

+ 12 - 0
src/router/modules/dialysis.js Zobrazit soubor

316
         noCache: true
316
         noCache: true
317
       }
317
       }
318
     },
318
     },
319
+    {
320
+      path: '/dialysis/print/batch/thirty',
321
+      component: () =>
322
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_thirty'),
323
+      hidden: true,
324
+      is_menu: false,
325
+      name: 'dialysis_batch_thirty',
326
+      meta: {
327
+        title: '批量打印',
328
+        noCache: true
329
+      }
330
+    },
319
     {
331
     {
320
       path: '/dialysis/print/batch/twentyTwo_one',
332
       path: '/dialysis/print/batch/twentyTwo_one',
321
       component: () =>
333
       component: () =>

Diff nebyl zobrazen, protože je příliš veliký
+ 1527 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_thirty.vue


+ 12 - 0
src/xt_pages/dialysis/bloodPresssWatch.vue Zobrazit soubor

199
           >
199
           >
200
         </div>
200
         </div>
201
       </template>
201
       </template>
202
+      <template v-if="this.template_id == 30">
203
+        <el-button
204
+          size="small"
205
+          icon="el-icon-printer"
206
+          :disabled="selecting_schs.length == 0"
207
+          @click="batchPrintAction"
208
+          type="primary"
209
+          >批量打印</el-button
210
+        >
211
+      </template>
202
     </div>
212
     </div>
203
     <div class="app-container">
213
     <div class="app-container">
204
       <!-- <div class="filter-container">
214
       <!-- <div class="filter-container">
717
         this.$router.push({ path: "/dialysis/print/batch/twenty" });
727
         this.$router.push({ path: "/dialysis/print/batch/twenty" });
718
       } else if (this.template_id == 22) {
728
       } else if (this.template_id == 22) {
719
         this.$router.push({ path: "/dialysis/print/batch/twentyTwo" });
729
         this.$router.push({ path: "/dialysis/print/batch/twentyTwo" });
730
+      }else if (this.template_id == 30) {
731
+        this.$router.push({ path: "/dialysis/print/batch/thirty" });
720
       }
732
       }
721
     },
733
     },
722
     batchPrintActionOne: function() {
734
     batchPrintActionOne: function() {

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderThirty.vue Zobrazit soubor

429
                     <td width="10">ml</td>
429
                     <td width="10">ml</td>
430
                     <td width="30"></td>
430
                     <td width="30"></td>
431
                     <td width='70'>透后体重:</td>
431
                     <td width='70'>透后体重:</td>
432
-                    <td width="50">
432
+                    <td width="70">
433
                       <div class="under-line">&nbsp;{{ afterdialysis.weight_after ? afterdialysis.weight_after : "未称重" }}</div>
433
                       <div class="under-line">&nbsp;{{ afterdialysis.weight_after ? afterdialysis.weight_after : "未称重" }}</div>
434
                     </td>
434
                     </td>
435
                     <td width="10">Kg</td>
435
                     <td width="10">Kg</td>