From d61aac5c6da94c76cc7033501c1db497c15a70f6 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 18 十二月 2025 13:08:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
public/static/grf/物料条码.grf | 16 +++++++++++-----
public/static/grf/库位码.grf | 4 ++--
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git "a/public/static/grf/\345\272\223\344\275\215\347\240\201.grf" "b/public/static/grf/\345\272\223\344\275\215\347\240\201.grf"
index 4881d2d..a9ba663 100644
--- "a/public/static/grf/\345\272\223\344\275\215\347\240\201.grf"
+++ "b/public/static/grf/\345\272\223\344\275\215\347\240\201.grf"
@@ -4,7 +4,7 @@
"Author":"閿愭氮鎶ヨ〃杞欢",
"Description":"婕旂ず涓�涓渶鍩烘湰鐨勫垪琛ㄦ姤琛ㄣ��",
"Font":{
- "Name":"瀹嬩綋",
+ "Name":"寰蒋闆呴粦",
"Size":90000,
"Weight":400,
"Charset":134
@@ -108,7 +108,7 @@
"BackColor":"C0C0C0",
"Height":0,
"Font":{
- "Name":"瀹嬩綋",
+ "Name":"寰蒋闆呴粦",
"Size":90000,
"Bold":true,
"Charset":134
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 d4213fd..c056d4b 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,10 +1,10 @@
锘縶
- "Version":"6.8.2.2",
+ "Version":"6.8.9.5",
"Title":"1a.绠�鍗曡〃鏍�",
"Author":"閿愭氮鎶ヨ〃杞欢",
"Description":"婕旂ず涓�涓渶鍩烘湰鐨勫垪琛ㄦ姤琛ㄣ��",
"Font":{
- "Name":"瀹嬩綋",
+ "Name":"寰蒋闆呴粦",
"Size":90000,
"Weight":400,
"Charset":134
@@ -64,6 +64,12 @@
"ColumnContentCell":[
{
"Column":"鍗曟嵁鍙�",
+ "Font":{
+ "Name":"寰蒋闆呴粦",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
"FreeCell":true,
"Control":[
{
@@ -155,8 +161,8 @@
"BarcodeType":"QRCode",
"Text":"[#鏉＄爜缂栧彿#]",
"Font":{
- "Name":"瀹嬩綋",
- "Size":67500,
+ "Name":"寰蒋闆呴粦",
+ "Size":75000,
"Weight":400,
"Charset":134
}
@@ -244,7 +250,7 @@
"BackColor":"C0C0C0",
"Height":0,
"Font":{
- "Name":"瀹嬩綋",
+ "Name":"寰蒋闆呴粦",
"Size":90000,
"Bold":true,
"Charset":134
--
Gitblit v1.9.1