条码打印

ghsApp/src/admin/billing/affirm.vue

@@ -338,7 +338,7 @@ export default {
 		moreToDo(item){
 			//查询是否已经连接蓝牙
 			let that=this;
-			let doList = ['打印标签', '打印标签2个', '打印标签5个','打印标签10个','打印标签20个']
+			let doList = ['打印条码', '打印条码2个', '打印条码5个','打印条码10个','打印条码20个']
 			let doNum = [1,2,5,10,20]
 			uni.showActionSheet({
 				itemList: doList,
@@ -347,7 +347,7 @@ export default {
 
 					plug.state({},ret=>{
 						if(ret.code == 1){
-              that.$util.confirmModal({content:'您还没有连接标签机，请先连接'},() => {
+              that.$util.confirmModal({content:'您还没有连接条码机，请先连接'},() => {
                 // #ifdef APP-PLUS
                 plug.connectUSB({setBackgroundColor:"#2088d2"},ret=>{   
                   //console.log(ret)
@@ -370,15 +370,15 @@ export default {
 
 		},
 		OrderLable(itemName,itemId){
-			//制作标签格式， 
+			//制作条码格式， 
 			var data=[];  //定义一个数组
 			var line={};  //每添加一个，代表一行字
 			
-			//设置标签纸大小
+			//设置条码纸大小
 			line={};
 			line.width=30; //mm
 			line.height=20; //mm
-			line.gap=2; //标签纸之间，间隙长度 mm
+			line.gap=2; //条码纸之间，间隙长度 mm
 			line.page=1; //打印几份
 			data.push(line); //每添加一个，代表一行字
 

ghsApp/src/admin/home/me.vue

@@ -86,7 +86,7 @@
             </tui-list-cell>
 
             <!-- <tui-list-cell @click="pageTo({ url: '/admin/tools/blue' })" class="line-cell" :hover="false" :arrow="true">
-              <view class="tui-title">标签机设置</view>
+              <view class="tui-title">条码机设置</view>
             </tui-list-cell> -->
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/trumpet' })" class="line-cell" :hover="false" :arrow="true">

ghsApp/src/admin/item/list.vue

@@ -101,7 +101,7 @@ export default {
 		moreToDo(item){
 			//查询是否已经连接蓝牙
 			let that=this;
-			let doList = ['复制花材', '打1个标签', '打2个标签', '打10个标签','打20个标签']
+			let doList = ['复制花材', '打1个条码', '打2个条码', '打10个条码','打20个条码']
 			let doNum = [0,1,2,10,20]
 			uni.showActionSheet({
 				itemList: doList,
@@ -113,7 +113,7 @@ export default {
 						// #ifdef APP-PLUS
 						plug.state({},ret=>{
 							if(ret.code == 1){
-								that.$util.confirmModal({content:'您还没有连接标签机，请先连接'},() => {
+								that.$util.confirmModal({content:'您还没有连接条码机，请先连接'},() => {
 									// #ifdef APP-PLUS
 									plug.connectUSB({setBackgroundColor:"#2088d2"},ret=>{   
 									//console.log(ret)
@@ -143,17 +143,17 @@ export default {
 				}
 			})
 		},
-		//大标签
+		//大条码
 		createLable(itemName,itemId,num){
-			//制作标签格式，
+			//制作条码格式，
 			var data=[];  //定义一个数组
 			var line={};  //每添加一个，代表一行字
 
-			//设置标签纸大小
+			//设置条码纸大小
 			line={};
 			line.width=40; //mm
 			line.height=50; //mm
-			line.gap=2; //标签纸之间，间隙长度 mm
+			line.gap=2; //条码纸之间，间隙长度 mm
 			line.page=num; //打印几份
 			data.push(line); //每添加一个，代表一行字
 
@@ -181,18 +181,18 @@ export default {
 
 			return data;
 		},
-		//小标签
+		//小条码
 		createLable2(itemName,itemId){
 
-			//制作标签格式，
+			//制作条码格式，
 			var data=[];  //定义一个数组
 			var line={};  //每添加一个，代表一行字
 
-			//设置标签纸大小
+			//设置条码纸大小
 			line={};
 			line.width=30; //mm
 			line.height=20; //mm
-			line.gap=2; //标签纸之间，间隙长度 mm
+			line.gap=2; //条码纸之间，间隙长度 mm
 			line.page=1; //打印几份
 			data.push(line); //每添加一个，代表一行字
 
@@ -241,7 +241,7 @@ export default {
 			let that = this
 			plug.state({},ret=>{
 				if(ret.code == 1){
-					that.$util.confirmModal({content:'您还没有连接标签机，请先连接'},() => {
+					that.$util.confirmModal({content:'您还没有连接条码机，请先连接'},() => {
 						// #ifdef APP-PLUS
 						plug.connectUSB({setBackgroundColor:"#2088d2"},ret=>{   
 						//console.log(ret)

ghsApp/src/admin/itemClass/list.vue

@@ -133,7 +133,7 @@ export default {
 			let that = this
 			plug.state({},ret=>{
 				if(ret.code == 1){
-					that.$util.confirmModal({content:'您还没有连接标签机，请先连接'},() => {
+					that.$util.confirmModal({content:'您还没有连接条码机，请先连接'},() => {
 						// #ifdef APP-PLUS
 						plug.connectUSB({setBackgroundColor:"#2088d2"},ret=>{   
 						//console.log(ret)
@@ -164,15 +164,15 @@ export default {
 		},
 		OrderLable(itemName,itemId){
 
-			//制作标签格式， 
+			//制作条码格式， 
 			var data=[];  //定义一个数组
 			var line={};  //每添加一个，代表一行字
 			
-			//设置标签纸大小
+			//设置条码纸大小
 			line={};
 			line.width=30; //mm
 			line.height=20; //mm
-			line.gap=2; //标签纸之间，间隙长度 mm
+			line.gap=2; //条码纸之间，间隙长度 mm
 			line.page=1; //打印几份
 			data.push(line); //每添加一个，代表一行字
 

ghsApp/src/pagesPurchase/info.vue

@@ -71,7 +71,7 @@
 			</view>
 
 			<view class="title">
-				商品信息 <text @click="printAllLabel()" style="float:right;font-weight:normal;color:#3385FF;margin-right:10upx;">打全部标签</text>
+				商品信息 <text @click="printAllLabel()" style="float:right;font-weight:normal;color:#3385FF;margin-right:10upx;">打全部条码</text>
 			</view>
 			<view class="module-com content-box">
 				<view class="commodity-view">
@@ -87,7 +87,7 @@
 									</text>
 								</view>
 								<view class="info-line">
-									<text class="item-type" style="color:#3385FF;" @click.stop="printLabel(s)">打标签</text>
+									<text class="item-type" style="color:#3385FF;" @click.stop="printLabel(s)">打条码</text>
 									<text class="item-count">{{ parseFloat(s.itemNum) }}扎</text>
 								</view>
 							</view>
@@ -214,9 +214,6 @@ export default {
 			detailInfo: {},
 			loading: false
 		};
-	},
-	onShow() {
-
 	},
 	methods: {
 		printLabel(ele){
@@ -224,7 +221,7 @@ export default {
 			// #ifdef APP-PLUS
 			plug.state({},ret=>{
 				if(ret.code == 1){
-					that.$util.confirmModal({content:'您还没有连接标签机，请先连接'},() => {
+					that.$util.confirmModal({content:'您还没有连接条码机，请先连接'},() => {
 						// #ifdef APP-PLUS
 						plug.connectUSB({setBackgroundColor:"#2088d2"},ret=>{   
 						//console.log(ret)
@@ -232,7 +229,7 @@ export default {
 						// #endif
 					})
 				}else{
-					that.$util.confirmModal({content:'确定打印'+ele.name+'的标签？'},() => {
+					that.$util.confirmModal({content:'确认打印？'},() => {
 							let data = []
 							if(ele.name && !that.$util.isEmpty(ele.name)){
 								let num = parseFloat(ele.itemNum)
@@ -256,7 +253,7 @@ export default {
 			// #ifdef APP-PLUS
 			plug.state({},ret=>{
 				if(ret.code == 1){
-					that.$util.confirmModal({content:'您还没有连接标签机，请先连接'},() => {
+					that.$util.confirmModal({content:'您还没有连接条码机，请先连接'},() => {
 						// #ifdef APP-PLUS
 						plug.connectUSB({setBackgroundColor:"#2088d2"},ret=>{   
 						//console.log(ret)
@@ -264,7 +261,7 @@ export default {
 						// #endif
 					})
 				}else{
-					that.$util.confirmModal({content:'确定打印全部标签？'},() => {
+					that.$util.confirmModal({content:'确认打印全部条码？'},() => {
 						if(!that.$util.isEmpty(that.detailInfo.itemInfo)){
 							let data = []
 							for (const ele of that.detailInfo.itemInfo) {
@@ -289,17 +286,17 @@ export default {
 			that.$msg('请在App上打印')
 			// #endif
 		},
-		//分隔标签
+		//分隔条码
 		createSeparateLabel(){
-			//制作标签格式， 
+			//制作条码格式， 
 			var data=[];  //定义一个数组
 			var line={};  //每添加一个，代表一行字
 
-			//设置标签纸大小
+			//设置条码纸大小
 			line={};
 			line.width=40; //mm
 			line.height=50; //mm
-			line.gap=2; //标签纸之间，间隙长度 mm
+			line.gap=2; //条码纸之间，间隙长度 mm
 			line.page=2; //打印几份
 			data.push(line); //每添加一个，代表一行字
 
@@ -316,15 +313,15 @@ export default {
 			return data;
 		},
 		createLable(itemName,itemId,num){
-			//制作标签格式， 
+			//制作条码格式， 
 			var data=[];  //定义一个数组
 			var line={};  //每添加一个，代表一行字
 
-			//设置标签纸大小
+			//设置条码纸大小
 			line={};
 			line.width=40; //mm
 			line.height=50; //mm
-			line.gap=2; //标签纸之间，间隙长度 mm
+			line.gap=2; //条码纸之间，间隙长度 mm
 			line.page=num; //打印几份
 			data.push(line); //每添加一个，代表一行字
 

hdApp/src/admin/goods/cgNewPlantResult.vue

@@ -5,121 +5,21 @@
 			<view class="result-view">
 				<view class="iconfont iconchenggong"></view>
 				<view class="result-title">操作成功</view>
-				<button class="admin-button-com big blue" style="width:45vh;" @click="printLabel">打标签</button>
+				<button class="admin-button-com big blue" style="width:45vh;" @click="goDetail">打印条码</button>
 				<button class="admin-button-com big default" style="width:45vh;margin-top:30upx;" @click="goBackHome">返回</button>
 			</view>
 		</view>
 	</view>
 </template>
 <script>
-import { getFullInfo } from "@/api/plant-cg";
-// #ifdef APP-PLUS
-const plug = uni.requireNativePlugin('Html5app-Gprinter')
-// #endif
 export default {
     name: "success",
 	methods: {
 		goBackHome() {
 			uni.navigateBack({})
 		},
-		printLabel(){
-			let that = this
-			// #ifdef MP-WEIXIN
-			that.$msg('请在App上打印')
-			// #endif
-			// #ifdef APP-PLUS
-			plug.state({},ret=>{
-				if(ret.state == 1){
-					that.$util.confirmModal({content:'您还没有连接标签机，请先连接'},() => {
-						plug.connectUSB({setBackgroundColor:"#2088d2"},ret=>{   
-							//console.log(ret)
-						})
-					})
-				}else{
-					that.$util.confirmModal({content:'确认打印？'},() => {
-						that.confirmPrintLabel()	
-					})
-				}
-			})
-			// #endif
-		},
-		confirmPrintLabel(){
-			let that = this
-			// #ifdef MP-WEIXIN
-			that.$msg('请在App上打印')
-			// #endif
-			// #ifdef APP-PLUS
-			plug.state({},ret=>{
-				if(ret.state == 1){
-					that.$util.confirmModal({content:'您还没有连接标签机，请先连接'},() => {
-						plug.connectUSB({setBackgroundColor:"#2088d2"},ret=>{   
-							//console.log(ret)
-						})
-					})
-				}else{
-					getFullInfo({id:this.option.id}).then(res=>{
-						if(res.code == 1){
-							if(res.data.itemList && !that.$util.isEmpty(res.data.itemList)){
-								let data = []
-								for (const ele of res.data.itemList) {
-									let currentNum = ele.num ? Number(ele.num) : 0
-									let name = ele.name || ''
-									let code = ele.goodsSn || ''
-									if(Number(currentNum)<=0){
-										this.$msg('请选择打印数量')
-										return false
-									}
-									let label = that.createLable(name,code,currentNum)
-									data.push(label)
-								}
-								//说明地址 https://ext.dcloud.net.cn/plugin?id=462
-								plug.printer({"TSC":data,isArray:true},result=>{
-									//console.log(result)
-								})
-							}					
-						}
-					})
-				}
-			})
-			// #endif
-		},
-		//大标签
-		createLable(itemName,itemId,num){
-			//制作标签格式，
-			var data=[];  //定义一个数组
-			var line={};  //每添加一个，代表一行字
-
-			//设置标签纸大小
-			line={};
-			line.width=40; //mm
-			line.height=50; //mm
-			line.gap=2; //标签纸之间，间隙长度 mm
-			line.page=num; //打印几份
-			data.push(line); //每添加一个，代表一行字
-
-			//添加文字
-			line={};
-			line.text= itemName;
-			line.rotation=0;
-			line.x=30;
-			line.y=15;
-			line.xscal=2;
-			line.yscal=2;
-			data.push(line); //每添加一个，代表一行字
-
-			//添加条型码
-			line={};
-			line.barcode=itemId;
-			line.x=30;
-			line.y=80;
-			line.type="CODE128";
-			line.width=2;//条型宽度，这里的宽指的是 条型码 竖条的宽度，不是整个条型码的宽度
-			line.height=90;
-			line.readable=true;
-			line.rotation=0;
-			data.push(line);
-
-			return data;
+		goDetail(){
+			this.$util.pageTo({ url: "/admin/goods/plantCgDetail", query: { id:this.option.id },type:2})
 		}
 	}
 };

hdApp/src/admin/goods/plantCgDetail.vue

@@ -30,7 +30,7 @@
       <view class="module-com content-box proInfo">
         <view class="commodity-view">
           <view class="infoAEdit">
-            <text>商品信息</text>
+            <text>商品信息</text> <text @click="printAllLabel()" style="float:right;font-weight:normal;color:#3385FF;margin-right:10upx;">打全部条码</text>
           </view>
           <view class="commodity-list">
             <view v-for="(s, idx) in itemList" :key="idx" class="commodity-item" >
@@ -46,7 +46,7 @@
                   </text>
                 </view>
                 <view class="info-line">
-                  <text class="item-type"></text>
+                  <text class="item-type" style="color:#3385FF;" @click.stop="printLabel(s)">打条码</text>
                   <text class="item-count">¥{{ parseFloat(s.totalPrice)||0 }}</text>
                 </view>
               </view>
@@ -97,6 +97,9 @@
 <script>
 import { getPlantCgDetail} from "@/api/goods/index";
 import TuiListCell from "@/components/plugin/list-cell";
+// #ifdef APP-PLUS
+const plug = uni.requireNativePlugin('Html5app-Gprinter')
+// #endif
 export default {
   name: "plantCgDetail",
   components: {
@@ -127,6 +130,139 @@ export default {
 			})
 		},
   methods: {
+		printLabel(ele){
+			let that = this
+			// #ifdef APP-PLUS
+			plug.state({},ret=>{
+				if(ret.code == 1){
+					that.$util.confirmModal({content:'您还没有连接条码机，请先连接'},() => {
+						// #ifdef APP-PLUS
+						plug.connectUSB({setBackgroundColor:"#2088d2"},ret=>{   
+						//console.log(ret)
+						})
+						// #endif
+					})
+				}else{
+					that.$util.confirmModal({content:'确认打印？'},() => {
+							let data = []
+							if(ele.name && !that.$util.isEmpty(ele.name)){
+								let num = parseFloat(ele.num)
+								let label = that.createLable(ele.name,ele.goodsSn,num)
+								data.push(label)
+							}
+							//说明地址 https://ext.dcloud.net.cn/plugin?id=462
+							plug.printer({"TSC":data,isArray:true},result=>{
+								//console.log(result)
+							})
+					})
+				}
+			})
+			// #endif
+			// #ifdef MP-WEIXIN
+			that.$msg('请在App上打印')
+			// #endif
+		},
+		printAllLabel(){
+			let that = this
+			// #ifdef APP-PLUS
+			plug.state({},ret=>{
+				if(ret.code == 1){
+					that.$util.confirmModal({content:'您还没有连接条码机，请先连接'},() => {
+						// #ifdef APP-PLUS
+						plug.connectUSB({setBackgroundColor:"#2088d2"},ret=>{   
+						//console.log(ret)
+						})
+						// #endif
+					})
+				}else{
+					that.$util.confirmModal({content:'确认打印全部条码？'},() => {
+						if(!that.$util.isEmpty(that.itemList)){
+							let data = []
+							for (const ele of that.itemList) {
+								if(ele.name && !that.$util.isEmpty(ele.name)){
+									let num = parseFloat(ele.num)
+									let label = that.createLable(ele.name,ele.goodsSn,num)
+									data.push(label)
+									let separateLabel = that.createSeparateLabel()
+									data.push(separateLabel)
+								}
+							}
+							//说明地址 https://ext.dcloud.net.cn/plugin?id=462
+							plug.printer({"TSC":data,isArray:true},result=>{
+								//console.log(result)
+							})
+						}
+					})
+				}
+			})
+			// #endif
+			// #ifdef MP-WEIXIN
+			that.$msg('请在App上打印')
+			// #endif
+		},
+		//分隔条码
+		createSeparateLabel(){
+			//制作条码格式， 
+			var data=[];  //定义一个数组
+			var line={};  //每添加一个，代表一行字
+
+			//设置条码纸大小
+			line={};
+			line.width=40; //mm
+			line.height=50; //mm
+			line.gap=2; //条码纸之间，间隙长度 mm
+			line.page=2; //打印几份
+			data.push(line); //每添加一个，代表一行字
+
+			//添加文字
+			line={};
+			line.text= '======';
+			line.rotation=0;
+			line.x=30;
+			line.y=15;
+			line.xscal=2;
+			line.yscal=2;
+			data.push(line); //每添加一个，代表一行字
+
+			return data;
+		},
+		createLable(itemName,itemId,num){
+			//制作条码格式， 
+			var data=[];  //定义一个数组
+			var line={};  //每添加一个，代表一行字
+
+			//设置条码纸大小
+			line={};
+			line.width=40; //mm
+			line.height=50; //mm
+			line.gap=2; //条码纸之间，间隙长度 mm
+			line.page=num; //打印几份
+			data.push(line); //每添加一个，代表一行字
+
+			//添加文字
+			line={};
+			line.text= itemName;
+			line.rotation=0;
+			line.x=260;
+			line.y=15;
+			line.xscal=2;
+			line.yscal=2;
+			data.push(line); //每添加一个，代表一行字
+
+			//添加条型码
+			line={};
+			line.barcode=itemId;
+			line.x=260;
+			line.y=80;
+			line.type="CODE128";
+			line.width=2;//条型宽度，这里的宽指的是 条型码 竖条的宽度，不是整个条型码的宽度
+			line.height=90;
+			line.readable=true;
+			line.rotation=0;
+			data.push(line);
+
+			return data;
+		},
     copy (val) {
       const self = this;
       uni.setClipboardData({
@@ -394,7 +530,6 @@ export default {
   left: 0;
   width: 100vw;
   padding: 15upx 0;
-  // height: 100upx;
   background: #fff;
   line-height: 100upx;
   border-top: 1px solid #ddd;

hdApp/src/admin/goods/plantConfirm.vue

@@ -33,6 +33,12 @@
           </view>
         </view>
         <view class="module-com input-line-wrap">
+
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">运费</view>
+            <input v-model="form.sendCost" placeholder-class="phcolor" class="tui-input" name="sendCost" @focus="form.sendCost=''" placeholder="请填写运费，没有留空" maxlength="50" type="digit" />
+          </tui-list-cell>
+
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">备注</view>
 						<input type="text" v-model="form.remark" placeholder="选填"/>
@@ -61,7 +67,10 @@ export default {
   data () {
     return {
       selectJobType: "cgPlant",
-      form: { remark:"" }
+      form: {
+        remark:"",
+        sendCost:''
+      }
     };
   },
   onLoad (option) {
@@ -85,7 +94,7 @@ export default {
         return { goodsId: ele.id, num: ele.bigCount,price: ele.userPrice,goodsSn:ele.sn,cover:ele.cover }
       })
       that.$util.confirmModal({content:'确认提交？'},() => {
-          cgPlant({goods:JSON.stringify(goods),remark:that.form.remark}).then((res) => {
+          cgPlant({goods:JSON.stringify(goods),...that.form}).then((res) => {
             that.removeFromSaveDirect()
             that.pageTo({url: '/admin/goods/cgNewPlantResult',type:2,query:{id:res.data.id}})
           });

hdApp/src/admin/home/workbench.vue

@@ -96,13 +96,13 @@ export default {
         { name: "工单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1 },
         { name: "花材", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/item/list",pf:1 },
         { name: "改价", img: `${this.$constant.imgUrl}/ghs/home/gj.png`, url: "/admin/changePrice/list",pf:0},
-        { name: "成品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1 },
+        { name: "供应商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:0 },
         { name: "采购单", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/pagesPurchase/shopping",pf:0 },
         { name: "采购结账单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/clear/list",pf:0 },
-        { name: "供应商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:0 },
+        { name: "成品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1 },
+        { name: "成品采购单", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/admin/goods/plantCg",pf:1},
         { name: "报损单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1},
         { name: "员工", img: `${this.$constant.imgUrl}/ghs/home/yggl.png`, url: "/admin/staff/list",pf:0 },
-        { name: "成品采购单", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/admin/goods/plantCg",pf:1},
         { name: "花材分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,url: "/admin/itemClass/list",pf:1},
       ],
       totalData: [

hdApp/src/admin/item/list.vue

@@ -101,7 +101,7 @@ export default {
 		moreToDo(item){
 			//查询是否已经连接蓝牙
 			let that=this;
-			let doList = ['复制花材', '打1个标签', '打2个标签', '打10个标签','打20个标签']
+			let doList = ['复制花材', '打1个条码', '打2个条码', '打10个条码','打20个条码']
 			let doNum = [0,1,2,10,20]
 			uni.showActionSheet({
 				itemList: doList,
@@ -113,7 +113,7 @@ export default {
 						// #ifdef APP-PLUS
 						plug.state({},ret=>{
 							if(ret.code == 1){
-								that.$util.confirmModal({content:'您还没有连接标签机，请先连接'},() => {
+								that.$util.confirmModal({content:'您还没有连接条码机，请先连接'},() => {
 									// #ifdef APP-PLUS
 									plug.connectUSB({setBackgroundColor:"#2088d2"},ret=>{   
 										//console.log(ret)
@@ -143,17 +143,17 @@ export default {
 				}
 			})
 		},
-		//大标签
+		//大条码
 		createLable(itemName,itemId,num){
-			//制作标签格式，
+			//制作条码格式，
 			var data=[];  //定义一个数组
 			var line={};  //每添加一个，代表一行字
 
-			//设置标签纸大小
+			//设置条码纸大小
 			line={};
 			line.width=40; //mm
 			line.height=50; //mm
-			line.gap=2; //标签纸之间，间隙长度 mm
+			line.gap=2; //条码纸之间，间隙长度 mm
 			line.page=num; //打印几份
 			data.push(line); //每添加一个，代表一行字
 
@@ -181,18 +181,18 @@ export default {
 
 			return data;
 		},
-		//小标签
+		//小条码
 		createLable2(itemName,itemId){
 
-			//制作标签格式，
+			//制作条码格式，
 			var data=[];  //定义一个数组
 			var line={};  //每添加一个，代表一行字
 
-			//设置标签纸大小
+			//设置条码纸大小
 			line={};
 			line.width=30; //mm
 			line.height=20; //mm
-			line.gap=2; //标签纸之间，间隙长度 mm
+			line.gap=2; //条码纸之间，间隙长度 mm
 			line.page=1; //打印几份
 			data.push(line); //每添加一个，代表一行字