11

package1/AI/voiceInventory.vue

@@ -861,10 +861,79 @@
 				snName: 'ty',
 				defaultList: [{
 					name: '颜色',
-					value: []
+					value: [{
+						value: '均色',
+						checked: false,
+					}, {
+						value: '白色',
+						checked: false,
+					}, {
+						value: '绿色',
+						checked: false,
+					}, {
+						value: '黄色',
+						checked: false,
+					}, {
+						value: '卡其色',
+						checked: false,
+					}, {
+						value: '黑色',
+						checked: false,
+					}, {
+						value: '浅蓝',
+						checked: false,
+					}, {
+						value: '蓝色',
+						checked: false,
+					}, {
+						value: '灰色',
+						checked: false,
+					}, {
+						value: '咖色',
+						checked: false,
+					}, {
+						value: '紫色',
+						checked: false,
+					}, {
+						value: '红色',
+						checked: false,
+					}, {
+						value: '米色',
+						checked: false,
+					}]
 				}, {
 					name: '尺码',
-					value: []
+					value: [{
+						value: '均码',
+						checked: false,
+					}, {
+						value: 'XS码',
+						checked: false
+					}, {
+						value: 'S码',
+						checked: false,
+					}, {
+						value: 'M码',
+						checked: false,
+					}, {
+						value: 'L码',
+						checked: false,
+					}, {
+						value: 'XL码',
+						checked: false,
+					}, {
+						value: '2XL码',
+						checked: false,
+					}, {
+						value: '3XL码',
+						checked: false,
+					}, {
+						value: '4XL码',
+						checked: false,
+					}, {
+						value: '5XL码',
+						checked: false,
+					}]
 				}],
 				temporary: [] //修改单个规格值临时存放要修改的对象
 			}

package1/index/orderDetail.vue

@@ -1067,7 +1067,7 @@
 				// 横线
 				ctx.fillText('-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------', that.returnRealSize(20), that.returnRealSize(700))
 				// 数据
