Browse Source

打印单

huangyw 3 years ago
parent
commit
8a48af791b

+ 1 - 0
src/xt_pages/dialysis/details/dialog/MultiSelectBox/index.vue View File

@@ -52,6 +52,7 @@ export default {
52 52
       returnValue["type"] = this.propsForm.type;
53 53
       this.propsForm.type = "";
54 54
       this.$emit("dialog-comfirm", returnValue);
55
+      console.log(returnValue,"opo")
55 56
     },
56 57
     cancle: function() {
57 58
       this.propsForm.type = "";

+ 7 - 0
src/xt_pages/dialysis/dialysisPrintOrder.vue View File

@@ -1589,6 +1589,13 @@ export default {
1589 1589
           style: style2,
1590 1590
           scanStyles: false,
1591 1591
         });
1592
+      }else if (this.org_template_info.template_id == 47) {
1593
+        printJS({
1594
+          printable: "dialysis-print-box-1",
1595
+          type: "html",
1596
+          style: style2,
1597
+          scanStyles: false,
1598
+        });
1592 1599
       }
1593 1600
     },
1594 1601
     printThisOnePage() {

File diff suppressed because it is too large
+ 677 - 775
src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue


+ 2 - 2
src/xt_pages/hospitalStation/invoicePrint.vue View File

@@ -13,8 +13,8 @@
13 13
     </template>
14 14
     <div class="app-container" style="padding-top:40px;">
15 15
         <div class='dialysisPage'>
16
-            <printOne v-if="org_id!=10215 && org_id!=0" :paramsObj="invoiceParams"></printOne>
17
-            <printTwo v-if="org_id == 0 || org_id == 10215" :paramsObj="invoiceParams"></printTwo>
16
+            <printOne v-if="org_id!=10215 && org_id!=0 &&org_id != 4" :paramsObj="invoiceParams"></printOne>
17
+            <printTwo v-if="org_id == 0 || org_id == 10215 ||org_id == 4" :paramsObj="invoiceParams"></printTwo>
18 18
         </div>
19 19
     </div>
20 20
   </div>

+ 13 - 15
src/xt_pages/supply/components/purchaseOrderPrint.vue View File

@@ -19,7 +19,7 @@
19 19
         <div class="print_main_content">
20 20
           <div class="order_title_panl">
21 21
             <div style="font-size: 22px; font-weight: bold">{{ orgName }}</div>
22
-            <span style="font-weight: 500; font-size: 18px">采购订单</span>
22
+            <span style="font-weight: 500; font-size: 18px">购货单</span>
23 23
           </div>
24 24
           <div style="display: flex; justify-content: space-between">
25 25
             <div style="text-align: left; margin-bottom: 1px; font-size: 18px">
@@ -70,11 +70,10 @@
70 70
                 <tr>
71 71
                   <td colspan="3" style="line-height: 18px">合计</td>
72 72
                   <td colspan="1" style="line-height: 18px">{{getAllCount()}}</td>
73
-                  <td colspan="1" style="line-height: 18px"></td>
74
-                  <td colspan="2" style="line-height: 18px">{{getTotalPrice()}}</td>
73
+                  <td colspan="2" style="line-height: 18px"></td>
75 74
                 </tr>
76 75
                  <tr>
77
-                  <td colspan="6" style="line-height: 18px;text-align: left;">合计  金额大写 {{getAllPrice()}}</td>
76
+                  <td colspan="6" style="line-height: 18px">合计  金额大写 {{getAllPrice()}}</td>
78 77
                  </tr>
79 78
               </tbody>
80 79
             </table>
@@ -111,6 +110,16 @@
111 110
               flex-wrap: wrap;
112 111
             "
113 112
           >
113
+            <div
114
+              style="
115
+                width: 25%;
116
+                text-align: left;
117
+                margin-bottom: 1px;
118
+                font-size: 18px;
119
+              "
120
+            >
121
+              供应商:{{ getSupplyName(supplier_id) }}
122
+            </div>
114 123
             <div
115 124
               style="
116 125
                 width: 25%;
@@ -380,17 +389,6 @@ export default {
380 389
         return ""
381 390
       } 
382 391
     },
383
-    getTotalPrice(){
384
-     var total = 0
385
-      for(let i=0;i<this.tableList.length;i++){
386
-         total +=(this.tableList[i].count*this.tableList[i].price)
387
-      }  
388
-      if(total > 0){
389
-       return total.toFixed(2)
390
-      }else{
391
-        return ""
392
-      } 
393
-    }
394 392
   },
395 393
   created() {
396 394
     this.orgName = this.$store.getters.xt_user.org.org_name;