瀏覽代碼

提交代码

zyf 2 年之前
父節點
當前提交
dc281f8c82

+ 14 - 10
src/views/sale/components/saleSelfMachine/printReceipt.vue

@@ -1,5 +1,13 @@
 <template>
 <template>
   <div class="tableAllDate">
   <div class="tableAllDate">
+    <div class="button-box">
+      <el-button type="primary" v-print="'#pdfDom1'" @click="backScan()"
+                 style="width: 500px;height: 120px;font-size: 100px">
+        <!--class="el-icon-printer"-->
+        <!---->
+        打印
+      </el-button>
+    </div>
     <div id="pdfDom1">
     <div id="pdfDom1">
     <div id="pdfDom" v-for="(item, index) in dataList" :key="index">
     <div id="pdfDom" v-for="(item, index) in dataList" :key="index">
       <div class="blank"></div>
       <div class="blank"></div>
@@ -190,15 +198,11 @@
     <!-- <el-button style="margin-left: 45%;" type="primary" @click="getPdf()">
     <!-- <el-button style="margin-left: 45%;" type="primary" @click="getPdf()">
         <i class="el-icon-download"></i>导出(pdf)
         <i class="el-icon-download"></i>导出(pdf)
       </el-button> -->
       </el-button> -->
-    <div class="button-box">
-      <el-button type="primary" v-print="'#pdfDom1'" @click="backScan()">
-        <i class="el-icon-printer"></i>打印
-      </el-button>
-      <el-button type="primary" @click="backScan()">
-        <i class="el-icon-back"></i>返回
-      </el-button>
-    </div>
+    <el-button type="primary" @click="backScan()">
+      <i class="el-icon-back"></i>返回
+    </el-button>
   </div>
   </div>
+
 </template>
 </template>
 
 
 <script>
 <script>
@@ -236,7 +240,7 @@ export default {
       month: new Date().getMonth() + 1,
       month: new Date().getMonth() + 1,
       date: new Date().getDate(),
       date: new Date().getDate(),
       htmlTitle: "客户换票送货单",
       htmlTitle: "客户换票送货单",
-      note: ""
+      note: "",
       dataList:['1','2','3']
       dataList:['1','2','3']
     };
     };
   },
   },
@@ -278,7 +282,7 @@ export default {
         });
         });
     },
     },
     backScan() {
     backScan() {
-      this.$router.go(-2);
+      this.$router.go(-1);
     }
     }
   }
   }
 };
 };

+ 1 - 1
src/views/sale/components/saleSelfMachine/printScan.vue

@@ -70,7 +70,7 @@ export default {
           this.orderNumber.startsWith("wysdd") == true
           this.orderNumber.startsWith("wysdd") == true
         ) {
         ) {
           this.$router.push({
           this.$router.push({
-            path: "/saleSelfMachine?orderNumber=" + this.orderNumber
+            path: "/printReceipt?orderNumber=" + this.orderNumber
           });
           });
         }
         }
       } else if (this.orderNumber.length > 21) {
       } else if (this.orderNumber.length > 21) {