From f6dbf2df45ae4c4030b2402296e9a09bc20faca6 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 05 一月 2026 10:43:15 +0800
Subject: [PATCH] 增加锦隆打印模板、后端接口前缀
---
.env.development | 4
/dev/null | 93 ---------------
public/static/grf/物料条码.grf | 245 +++++++++++++++++++++++-----------------
.env.production | 4
4 files changed, 146 insertions(+), 200 deletions(-)
diff --git a/.env.development b/.env.development
index 31cc83e..dd8e4e7 100644
--- a/.env.development
+++ b/.env.development
@@ -6,8 +6,10 @@
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
# VUE_APP_BASE_API = 'http://localhost:81/API/'
-VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
+# 閿﹂殕
+VUE_APP_BASE_API = 'http://192.168.1.11:80/API/'
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.production b/.env.production
index fb2694d..adb60ca 100644
--- a/.env.production
+++ b/.env.production
@@ -4,8 +4,10 @@
# 鐢熶骇鐜閰嶇疆
ENV = 'production'
-VUE_APP_BASE_API = http://192.168.0.236:9010/API/
+# VUE_APP_BASE_API = http://192.168.0.236:9010/API/
# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
# VUE_APP_BASE_API = http://47.96.97.237/API/ # 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/鐢熶骇鐜
+# 閿﹂殕
+VUE_APP_BASE_API = 'http://192.168.1.11:80/API/'
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
\ No newline at end of file
diff --git "a/public/static/grf/\347\211\251\346\226\231\346\235\241\347\240\201.grf" "b/public/static/grf/\347\211\251\346\226\231\346\235\241\347\240\201.grf"
index c056d4b..9ec85ba 100644
--- "a/public/static/grf/\347\211\251\346\226\231\346\235\241\347\240\201.grf"
+++ "b/public/static/grf/\347\211\251\346\226\231\346\235\241\347\240\201.grf"
@@ -1,17 +1,14 @@
锘縶
- "Version":"6.8.9.5",
- "Title":"1a.绠�鍗曡〃鏍�",
- "Author":"閿愭氮鎶ヨ〃杞欢",
- "Description":"婕旂ず涓�涓渶鍩烘湰鐨勫垪琛ㄦ姤琛ㄣ��",
+ "Version":"6.8.2.2",
"Font":{
"Name":"寰蒋闆呴粦",
- "Size":90000,
+ "Size":120000,
"Weight":400,
"Charset":134
},
"Printer":{
"Size":256,
- "Width":9,
+ "Width":10,
"Height":6,
"LeftMargin":0,
"TopMargin":0,
@@ -19,11 +16,7 @@
"BottomMargin":0
},
"DetailGrid":{
- "CenterView":true,
- "PrintAdaptMethod":"ResizeToFit",
"Recordset":{
- "ConnectionString":"xml",
- "QuerySQL":"閿�鍞嚭搴撳崟.txt",
"Field":[
{
"Name":"鏉＄爜缂栧彿"
@@ -32,114 +25,114 @@
"Name":"鐗╂枡浠ｇ爜"
},
{
+ "Name":"鐗╂枡鍚嶇О"
+ },
+ {
"Name":"瑙勬牸鍨嬪彿"
},
{
- "Name":"鐗╂枡鍚嶇О"
+ "Name":"瀹㈡埛璁㈠崟鍙�"
+ },
+ {
+ "Name":"閲囪喘璺熻釜鍙�"
+ },
+ {
+ "Name":"鐢熶骇鏃ユ湡",
+ "Type":"DateTime",
+ "Format":"yyyy-MM-dd",
+ "DBFieldName":"妫�楠屾棩鏈�"
},
{
"Name":"渚涘簲鍟�"
},
{
"Name":"鏁伴噺"
- },
- {
- "Name":"鎵瑰彿"
- },
- {
- "Name":"鏉＄爜鏃ユ湡",
- "Type":"DateTime",
- "Format":"yyyy-MM-dd"
}
]
},
"Column":[
{
- "Name":"鍗曟嵁鍙�",
- "Width":8.96938
+ "Name":"Column1",
+ "Width":9.97479
}
],
"ColumnContent":{
- "Height":5.79438,
+ "Height":6,
"ColumnContentCell":[
{
- "Column":"鍗曟嵁鍙�",
- "Font":{
- "Name":"寰蒋闆呴粦",
- "Size":90000,
- "Weight":400,
- "Charset":134
- },
+ "Column":"Column1",
"FreeCell":true,
"Control":[
{
- "Type":"StaticBox",
- "Name":"StaticBox1",
- "Left":0.396875,
- "Top":0.211667,
- "Width":8.20208,
- "Height":2.98979
- },
- {
"Type":"FreeGrid",
"Name":"FreeGrid1",
- "Left":0.185208,
- "Top":0.238125,
+ "Left":0.1,
+ "Top":0.1,
"Border":{
"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
},
"ColumnCount":4,
- "RowCount":6,
+ "RowCount":7,
"FreeGridColumn":[
{
"index":1,
- "Width":1.56104
+ "Width":2.4
},
{
"index":2,
- "Width":3.43958
+ "Width":4
},
{
"index":3,
- "Width":1.11125
+ "Width":1.65
},
{
"index":4,
- "Width":2.54
+ "Width":1.65
}
],
"FreeGridRow":[
{
"index":1,
- "Height":0.714375
+ "Height":0.82
},
{
"index":2,
- "Height":1.11125
+ "Height":0.82
},
{
"index":3,
- "Height":1.00542
+ "Height":0.82
},
{
"index":4,
- "Height":0.978958
+ "Height":0.82
},
{
"index":5,
- "Height":0.767292
+ "Height":0.82
},
{
"index":6,
- "Height":0.820208
+ "Height":0.82
+ },
+ {
+ "index":7,
+ "Height":0.82
}
],
"FreeGridCell":[
{
"row":1,
"col":1,
+ "Font":{
+ "Name":"寰蒋闆呴粦",
+ "Size":120000,
+ "Bold":true,
+ "Charset":134
+ },
"TextAlign":"MiddleCenter",
- "Text":"鐗╂枡缂栫爜"
+ "Text":"缂栫爜(P)"
},
{
"row":1,
@@ -149,96 +142,151 @@
{
"row":1,
"col":3,
+ "TextAlign":"MiddleCenter",
+ "Text":"[#棰濆瀛楁#]",
+ "ColSpan":2
+ },
+ {
+ "row":2,
+ "col":1,
+ "Font":{
+ "Name":"寰蒋闆呴粦",
+ "Size":120000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"鍚嶇О(N)"
+ },
+ {
+ "row":2,
+ "col":2,
+ "Text":"[#鐗╂枡鍚嶇О#]"
+ },
+ {
+ "row":2,
+ "col":3,
"FreeCell":true,
"Control":[
{
"Type":"Barcode",
"Name":"Barcode1",
- "Left":0.211667,
- "Top":0.211667,
+ "Center":"Both",
+ "Left":0.0264583,
+ "Top":0.0264583,
"Width":3.20146,
- "Height":3.99521,
+ "Height":3.20146,
"BarcodeType":"QRCode",
- "Text":"[#鏉＄爜缂栧彿#]",
- "Font":{
- "Name":"寰蒋闆呴粦",
- "Size":75000,
- "Weight":400,
- "Charset":134
- }
+ "CaptionPosition":"None",
+ "Text":"[#鏉＄爜缂栧彿#]"
}
],
"ColSpan":2,
- "RowSpan":5
+ "RowSpan":4
},
{
- "row":2,
+ "row":3,
"col":1,
+ "Font":{
+ "Name":"寰蒋闆呴粦",
+ "Size":120000,
+ "Bold":true,
+ "Charset":134
+ },
"TextAlign":"MiddleCenter",
- "Text":"瑙勬牸鍨嬪彿"
+ "Text":"瑙勬牸(M)"
},
{
- "row":2,
+ "row":3,
"col":2,
- "WordWrap":true,
"Text":"[#瑙勬牸鍨嬪彿#]"
},
{
- "row":3,
- "col":1,
- "TextAlign":"MiddleCenter",
- "Text":"鐗╂枡鍚嶇О"
- },
- {
- "row":3,
- "col":2,
- "WordWrap":true,
- "Text":"[#鐗╂枡鍚嶇О#]"
- },
- {
"row":4,
"col":1,
+ "Font":{
+ "Name":"寰蒋闆呴粦",
+ "Size":120000,
+ "Bold":true,
+ "Charset":134
+ },
"TextAlign":"MiddleCenter",
- "Text":"渚涘簲鍟�"
+ "Text":"瀹㈡埛璁㈠崟鍙�"
},
{
"row":4,
"col":2,
- "WordWrap":true,
- "Text":"[#渚涘簲鍟�#]"
+ "Text":"[#瀹㈡埛璁㈠崟鍙�#]"
},
{
"row":5,
"col":1,
+ "Font":{
+ "Name":"寰蒋闆呴粦",
+ "Size":120000,
+ "Bold":true,
+ "Charset":134
+ },
"TextAlign":"MiddleCenter",
- "Text":"鎵瑰彿"
+ "Text":"閲囪喘璺熻釜鍙�"
},
{
"row":5,
"col":2,
- "Text":"[#鎵瑰彿#]"
+ "Text":"[#閲囪喘璺熻釜鍙�#]"
},
{
"row":6,
"col":1,
+ "Font":{
+ "Name":"寰蒋闆呴粦",
+ "Size":120000,
+ "Bold":true,
+ "Charset":134
+ },
"TextAlign":"MiddleCenter",
- "Text":"鏁伴噺"
+ "Text":"鐢熶骇鏃ユ湡"
},
{
"row":6,
"col":2,
- "Text":"[#鏁伴噺#]"
+ "Text":"[#鐢熶骇鏃ユ湡#]"
},
{
"row":6,
"col":3,
- "TextAlign":"MiddleCenter",
- "Text":"鏃ユ湡"
+ "Font":{
+ "Name":"寰蒋闆呴粦",
+ "Size":120000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"BottomCenter",
+ "Text":"鏁伴噺"
},
{
"row":6,
"col":4,
- "Text":"[#鏉＄爜鏃ユ湡#]"
+ "TextAlign":"MiddleCenter",
+ "Text":"[#鏁伴噺#]"
+ },
+ {
+ "row":7,
+ "col":1,
+ "Font":{
+ "Name":"寰蒋闆呴粦",
+ "Size":120000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"渚涘簲鍟�"
+ },
+ {
+ "row":7,
+ "col":2,
+ "Text":" [#渚涘簲鍟�#]",
+ "ColSpan":3
}
]
}
@@ -247,28 +295,15 @@
]
},
"ColumnTitle":{
- "BackColor":"C0C0C0",
"Height":0,
- "Font":{
- "Name":"寰蒋闆呴粦",
- "Size":90000,
- "Bold":true,
- "Charset":134
- },
- "RepeatStyle":"OnPage",
"ColumnTitleCell":[
{
"GroupTitle":false,
- "Column":"鍗曟嵁鍙�",
- "BackColor":"FFFFFF",
- "TextAlign":"MiddleCenter"
+ "Column":"Column1",
+ "TextAlign":"MiddleCenter",
+ "Text":"Column1"
}
]
}
- },
- "ReportHeader":[
- {
- "Height":0
- }
- ]
+ }
}
\ No newline at end of file
diff --git "a/public/static/grf/\347\211\251\346\226\231\346\235\241\347\240\201_old.grf" "b/public/static/grf/\347\211\251\346\226\231\346\235\241\347\240\201_old.grf"
deleted file mode 100644
index d505d0e..0000000
--- "a/public/static/grf/\347\211\251\346\226\231\346\235\241\347\240\201_old.grf"
+++ /dev/null
@@ -1,93 +0,0 @@
-锘縶
- "Version":"6.8.2.2",
- "Title":"1a.绠�鍗曡〃鏍�",
- "Author":"閿愭氮鎶ヨ〃杞欢",
- "Description":"婕旂ず涓�涓渶鍩烘湰鐨勫垪琛ㄦ姤琛ㄣ��",
- "Font":{
- "Name":"瀹嬩綋",
- "Size":90000,
- "Weight":400,
- "Charset":134
- },
- "Printer":{
- "Size":256,
- "Width":9,
- "Height":6,
- "LeftMargin":0,
- "TopMargin":0,
- "RightMargin":0,
- "BottomMargin":0
- },
- "DetailGrid":{
- "CenterView":true,
- "PrintAdaptMethod":"ResizeToFit",
- "Recordset":{
- "ConnectionString":"xml",
- "QuerySQL":"閿�鍞嚭搴撳崟.txt",
- "Field":[
- {
- "Name":"鏉＄爜缂栧彿"
- }
- ]
- },
- "Column":[
- {
- "Name":"鍗曟嵁鍙�",
- "Width":8.78417
- }
- ],
- "ColumnContent":{
- "Height":3.41313,
- "ColumnContentCell":[
- {
- "Column":"鍗曟嵁鍙�",
- "FreeCell":true,
- "Control":[
- {
- "Type":"StaticBox",
- "Name":"StaticBox1",
- "Left":0.396875,
- "Top":0.211667,
- "Width":8.20208,
- "Height":2.98979
- },
- {
- "Type":"Barcode",
- "Name":"Barcode1",
- "Left":0.211667,
- "Top":0.396875,
- "Width":4.39208,
- "Height":2.59292,
- "BarcodeType":"QRCode",
- "Text":"[#鏉＄爜缂栧彿#]"
- }
- ]
- }
- ]
- },
- "ColumnTitle":{
- "BackColor":"C0C0C0",
- "Height":0,
- "Font":{
- "Name":"瀹嬩綋",
- "Size":90000,
- "Bold":true,
- "Charset":134
- },
- "RepeatStyle":"OnPage",
- "ColumnTitleCell":[
- {
- "GroupTitle":false,
- "Column":"鍗曟嵁鍙�",
- "BackColor":"FFFFFF",
- "TextAlign":"MiddleCenter"
- }
- ]
- }
- },
- "ReportHeader":[
- {
- "Height":0
- }
- ]
-}
\ No newline at end of file
--
Gitblit v1.9.1