From 45ba09f40ff19d50f4e6386c8e4944c420b879c9 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 17 十月 2024 11:08:44 +0800
Subject: [PATCH] 提交
---
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue | 24 ++++++++++++------------
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 8 ++++++++
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue | 2 +-
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 2 +-
4 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
index 422acd6..fa0e393 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
@@ -206,10 +206,10 @@
<tr class="day-in">
<td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6" colspan="4">
<div style="display: flex;font-size: 10px;text-align: center;">
- <div style="width: 25%">鍔犲伐璐圭敤</div>
- <div style="width: 25%">鍗曚环</div>
- <div style="width: 25%">鏁伴噺</div>
- <div style="width: 25%">閲戦</div>
+ <span style="width: 25%">鍔犲伐璐圭敤</span>
+ <span style="width: 25%">鍗曚环</span>
+ <span style="width: 25%">鏁伴噺</span>
+ <span style="width: 25%">閲戦</span>
</div>
</td>
<td style="text-align: left;border:none;font-size: 15px;" colspan="5">鎬婚噾棰�: {{delivery.money}}</td>
@@ -217,16 +217,16 @@
<tr class="day-in">
<td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="4" >
<div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in otherMoney1" :key="index2">
- <div style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</div>
- <div style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</div>
- <div style="width: 25%">{{item.DeliveryDetailOtherMoney.count}}</div>
- <div style="width: 25%">{{parseFloat(item.DeliveryDetailOtherMoney.monery.toFixed(2))}}</div>
+ <span style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</span>
+ <span style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</span>
+ <span style="width: 25%">{{item.DeliveryDetailOtherMoney.count}}</span>
+ <span style="width: 25%">{{parseFloat(item.DeliveryDetailOtherMoney.monery.toFixed(2))}}</span>
</div>
<div style="display: flex;font-size: 10px;text-align: center" v-if="delivery.freight>0">
- <div style="width: 25%">杩愯垂</div>
- <div style="width: 25%">{{delivery.freightPrice}}</div>
- <div style="width: 25%">{{delivery.freightQuantity}}</div>
- <div style="width: 25%">{{delivery.freight}}</div>
+ <span style="width: 25%">杩愯垂</span>
+ <span style="width: 25%">{{delivery.freightPrice}}</span>
+ <span style="width: 25%">{{delivery.freightQuantity}}</span>
+ <span style="width: 25%">{{delivery.freight}}</span>
</div>
</td>
<td style="text-align: left;border:none;font-size: 15px;" colspan="5">澶у啓閲戦: {{money}}</td>
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
index 71145fc..ce9c1d2 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue
@@ -98,7 +98,7 @@
<table >
<thead>
<tr class="title-s">
- <th colspan="13">
+ <th colspan="9">
<h1>
{{company.companyName}}
</h1>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
index 4db7748..97125bc 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -14,6 +14,7 @@
import PrintSheet1 from "@/components/sd/delivery/PrintSheet1.vue";
import PrintSheet2 from "@/components/sd/delivery/PrintSheet2.vue";
import useOrderInfoStore from "@/stores/sd/order/orderInfo";
+import { saveAs } from "file-saver"
//璇█鑾峰彇
const { t } = useI18n()
@@ -329,6 +330,12 @@
})
}
+const exportFile = ()=>{
+ const html = document.getElementById("child").innerHTML // 鑾峰彇闇�瑕佸鍑虹殑HTML鍐呭
+ const blob = new Blob([html], { type: 'application/vnd.ms-excel' }) // 鍒涘缓Blob瀵硅薄
+ saveAs(blob, rowClickIndex.value.deliveryId+".xls");
+}
+
@@ -436,6 +443,7 @@
>
<template #header="{ close, titleId, titleClass }">
<el-button v-print="printContent" @click="printingNumber" :icon="Printer" circle />
+ <el-button @click="exportFile" :icon="Download" circle />
</template>
<print-sheet1 id="child" v-if="sheetIndex===1" :deliveryId="rowClickIndex.deliveryId" />
<print-sheet2 id="child" v-if="sheetIndex===2" :deliveryId="rowClickIndex.deliveryId" />
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 90aec72..5be6548 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -736,7 +736,7 @@
(select (@row_number := @row_number + 1) as id,process_id as process_id from (select process_id from pp.optimize_detail tt where project_no =#{projectNo} group by process_id) tt,(select @row_number := 0) as t) a
on a.process_id=opd.process_id
where opd.project_no = #{projectNo}
- order by opd.stock_id
+ order by opd.stock_id,opd.polys_id
</select>
<select id="getPrintLabel2">
--
Gitblit v1.8.0