MES-WEB-VUEUI.git

			@@ -50,6 +50,9 @@
			},
			{
			"Name":"äº§ååå·"
			},
			{
			"Name":"è®¡éåä½"
			}
			]
			},
			@@ -60,7 +63,7 @@
			}
			],
			"ColumnContent":{
			"Height":5.8,
			"Height":5.79438,
			"ColumnContentCell":[
			{
			"Column":"Column1",
			@@ -73,8 +76,13 @@
			"Border":{
			"Styles":"[DrawLeft\|DrawTop\|DrawRight\|DrawBottom]"
			},
			"ColumnCount":4,
			"RowCount":7,
			"RowCount":8,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":120000,
			"Bold":true,
			"Charset":134
			},
			"FreeGridColumn":[
			{
			"index":1,
			@@ -82,45 +90,53 @@
			},
			{
			"index":2,
			"Width":4
			"Width":3.88938
			},
			{
			"index":3,
			"Width":1.65
			"Width":0.9525
			},
			{
			"index":4,
			"Width":1.65
			"Width":1.24354
			},
			{
			"index":5,
			"Width":1.21708
			}
			],
			"FreeGridRow":[
			{
			"index":1,
			"Height":0.75
			"Height":0.529167
			},
			{
			"index":2,
			"Height":0.75
			"Height":0.635
			},
			{
			"index":3,
			"Height":1.2
			"Height":0.661458
			},
			{
			"index":4,
			"Height":0.75
			"Height":0.767292
			},
			{
			"index":5,
			"Height":0.75
			"Height":0.661458
			},
			{
			"index":6,
			"Height":0.75
			"Height":0.635
			},
			{
			"index":7,
			"Height":0.75
			"Height":0.820208
			},
			{
			"index":8,
			"Height":0.79375
			}
			],
			"FreeGridCell":[
			@@ -129,7 +145,7 @@
			"col":1,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":120000,
			"Size":105000,
			"Bold":true,
			"Charset":134
			},
			@@ -139,112 +155,47 @@
			{
			"row":1,
			"col":2,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":105000,
			"Weight":400,
			"Charset":134
			},
			"Text":"[#ç©æä»£ç #]"
			},
			{
			"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",
			"Anchor":"[]",
			"Center":"Both",
			"Left":0.0264583,
			"Top":0.079375,
			"Width":3.20146,
			"Height":3.20146,
			"Left":0.396875,
			"Top":0.185208,
			"Width":2.59292,
			"Height":2.19604,
			"BarcodeType":"QRCode",
			"CaptionPosition":"None",
			"Text":"[#æ¡ç ç¼å·#]"
			"Text":"[#æ¡ç ç¼å·#]",
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":82500,
			"Weight":400,
			"Charset":134
			}
			}
			],
			"ColSpan":2,
			"ColSpan":3,
			"RowSpan":4
			},
			{
			"row":3,
			"row":2,
			"col":1,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":120000,
			"Bold":true,
			"Charset":134
			},
			"TextAlign":"MiddleCenter",
			"Text":"è§æ ¼(M)"
			},
			{
			"row":3,
			"col":2,
			"WordWrap":true,
			"Text":"[#è§æ ¼åå·#]"
			},
			{
			"row":4,
			"col":1,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":120000,
			"Bold":true,
			"Charset":134
			},
			"TextAlign":"MiddleCenter",
			"Text":"å®¢æ·è®¢åå·"
			},
			{
			"row":4,
			"col":2,
			"Text":"[#å®¢æ·è®¢åå·#]"
			},
			{
			"row":5,
			"col":1,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":120000,
			"Bold":true,
			"Charset":134
			},
			"TextAlign":"MiddleCenter",
			"Text":"éè´è·è¸ªå·"
			},
			{
			"row":5,
			"col":2,
			"Text":"[#éè´è·è¸ªå·#]"
			},
			{
			"row":6,
			"col":1,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":120000,
			"Size":90000,
			"Bold":true,
			"Charset":134
			},
			@@ -252,34 +203,177 @@
			"Text":"çäº§æ¥æ"
			},
			{
			"row":6,
			"row":2,
			"col":2,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":90000,
			"Weight":400,
			"Charset":134
			},
			"Text":"[#çäº§æ¥æ#]"
			},
			{
			"row":6,
			"col":3,
			"row":3,
			"col":1,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":120000,
			"Size":90000,
			"Bold":true,
			"Charset":134
			},
			"TextAlign":"BottomCenter",
			"TextAlign":"MiddleCenter",
			"Text":"å®¢æ·è®¢åå·"
			},
			{
			"row":3,
			"col":2,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":90000,
			"Weight":400,
			"Charset":134
			},
			"Text":"[#å®¢æ·è®¢åå·#]"
			},
			{
			"row":4,
			"col":1,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":90000,
			"Bold":true,
			"Charset":134
			},
			"TextAlign":"MiddleCenter",
			"Text":"éè´è·è¸ªå·"
			},
			{
			"row":4,
			"col":2,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":90000,
			"Weight":400,
			"Charset":134
			},
			"Text":"[#éè´è·è¸ªå·#]"
			},
			{
			"row":5,
			"col":1,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":90000,
			"Bold":true,
			"Charset":134
			},
			"TextAlign":"MiddleCenter",
			"Text":"åç§°(N)"
			},
			{
			"row":5,
			"col":2,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":90000,
			"Weight":400,
			"Charset":134
			},
			"Text":"[#ç©æåç§°#]"
			},
			{
			"row":5,
			"col":3,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":90000,
			"Bold":true,
			"Charset":134
			},
			"TextAlign":"MiddleCenter",
			"Text":"æ°é"
			},
			{
			"row":6,
			"row":5,
			"col":4,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":90000,
			"Weight":400,
			"Charset":134
			},
			"TextAlign":"MiddleCenter",
			"Text":"[#æ°é#]"
			},
			{
			"row":5,
			"col":5,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":105000,
			"Weight":400,
			"Charset":134
			},
			"TextAlign":"MiddleCenter",
			"Text":"[#è®¡éåä½#]"
			},
			{
			"row":6,
			"col":1,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":90000,
			"Bold":true,
			"Charset":134
			},
			"TextAlign":"MiddleCenter",
			"Text":"è§æ ¼åå·"
			},
			{
			"row":6,
			"col":2,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":90000,
			"Weight":400,
			"Charset":134
			},
			"WordWrap":true,
			"Text":"[#è§æ ¼åå·#]",
			"ColSpan":4
			},
			{
			"row":7,
			"col":1,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":120000,
			"Size":90000,
			"Bold":true,
			"Charset":134
			},
			"TextAlign":"MiddleCenter",
			"Text":"äº§ååå·"
			},
			{
			"row":7,
			"col":2,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":90000,
			"Weight":400,
			"Charset":134
			},
			"WordWrap":true,
			"Text":"[#äº§ååå·#]",
			"ColSpan":4
			},
			{
			"row":8,
			"col":1,
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":90000,
			"Bold":true,
			"Charset":134
			},
			@@ -287,10 +381,17 @@
			"Text":"ä¾åºå"
			},
			{
			"row":7,
			"row":8,
			"col":2,
			"Text":" [#ä¾åºå#]",
			"ColSpan":3
			"Font":{
			"Name":"å¾®è½¯éé»",
			"Size":90000,
			"Weight":400,
			"Charset":134
			},
			"WordWrap":true,
			"Text":"[#ä¾åºå#]",
			"ColSpan":4
			}
			]
			}

	public/static/grf/物料条码.grf	319 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -471,7 +471,7 @@
			, "HMaterNumber": this.initMainData.HMaterNumber
			, "HMaterName": this.initMainData.HMaterName
			, "HMaterModel": this.initMainData.HMaterModel
			, "HCusModel": ""
			, "HCusModel": this.initMainData.HCusModel
			, "HCusMaterName": ""
			, "HEmpID": 0
			, "HEmpNumber": ""
			@@ -517,6 +517,7 @@
			, "HInspectionCycle": this.initMainData.HInspectionCycle
			, "HReInspectionDate": this.initMainData.HReInspectionDate
			, "HPOOrderBillMTO": this.initMainData.HPOOrderBillMTO
			, "HSeOrderBillNo": this.initMainData.HSeOrderBillNo
			}
			]

			@@ -472,7 +472,7 @@
			, "HMaterNumber": this.initMainData.HMaterNumber
			, "HMaterName": this.initMainData.HMaterName
			, "HMaterModel": this.initMainData.HMaterModel
			, "HCusModel": ""
			, "HCusModel": this.initMainData.HCusModel
			, "HCusMaterName": ""
			, "HEmpID": 0
			, "HEmpNumber": ""
			@@ -518,6 +518,7 @@
			, "HInspectionCycle": this.initMainData.HInspectionCycle
			, "HReInspectionDate": this.initMainData.HReInspectionDate
			, "HPOOrderBillMTO": this.initMainData.HPOOrderBillMTO
			, "HSeOrderBillNo": this.initMainData.HSeOrderBillNo
			}
			]