From 74feb99b1b4e2eb3706bbb503d07fb087ca39d4a Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期四, 02 四月 2026 15:15:02 +0800
Subject: [PATCH] 出运单增加过滤发货通知单和物流状态
---
src/views/component/printList/barcode.vue | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/views/component/printList/barcode.vue b/src/views/component/printList/barcode.vue
index 911824d..683c8c4 100644
--- a/src/views/component/printList/barcode.vue
+++ b/src/views/component/printList/barcode.vue
@@ -33,7 +33,7 @@
// 鑾峰彇 鎵撳嵃鐨勬暟鎹�
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,
@@ -58,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 = "";
@@ -82,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", {
+ let res = await axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
params: {
sql: sql,
user: sessionStorage["HUserName"],
@@ -107,6 +102,8 @@
},
});
// 灏� 娓叉煋鏁版嵁 鍜� 妯℃澘鍔犺浇鍒版湰鍦�
+ console.log(res)
+
let result = res.data;
this.json_data.recordset = result.data;
this.grfPath = "./static/grf/" + OpenTmp + ".grf";
--
Gitblit v1.9.1