shish 3 лет назад
Родитель
Сommit
76e891da67
2 измененных файлов с 8 добавлено и 8 удалено
  1. 4 5
      ghsApp/src/admin/item/components/item.vue
  2. 4 3
      ghsApp/src/admin/item/list.vue

+ 4 - 5
ghsApp/src/admin/item/components/item.vue

@@ -37,8 +37,8 @@
 	</view>
 	<text class="bottom-button" @click.stop="moreAction(info)">更多</text>
 	<text class="bottom-button" @click.stop="goToStockDetail(info)">库存明细</text>
-	<text class="bottom-button" @click.stop="breakSingleItem(info)">拆 1 份</text>
-	<text class="bottom-button" @click.stop="doPrintLabel(info.id)">打标签</text>
+	<text class="bottom-button" @click.stop="doPrintLabel(info,0)">打标签</text>
+	<text class="bottom-button" @click.stop="doPrintLabel(info,1)">打价码</text>
 </view>
 </template>
 <script>
@@ -65,8 +65,8 @@ export default {
 		moreAction(item){
 			this.$emit('moreAction', item)
 		},
-		doPrintLabel(item){
-			this.$emit('doPrintLabel', item)
+		doPrintLabel(item,type){
+			this.$emit('doPrintLabel', item.id,type)
 		},
 		goToStockDetail(item){
 			this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+item.id+'&name='+item.name})
@@ -77,7 +77,6 @@ export default {
 	}
 };
 </script>
-
 <style lang="scss" scoped>
 .product{
 	height:230upx;

+ 4 - 3
ghsApp/src/admin/item/list.vue

@@ -93,7 +93,6 @@
 				<view style="width:100vw;margin-top:8upx;"><button @click="shareItem()">分享</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="getHdPosterFn()">分享海报(花店)</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="getSkPosterFn()">分享海报(个人)</button></view>
-				<view style="width:100vw;margin-top:8upx;"><button @click="breakMore()">拆散</button></view>
 				<view style="width:100vw;margin-top:30upx;"><button @click="closeRightShow()">取消</button></view>
 			</view>
 		</uni-popup>
@@ -142,6 +141,7 @@ export default {
 			status:0,
 			delStatus:0,
 			printItemId:0,
+			printType:0,
 			printLabelShow:false,
 			printNum:'',
 			printFocus:false,
@@ -295,8 +295,9 @@ export default {
 		blur() {
 			this.printFocus = false
 		},
-		doPrintLabel(id){
+		doPrintLabel(id,type){
 			this.printItemId = id
+			this.printType = type
 			this.printLabelShow = true
 			this.printNum = null
 			setTimeout(x => {
@@ -331,7 +332,7 @@ export default {
 				that.printFocus = false
 				return
 			}
-			print({id:itemId,num:currentNum}).then(res=>{
+			print({id:itemId,num:currentNum,type:this.printType}).then(res=>{
 				if(res.code == 1){
 					that.printLabelShow = false
 					that.printFocus = false