-				if (this.printingMethod == '0') {
+				if (this.printingMethod == '0' || this.printingMethod == '2') {
 					ctx.fillText('货号(名称)', that.returnRealSize(20), that.returnRealSize(800))
 					ctx.fillText('规格', that.returnRealSize(1040), that.returnRealSize(800))
 					ctx.fillText('数量', that.returnRealSize(1590), that.returnRealSize(800))
@@ -1682,12 +1682,13 @@
 					strCmd += blesdk.addCPCLText(danjia, that.yNum, '24', '0', 0, '单价')
 					strCmd += blesdk.addCPCLText(zongjia, that.yNum, '24', '0', 0, '总价')
 				}else if(this.printingMethod == '2'){
+					that.yNum = 370
 					strCmd += blesdk.addCPCLText('0', '370', '24', '0', 0,
 						'-----------------------------------------------------------------------------------')
 					strCmd += blesdk.addCPCLText('10', that.yNum += 40, '24', '0', 0, '货号(名称)')
-					strCmd += blesdk.addCPCLText('300', that.yNum, '24', '0', 0, '数量')
+					strCmd += blesdk.addCPCLText('420', that.yNum, '24', '0', 0, '数量')
-					strCmd += blesdk.addCPCLText('500', that.yNum, '24', '0', 0, '单价')
+					strCmd += blesdk.addCPCLText('575', that.yNum, '24', '0', 0, '单价')
-					strCmd += blesdk.addCPCLText('650', that.yNum, '24', '0', 0, '总价')
+					strCmd += blesdk.addCPCLText('730', that.yNum, '24', '0', 0, '总价')
 				}
 				for (var i = 0; i < that.newData.length; i++) {
 					let colorHeight = 25
@@ -1868,33 +1869,33 @@
 						
 								strCmd += blesdk.addCPCLText('0', that.yNum += 40, '24', '0', 0, (Xindex +=
 										1) + '.' + '【销】' + that.newData[i].productSn)
-								strCmd += blesdk.addCPCLText('300', that.yNum, '24', '0', 0, buyCount)
+								strCmd += blesdk.addCPCLText('420', that.yNum, '24', '0', 0, buyCount)
-								strCmd += blesdk.addCPCLText('500', that.yNum, '24', '0', 0, that.newData[i].discountAmount)
+								strCmd += blesdk.addCPCLText('575', that.yNum, '24', '0', 0, that.newData[i].discountAmount)
-								strCmd += blesdk.addCPCLText('650', that.yNum, '24', '0', 0, buyCount * that.newData[i].discountAmount)
+								strCmd += blesdk.addCPCLText('730', that.yNum, '24', '0', 0, buyCount * that.newData[i].discountAmount)
 							} else {
 						
 								strCmd += blesdk.addCPCLText('0', that.yNum += 40, '24', '0', 0, (Xindex +=
 										1) + '.' + '【销】' + that.newData[i].productSn + '(' + (that.newData[i]
 										.productName == null ? '' : that.newData[i].productName) + ')')
-								strCmd += blesdk.addCPCLText('300', that.yNum, '24', '0', 0, buyCount)
+								strCmd += blesdk.addCPCLText('420', that.yNum, '24', '0', 0, buyCount)
-								strCmd += blesdk.addCPCLText('500', that.yNum, '24', '0', 0, that.newData[i].discountAmount)
+								strCmd += blesdk.addCPCLText('575', that.yNum, '24', '0', 0, that.newData[i].discountAmount)
-								strCmd += blesdk.addCPCLText('650', that.yNum, '24', '0', 0, buyCount * that.newData[i].discountAmount)
+								strCmd += blesdk.addCPCLText('730', that.yNum, '24', '0', 0, buyCount * that.newData[i].discountAmount)
 							}
 						}
 						if (returnCount >0) {
 							if (that.newData[i].productName == that.newData[i].productSn) {
 								strCmd += blesdk.addCPCLText('0', that.yNum += 40, '24', '0', 0, (Xindex +=
 									1) + '.' + '【退】' + that.newData[i].productSn)
-								strCmd += blesdk.addCPCLText('300', that.yNum, '24', '0', 0, returnCount)
+								strCmd += blesdk.addCPCLText('420', that.yNum, '24', '0', 0, returnCount)
-								strCmd += blesdk.addCPCLText('500', that.yNum, '24', '0', 0, returnPrice)
+								strCmd += blesdk.addCPCLText('575', that.yNum, '24', '0', 0, returnPrice)
-								strCmd += blesdk.addCPCLText('650', that.yNum, '24', '0', 0, returnCount * returnPrice)
+								strCmd += blesdk.addCPCLText('730', that.yNum, '24', '0', 0, returnCount * returnPrice)
 							} else {
 								strCmd += blesdk.addCPCLText('0', that.yNum += 40, '24', '0', 0, (Xindex +=
 									1) +'.' + '【退】' + that.newData[i].productSn +'(' + (that.newData[i]
 										.productName == null ? '' : that.newData[i].productName) + ')')
-								strCmd += blesdk.addCPCLText('300', that.yNum, '24', '0', 0, returnCount)
+								strCmd += blesdk.addCPCLText('420', that.yNum, '24', '0', 0, returnCount)
-								strCmd += blesdk.addCPCLText('500', that.yNum, '24', '0', 0, returnPrice)
+								strCmd += blesdk.addCPCLText('575', that.yNum, '24', '0', 0, returnPrice)
-								strCmd += blesdk.addCPCLText('650', that.yNum, '24', '0', 0, returnCount * returnPrice)
+								strCmd += blesdk.addCPCLText('730', that.yNum, '24', '0', 0, returnCount * returnPrice)
 							}
 						} 
 						
@@ -2573,13 +2574,13 @@
 							pageNum++
 							strCmd += blesdk.addCPCLSETMAG(1, 1)
 							strCmd += blesdk.addCPCLText('0', that.yNum += 40, '24', '0', 0, '合计:')
-							strCmd += blesdk.addCPCLText('300', that.yNum, '24', '0', 0, that.sales.productCount + '件')
+							strCmd += blesdk.addCPCLText('420', that.yNum, '24', '0', 0, that.sales.productCount + '件')
-							strCmd += blesdk.addCPCLText('650', that.yNum, '24', '0', 0, '￥' + that.sales.totalAmount)
+							strCmd += blesdk.addCPCLText('730', that.yNum, '24', '0', 0, '￥' + that.sales.totalAmount)
 						} else {
 							strCmd += blesdk.addCPCLSETMAG(1, 1)
 							strCmd += blesdk.addCPCLText('0', that.yNum += 40, '24', '0', 0, '合计:')
-							strCmd += blesdk.addCPCLText('300', that.yNum, '24', '0', 0, that.sales.productCount + '件')
+							strCmd += blesdk.addCPCLText('420', that.yNum, '24', '0', 0, that.sales.productCount + '件')
-							strCmd += blesdk.addCPCLText('650', that.yNum, '24', '0', 0, '￥' + that.sales.totalAmount)
+							strCmd += blesdk.addCPCLText('730', that.yNum, '24', '0', 0, '￥' + that.sales.totalAmount)
 						}
 					}else{
 						if (that.yNum + 64 >= 1990 * pageNum) {