打印标签功能

ghsApp/src/admin/billing/affirm.vue

@@ -327,7 +327,7 @@ export default {
 							let currentNum = Number(doNum[index])
 							console.log(currentNum)
 							for (let i = 0; i < currentNum; i++) {
-								plug.printer({"TSC":that.OrderLable(item.name,item.id)},ret=>{
+								plug.printer({"TSC":that.OrderLable(item.name,item.itemId)},ret=>{
 									//uni.showToast({ title: JSON.stringify(ret), duration: 5000 })
 								})
 							}

ghsApp/src/admin/item/list.vue

@@ -120,7 +120,7 @@ export default {
 							let currentNum = Number(doNum[index])
 							console.log(currentNum)
 							for (let i = 0; i < currentNum; i++) {
-								plug.printer({"TSC":that.OrderLable(item.name,item.id)},ret=>{
+								plug.printer({"TSC":that.OrderLable(item.name,item.itemId)},ret=>{
 									//uni.showToast({ title: JSON.stringify(ret), duration: 5000 })
 								})
 							}
@@ -200,7 +200,7 @@ export default {
 							if(!that.$util.isEmpty(globalItem.child)){
 								globalItem.child.forEach((currentItem)=>{
 									console.log(currentItem)
-									plug.printer({"TSC":that.OrderLable(currentItem.name,currentItem.id)},ret=>{
+									plug.printer({"TSC":that.OrderLable(currentItem.name,currentItem.itemId)},ret=>{
 										//uni.showToast({ title: JSON.stringify(ret), duration: 5000 })
 									})
 								})

ghsApp/src/admin/itemClass/list.vue

@@ -145,7 +145,7 @@ export default {
 								if(!that.$util.isEmpty(itemData)){
 									itemData.forEach((item)=>{
 										console.log(item.name+item.id)
-										plug.printer({"TSC":that.OrderLable(item.name,item.id)},ret=>{
+										plug.printer({"TSC":that.OrderLable(item.name,item.itemId)},ret=>{
 											//uni.showToast({ title: JSON.stringify(ret), duration: 5000 })
 										})
 									})

ghsPad/src/admin/billing/affirm.vue

@@ -310,7 +310,7 @@ export default {
 							let currentNum = Number(doNum[index])
 							console.log(currentNum)
 							for (let i = 0; i < currentNum; i++) {
-								plug.printer({"TSC":that.OrderLable(item.name,item.id)},ret=>{
+								plug.printer({"TSC":that.OrderLable(item.name,item.itemId)},ret=>{
 									//uni.showToast({ title: JSON.stringify(ret), duration: 5000 })
 								})
 							}

ghsPad/src/admin/item/list.vue

@@ -120,7 +120,7 @@ export default {
 							let currentNum = Number(doNum[index])
 							console.log(currentNum)
 							for (let i = 0; i < currentNum; i++) {
-								plug.printer({"TSC":that.OrderLable(item.name,item.id)},ret=>{
+								plug.printer({"TSC":that.OrderLable(item.name,item.itemId)},ret=>{
 									//uni.showToast({ title: JSON.stringify(ret), duration: 5000 })
 								})
 							}
@@ -200,7 +200,7 @@ export default {
 							if(!that.$util.isEmpty(globalItem.child)){
 								globalItem.child.forEach((currentItem)=>{
 									console.log(currentItem)
-									plug.printer({"TSC":that.OrderLable(currentItem.name,currentItem.id)},ret=>{
+									plug.printer({"TSC":that.OrderLable(currentItem.name,currentItem.itemId)},ret=>{
 										//uni.showToast({ title: JSON.stringify(ret), duration: 5000 })
 									})
 								})

ghsPad/src/admin/itemClass/list.vue

@@ -145,7 +145,7 @@ export default {
 								if(!that.$util.isEmpty(itemData)){
 									itemData.forEach((item)=>{
 										console.log(item.name+item.id)
-										plug.printer({"TSC":that.OrderLable(item.name,item.id)},ret=>{
+										plug.printer({"TSC":that.OrderLable(item.name,item.itemId)},ret=>{
 											//uni.showToast({ title: JSON.stringify(ret), duration: 5000 })
 										})
 									})

hdApp/src/admin/item/list.vue

@@ -120,7 +120,7 @@ export default {
 							let currentNum = Number(doNum[index])
 							console.log(currentNum)
 							for (let i = 0; i < currentNum; i++) {
-								plug.printer({"TSC":that.OrderLable(item.name,item.id)},ret=>{
+								plug.printer({"TSC":that.OrderLable(item.name,item.itemId)},ret=>{
 									//uni.showToast({ title: JSON.stringify(ret), duration: 5000 })
 								})
 							}
@@ -200,7 +200,7 @@ export default {
 							if(!that.$util.isEmpty(globalItem.child)){
 								globalItem.child.forEach((currentItem)=>{
 									console.log(currentItem)
-									plug.printer({"TSC":that.OrderLable(currentItem.name,currentItem.id)},ret=>{
+									plug.printer({"TSC":that.OrderLable(currentItem.name,currentItem.itemId)},ret=>{
 										//uni.showToast({ title: JSON.stringify(ret), duration: 5000 })
 									})
 								})

hdApp/src/admin/itemClass/list.vue

@@ -145,7 +145,7 @@ export default {
 								if(!that.$util.isEmpty(itemData)){
 									itemData.forEach((item)=>{
 										console.log(item.name+item.id)
-										plug.printer({"TSC":that.OrderLable(item.name,item.id)},ret=>{
+										plug.printer({"TSC":that.OrderLable(item.name,item.itemId)},ret=>{
 											//uni.showToast({ title: JSON.stringify(ret), duration: 5000 })
 										})
 									})

hdPad/src/pages/home/components/console.vue

@@ -28,13 +28,20 @@
         <toPayWay @cancelPay="cancelPay()" @selectPayWayBack="selectPayWayBack" :orderId.sync="orderId"></toPayWay>
     </uni-popup>
 
+	<!-- 开单选花材输入数量和金额 -->
+	<uni-popup ref="selectNumPriceRef" background-color="#fff" type="center" :animation="false">
+		<selectNum v-if="currentJobType=='make'" @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></selectNum>
+		<selectNumPrice v-else @confirmAddItemModel="confirmAddItemModel" :customData.sync="customData" @cancelKdSelectNumPrice="addItemModelHidden"></selectNumPrice>
+	</uni-popup>
+
 </view>
 </template>
 <script>
 import settlePop from './settlePop.vue'
 import toPayWay from './toPay.vue'
 import { createCreateOrder, wastageCreateOrder } from '@/api/home/index'
-import productMins from "@/mixins/product";
+import productMins from "@/mixins/product"
+import { allProduct } from '@/api/product'
 export default {
     name:'console',
 	mixins: [productMins],
@@ -48,17 +55,31 @@ export default {
     data(){
         return {
             totalShop:{ bigUnit: 0, smallUnit:0, totalPrice: 0 },
-			orderId:0
+			orderId:0,
+			allProduct:[]
         }
     },
 	created(){
+		// #ifdef APP-PLUS
 		//避免重复，每次进来先移除全局自定义事件监听器
         uni.$off('listenGetScanCode') 
         uni.$on('listenGetScanCode',function(data){
 			console.log(data.code)
         })
+		allProduct().then(res=>{
+			this.allProduct = res.data.list
+			console.log('载入最新花材...')
+		})
+		// #endif
 	},
     methods:{
+		takeItem(code){
+			
+		},
+		popAddModelFn(info) {
+            this.$util.hitRemind()
+			this.showAddModelFn({ ...info, buyNum: 1, unitPrice: info.price,unitType:0})
+		},
 		changeProperty(property){
 			this.$emit('changeProperty',property)
 		},