打印优化

ghsApp/src/admin/item/list2.vue

@@ -72,14 +72,20 @@
 			</view>
 		</view>
 
-		<modal-module :show="printLabelShow" @click="dialogInputConfirm" :maskClosable="true" title="数量" padding="30rpx 30rpx" >
+		<modal-module :show="printLabelShow" @click="dialogInputConfirm" :maskClosable="true" :title="printType==0?'标签数量':'价码数量'" padding="30rpx 30rpx" >
 			<template v-slot:content>
 				<div class="app-modal-input-wrap">
-				<div class="inp-list-line">
-					<div class="line-input">
-					<input type="number" ref="input" style="width:61.8%;text-align:center;" @blur="printBlur" :focus="printFocus" v-model="printNum" :adjust-position="false" class="inp-input" />
+					<div class="inp-list-line">
+						<div class="line-input">
+						<input type="number" ref="input" style="width:61.8%;text-align:center;" @blur="printBlur" :focus="printFocus" v-model="printNum" :adjust-position="false" class="inp-input" />
+						</div>
+					</div>
+					<div class="inp-list-line" v-if="printType==0">
+						<div class="line-input" style="justify-content: center;margin-top: 30upx;">
+							<button class="admin-button-com big" :class="priceOption === 0 ? 'blue' : 'default'" @click="priceOption = 0" style="margin-right:40upx;">没价格</button>
+							<button class="admin-button-com big" :class="priceOption === 1 ? 'blue' : 'default'" @click="priceOption = 1">有价格</button>
+						</div>
 					</div>
-				</div>
 				</div>
 			</template>
 		</modal-module>
@@ -246,7 +252,8 @@ export default {
 			partNum:'',
 			partShow:false,
 			partFocus:false,
-			showClassImg:false
+			showClassImg:false,
+			priceOption:0
 		};
 	},
 	computed:{
@@ -473,6 +480,7 @@ export default {
 			this.printItemId = id
 			this.printType = type
 			this.printLabelShow = true
+			this.priceOption = 0
 			this.printNum = null
 			setTimeout(x => {
 				this.$nextTick(() => this.setFocus())
@@ -506,7 +514,7 @@ export default {
 				that.printFocus = false
 				return
 			}
-			print({id:itemId,num:currentNum,type:this.printType}).then(res=>{
+			print({id:itemId,num:currentNum,type:this.printType,priceOption:this.priceOption}).then(res=>{
 				if(res.code == 1){
 					that.printLabelShow = false
 					that.printFocus = false

ghsApp/src/pagesPurchase/info.vue

@@ -280,17 +280,23 @@
 			</view>
 		</block>
 
-		<modal-module :show="printLabelShow" @click="dialogInputConfirm" :maskClosable="true" title="数量" padding="30rpx 30rpx" >
-		<template v-slot:content>
-			<div class="app-modal-input-wrap">
-			<div class="inp-list-line">
-				<div class="line-input">
-				<input type="number" ref="input" style="width:61.8%;text-align:center;" v-model="printNum" :adjust-position="false" class="inp-input" @focus="printNum=''" />
-				</div>
+	<modal-module :show="printLabelShow" @click="dialogInputConfirm" :maskClosable="true" :title="printType==0?'标签数量':'价码数量'" padding="30rpx 30rpx" >
+	<template v-slot:content>
+		<div class="app-modal-input-wrap">
+		<div class="inp-list-line">
+			<div class="line-input">
+			<input type="number" ref="input" style="width:61.8%;text-align:center;" v-model="printNum" :adjust-position="false" class="inp-input" @focus="printNum=''" />
 			</div>
+		</div>
+		<div class="inp-list-line" v-if="printType==0">
+			<div class="line-input" style="justify-content: center;margin-top: 30upx;">
+				<button class="admin-button-com big" :class="priceOption === 0 ? 'blue' : 'default'" @click="priceOption = 0" style="margin-right:40upx;">没价格</button>
+				<button class="admin-button-com big" :class="priceOption === 1 ? 'blue' : 'default'" @click="priceOption = 1">有价格</button>
 			</div>
-		</template>
-		</modal-module>
+		</div>
+		</div>
+	</template>
+	</modal-module>
 
 		<mx-date-picker :show="showPicker" format="yyyy-mm-dd" type="date" :value="defaultPickerDate" :show-tips="true" @confirm="confirmPicker" @cancel="showPicker = false" />
 
@@ -342,7 +348,8 @@ export default {
 			showSeat:1,
 			title:'',
 			imageUrl:'',
-      		currentEnv:'production'
+      		currentEnv:'production',
+			priceOption:0
 		};
 	},
 	onPullDownRefresh() {
@@ -475,7 +482,7 @@ export default {
 				that.printLabelShow = false
 				return
 			}
-			print({id:itemId,num:currentNum,type:this.printType}).then(res=>{
+			print({id:itemId,num:currentNum,type:this.printType,priceOption:this.priceOption}).then(res=>{
 				if(res.code == 1){
 					that.printLabelShow = false
 					uni.showToast({ title: '操作成功', duration: 1500 })
@@ -489,6 +496,7 @@ export default {
 			this.printType = type
 			this.printItemId = item.productId
 			this.printLabelShow = true
+			this.priceOption = 0
 			this.printNum = item.itemNum
 		},
 		shareOrder(){