Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev

src/api/repair/tickets/Tickets.js

@@ -46,6 +46,15 @@ export function setTicketsPaid(data){
   })
 }
 
+
+export function print(id) {
+  return request({
+    url: preUrl + "/print/" + id,
+    method: 'get'
+
+  })
+}
+
 // 新增客户、车辆信息
 export function updateCustomerAndCar(data){
   return request({

src/views/repair/tickets/Components/TicketTable.vue

@@ -99,7 +99,7 @@
           <dict-tag :type="DICT_TYPE.REPAIR_TICKETS_STATUS" v-model="scope.row.ticketsStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" fixed="right" align="center" width="180">
+      <el-table-column label="操作" fixed="right" align="center" width="230">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleShow(scope.row)"
           >查看
@@ -115,6 +115,10 @@
                      @click="handleVoid(scope.row)"
           >作废
           </el-button>
+          <el-button size="mini" type="text" icon="el-icon-printer"
+                     @click="handlePrint(scope.row)"
+          >打印
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -145,7 +149,7 @@
 </template>
 
 <script>
-import {setTicketsVoid, setTicketsPaid} from "@/api/repair/tickets/Tickets";
+import {setTicketsVoid, setTicketsPaid, setTicketsPrint} from '@/api/repair/tickets/Tickets'
 import TicketsShow from "@/views/repair/tickets/Components/TicketsShow.vue";
 
 export default {
@@ -196,6 +200,23 @@ export default {
       } catch {
       }
     },
+    /**
+     * 打印
+     */
+    async handlePrint(row) {
+      // window.location.href = process.env.VUE_APP_BASE_API + '/admin-api/repair/tickets/print/'+row.id;
+      window.open(process.env.VUE_APP_BASE_API + '/admin-api/repair/tickets/print/'+row.id)
+    },
+
+    async doPrint(data) {
+      try {
+        await setTicketsPrint(data)
+        this.$modal.msgSuccess("导出打印成功")
+        this.$emit("setPrint")
+      } catch {
+      }
+    },
+
     handlePaid(row) {
       this.$prompt('结算备注', '提示', {
         confirmButtonText: '确定',