From 9620ca5caed59bd206dce701a04a5a4e4cfb9dc5 Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期二, 31 三月 2026 13:46:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/component/printList/barcode.vue | 51 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 19 deletions(-)
diff --git a/src/views/component/printList/barcode.vue b/src/views/component/printList/barcode.vue
index 03101c2..683c8c4 100644
--- a/src/views/component/printList/barcode.vue
+++ b/src/views/component/printList/barcode.vue
@@ -26,13 +26,14 @@
recordset: [],
},
grfPath: "",
+ oriention: null,
};
},
async mounted() {
// 鑾峰彇 鎵撳嵃鐨勬暟鎹�
await this.getPrintData();
// 鑾峰彇鎵撳嵃绾稿紶澶у皬
- rubylong.grhtml5.barcodeURL = this.baseUrl + "/Utility/Barcode.ashx";
+ rubylong.grhtml5.barcodeURL = this.$baseUrl + "/Utility/Barcode.ashx";
this.reportViewer = rubylong.grhtml5.insertReportViewer(
"report_holder",
this.grfPath,
@@ -57,6 +58,7 @@
return datajson;
},
async getPrintData() {
+ console.log(this.$route.query.Type)
// 鍦ㄥぇ鎵归噺鎵撳嵃鐨勬椂鍊� url闀垮害鍙兘瓒単et鍏佽鐨勯暱搴� 鍚庣闇�鎸夐渶姹� 鏀规垚POST璇锋眰
let OpenTmp = decodeURIComponent(this.$route.query.OpenTmp);
let sql = "";
@@ -69,6 +71,11 @@
"select * from h_v_IF_BarCodeBillList where hmainid in(" +
this.handleMessage.linterid.toString() +
") order by hmainid desc";
+ } else if (this.$route.query.Type == "HGy_BarCodeBillList") {
+ sql =
+ "select * from h_v_IF_BarCodeBillList where hmainid in(" +
+ this.handleMessage.linterid.toString() +
+ ") order by hmainid desc";
} else if (this.$route.query.Type == "HPOInStockBill") {
sql =
"select * from h_v_Sc_PrintMouldProdOutBillList where hmainid=" +
@@ -76,23 +83,17 @@
" order by hmainid";
} else if (this.$route.query.Type == "HGyStockPlaceBarCode") {
let condition = decodeURI(this.handleMessage.linterid.toString());
- sql = `SELECT
- CEILING(CAST(t.row_num AS FLOAT) / 2) AS orderid,
- MAX(CASE WHEN t.row_num % 2 = 1 THEN t.鏉＄爜缂栧彿 END) AS 鏉＄爜缂栧彿1,
- MAX(CASE WHEN t.row_num % 2 = 1 THEN t.浠撲綅鍚嶇О END) AS 浠撲綅鍚嶇О1,
- MAX(CASE WHEN t.row_num % 2 = 0 THEN t.鏉＄爜缂栧彿 END) AS 鏉＄爜缂栧彿2,
- MAX(CASE WHEN t.row_num % 2 = 0 THEN t.浠撲綅鍚嶇О END) AS 浠撲綅鍚嶇О2
- FROM (
- SELECT
- 鏉＄爜缂栧彿, 浠撲綅鍚嶇О,
- ROW_NUMBER() OVER (ORDER BY t1.HItemID) AS row_num
- FROM h_v_IF_StockPlaceList t1 where 鏉＄爜缂栧彿 in (${condition})
- ) AS t
- GROUP BY CEILING(CAST(t.row_num AS FLOAT) / 2)
- ORDER BY orderid;`;
+ condition = condition.split(',').map(e => `'${e}'`).join(',')
+ sql = `exec h_p_GetSPBarCode_Swell N'${condition}'`;
+ } else if (this.$route.query.Type == "WL_YayBill") {
+ sql = "select * from h_v_WL_YayBilllist where hmainid in(" +
+ this.handleMessage.linterid.toString() +
+ ") order by hmainid desc";
+ console.log(sql)
+
}
- try {
- let res = await axios.get(this.baseUrl + "/CommonModel/searchMethod", {
+ try{
+ let res = await axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
params: {
sql: sql,
user: sessionStorage["HUserName"],
@@ -101,6 +102,8 @@
},
});
// 灏� 娓叉煋鏁版嵁 鍜� 妯℃澘鍔犺浇鍒版湰鍦�
+ console.log(res)
+
let result = res.data;
this.json_data.recordset = result.data;
this.grfPath = "./static/grf/" + OpenTmp + ".grf";
@@ -115,6 +118,7 @@
this.pageSize.width = grfMeta.Printer.Width * 10 + "mm";
this.pageSize.height = grfMeta.Printer.Height * 10 + "mm";
console.log("pageSize: ",this.pageSize)
+ this.oriention = grfMeta.Printer.Oriention.toLowerCase()
},
getTemp() {
// 瀵规瘡涓鎵撳嵃鐨勫璞℃坊鍔犲垎椤�
@@ -136,10 +140,11 @@
type: "html",
style:
this.styleList[0].innerText +
- ` @media print {
+ `
.printable {
page-break-inside: avoid;
page-break-after: always;
+ box-sizing: border-box !important; /* 鍐呰竟璺濅笉褰卞搷瀹介珮 */
}
@page {
@@ -148,9 +153,16 @@
padding: 0;
}
+ table { border-collapse: collapse !important; }
+
* {
margin: 0;
padding: 0;
+ color: #000 !important;
+ opacity: 1 !important;
+ filter: none !important;
+ text-shadow: none !important;
+ -webkit-print-color-adjust: exact; /* 寮哄埗杩樺師棰滆壊锛堥伩鍏嶆贰鑹诧級 */
}
`,
});
@@ -159,4 +171,5 @@
};
</script>
-<style></style>
+<style>
+</style>
--
Gitblit v1.9.1