Przeglądaj źródła

'print_bug_fix'

simple 3 lat temu
rodzic
commit
c95bce7b04

+ 2 - 2
config/download.js

@@ -9,8 +9,8 @@ export default (url = '', baseUrl = '', data = {}, dataType = 'JSON', type = 'GE
     baseUrl = baseUrl;
   } else if (process.env.NODE_ENV === 'production') {
     if (baseUrl) {
-      // let buildUrl = "https://test.hajwy.com/"
-      let buildUrl = "https://pms.hajwy.com/"
+      let buildUrl = "https://test.hajwy.com/"
+      // let buildUrl = "https://pms.hajwy.com/"
       switch (baseUrl) {
         case '/landcrm':
           baseUrl = prodServer("landcrm");

+ 2 - 2
config/fetch.js

@@ -28,8 +28,8 @@ export default async (url = '', baseUrl = '', data = {}, dataType = 'JSON', type
     baseUrl = baseUrl;
   } else if (process.env.NODE_ENV === 'production') {
     if (baseUrl) {
-      // let buildUrl = "https://test.hajwy.com/"
-      let buildUrl = "https://pms.hajwy.com/"
+      let buildUrl = "https://test.hajwy.com/"
+      // let buildUrl = "https://pms.hajwy.com/"
       switch (baseUrl) {
         case '/landcrm':
           // baseUrl = 'https://test.hajwy.com/landcrm';

+ 7 - 2
src/page/purchase/components/order/orderPrint.vue

@@ -3,7 +3,7 @@
     <Card style="width:100%" :bordered="false" :dis-hover="true">
       <p slot="title">打印采购单</p>
       <div slot="extra">
-        <Button style="width: 80px" v-print="'#printForm1'">打印</Button>
+        <Button style="width: 80px" v-print="printObj">打印</Button>
         <Button @click="$emit('return')" style="width: 80px">返回</Button>
       </div>
       <div id="printForm1">
@@ -129,6 +129,9 @@ export default {
   name: "orderPrint",
   data() {
     return {
+      printObj: {
+        id: "printForm1"
+      },
       printData: {
         detailList: [],
       },
@@ -190,6 +193,7 @@ ivu-card-head-inner,
   margin: 0 auto;
   font-size: 14px;
   .head {
+    min-height: 50px;
     text-align: center;
     position: relative;
     .logo {
@@ -207,8 +211,9 @@ ivu-card-head-inner,
     }
   }
   .line {
+    width: 100%;
     height: 1px;
-    background: #000;
+    border-bottom: 1px solid #000;
     margin-bottom: 3px;
   }
   .infor {

+ 7 - 2
src/page/purchase/components/order/orderPrint2.vue

@@ -3,7 +3,7 @@
     <Card style="width:100%" :bordered="false" :dis-hover="true">
       <p slot="title">打印采购单</p>
       <div slot="extra">
-        <Button style="width: 80px" v-print="'#printForm'">打印</Button>
+        <Button style="width: 80px" v-print="printObj">打印</Button>
         <Button @click="$emit('return')" style="width: 80px">返回</Button>
       </div>
       <div id="printForm">
@@ -129,6 +129,9 @@ export default {
   name: "orderPrint2",
   data() {
     return {
+      printObj: {
+        id: "printForm"
+      },
       printData: {
         detailList: [],
       },
@@ -190,6 +193,7 @@ ivu-card-head-inner,
   margin: 0 auto;
   font-size: 14px;
   .head {
+    min-height: 50px;
     text-align: center;
     position: relative;
     .logo {
@@ -207,8 +211,9 @@ ivu-card-head-inner,
     }
   }
   .line {
+    width: 100%;
+    border-bottom: 1px solid #000;
     height: 1px;
-    background: #000;
     margin-bottom: 3px;
   }
   .infor {

+ 4 - 1
src/page/purchase/components/plan/planPrint.vue

@@ -3,7 +3,7 @@
     <Card style="width:100%" :bordered="false" :dis-hover="true">
       <p slot="title">打印采购申请表</p>
       <div slot="extra">
-        <Button style="width: 80px" v-print="'#printForm'">打印</Button>
+        <Button style="width: 80px" v-print="printObj">打印</Button>
         <Button @click="$emit('return')" style="width: 80px">返回</Button>
       </div>
       <div id="printForm">
@@ -78,6 +78,9 @@ export default {
   name: "planPrint",
   data() {
     return {
+      printObj: {
+        id: "printForm"
+      },
       printData: {
         applyMonth: "",
       },

+ 7 - 2
src/page/purchase/components/pool/poolPrint.vue

@@ -3,7 +3,7 @@
     <Card style="width:100%" :bordered="false" :dis-hover="true">
       <p slot="title">打印采购单</p>
       <div slot="extra">
-        <Button style="width: 80px" v-print="'#printForm3'">打印</Button>
+        <Button style="width: 80px" v-print="printObj">打印</Button>
         <Button @click="$emit('return')" style="width: 80px">返回</Button>
       </div>
       <div id="printForm3">
@@ -129,6 +129,9 @@ export default {
   name: "orderPrint",
   data() {
     return {
+      printObj: {
+        id: "printForm3"
+      },
       printData: {
         detailList: []
       },
@@ -190,6 +193,7 @@ ivu-card-head-inner,
   margin: 0 auto;
   font-size: 14px;
   .head {
+    min-height: 50px;
     text-align: center;
     position: relative;
     .logo {
@@ -207,8 +211,9 @@ ivu-card-head-inner,
     }
   }
   .line {
+    width: 100%;
+    border-bottom: 1px solid #000;
     height: 1px;
-    background: #000;
     margin-bottom: 3px;
   }
   .infor {