From 4c41c0a7e0df2382316fdb7adc2f64a0445aa07f Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 06 一月 2026 09:50:51 +0800
Subject: [PATCH] 更新物料条码
---
.env.development | 4 ++--
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue | 6 +++---
public/static/grf/物料条码.grf | 31 ++++++++++++++++---------------
3 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/.env.development b/.env.development
index 694a68f..4bd2b43 100644
--- a/.env.development
+++ b/.env.development
@@ -5,10 +5,10 @@
ENV = 'development'
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
-# VUE_APP_BASE_API = 'http://localhost:81/API/'
+VUE_APP_BASE_API = 'http://localhost:81/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/API/'
+# VUE_APP_BASE_API = 'http://192.168.1.11/API/'
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
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 9ec85ba..6c09cdd 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,5 +1,5 @@
锘縶
- "Version":"6.8.2.2",
+ "Version":"6.8.9.5",
"Font":{
"Name":"寰蒋闆呴粦",
"Size":120000,
@@ -10,10 +10,10 @@
"Size":256,
"Width":10,
"Height":6,
- "LeftMargin":0,
- "TopMargin":0,
- "RightMargin":0,
- "BottomMargin":0
+ "LeftMargin":0.1,
+ "TopMargin":0.1,
+ "RightMargin":0.1,
+ "BottomMargin":0.1
},
"DetailGrid":{
"Recordset":{
@@ -57,7 +57,7 @@
}
],
"ColumnContent":{
- "Height":6,
+ "Height":5.8,
"ColumnContentCell":[
{
"Column":"Column1",
@@ -66,7 +66,6 @@
{
"Type":"FreeGrid",
"Name":"FreeGrid1",
- "Left":0.1,
"Top":0.1,
"Border":{
"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
@@ -94,31 +93,31 @@
"FreeGridRow":[
{
"index":1,
- "Height":0.82
+ "Height":0.75
},
{
"index":2,
- "Height":0.82
+ "Height":0.75
},
{
"index":3,
- "Height":0.82
+ "Height":1.2
},
{
"index":4,
- "Height":0.82
+ "Height":0.75
},
{
"index":5,
- "Height":0.82
+ "Height":0.75
},
{
"index":6,
- "Height":0.82
+ "Height":0.75
},
{
"index":7,
- "Height":0.82
+ "Height":0.75
}
],
"FreeGridCell":[
@@ -171,9 +170,10 @@
{
"Type":"Barcode",
"Name":"Barcode1",
+ "Anchor":"[]",
"Center":"Both",
"Left":0.0264583,
- "Top":0.0264583,
+ "Top":0.079375,
"Width":3.20146,
"Height":3.20146,
"BarcodeType":"QRCode",
@@ -199,6 +199,7 @@
{
"row":3,
"col":2,
+ "WordWrap":true,
"Text":"[#瑙勬牸鍨嬪彿#]"
},
{
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
index 7621f3d..a7e7679 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
@@ -10,7 +10,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="鏃ユ湡">
- <el-date-picker v-model="initMainData.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT" style="width: 100%"> </el-date-picker>
+ <el-date-picker v-model="initMainData.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd" style="width: 100%"> </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -112,7 +112,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="鐢熶骇鏃ユ湡">
- <el-date-picker v-model="initMainData.HInspectionDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT" style="width: 100%"> </el-date-picker>
+ <el-date-picker v-model="initMainData.HInspectionDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd" style="width: 100%"> </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -122,7 +122,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="澶嶆鏃ユ湡">
- <el-date-picker v-model="initMainData.HReInspectionDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT" style="width: 100%" disabled> </el-date-picker>
+ <el-date-picker v-model="initMainData.HReInspectionDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd" style="width: 100%" disabled> </el-date-picker>
</el-form-item>
</el-col>
</el-row>
--
Gitblit v1.9.1