howie 3 rokov pred
rodič
commit
f80336144b

+ 1 - 1
src/components/Common/print-common.vue

@@ -45,7 +45,7 @@
               <el-col :span="2">{{ it.salesId }}</el-col>
               <el-col :span="2">{{ it.invoiceId }}</el-col>
               <el-col :span="2">{{ it.id ? dateToDayFilter(item.orderTime) : '' }}</el-col>
-              <el-col :span="2">{{ it.orderId }}</el-col>
+              <el-col :span="2">{{ it.enginOrderType =='HOME' || it.enginOrderType =='TRADE'? it.enginOrderNo :it.mainOrderId }}</el-col>
               <!-- <el-col :span="2">{{ it.refEnginRecordNo }}</el-col> -->
               <el-col :span="4">{{ it.materialName }}</el-col>
               <el-col :span="6">{{ it.specification }}</el-col>

+ 0 - 4
src/views/supply/deliver/components/sum_print.vue

@@ -133,11 +133,7 @@ export default {
 <style scoped lang="scss">
 
 @media print {
-  @page {
 
-    size: A4;
-
-}
     .detail-container {
     width: 100%;
     height: auto !important;