打印优化

ghsApp/src/admin/billing/result.vue

@@ -13,7 +13,7 @@
   </button>
   <!-- #endif -->
 	<button v-if="option.title != '报损成功'" class="admin-button-com big" @click="gotoOrderDetail">订单详情</button>
-  <button v-if="option.title != '报损成功'" class="admin-button-com big" @click="printOrder()">打印(无价格)</button>
+  <button v-if="option.title != '报损成功'" class="admin-button-com big" @click="printOrder()">打印(无价)</button>
 	<button class="admin-button-com big" @click="goBackHome">返回首页</button>
   <view style="margin-top:20upx;">
     <block v-for="(item, index) in detailInfo.product" :key="index">

ghsApp/src/admin/home/components/OrderItem.vue

@@ -104,7 +104,14 @@ export default {
 			this.$emit('fillNoFh', info)
     },
 		printOrder(item) {
-			this.$emit('printOrder', item)
+      let that = this
+      if(item.printNum && Number(item.printNum)>0){
+        this.$util.confirmModal({content:'请检查是否发过货，确认补打？'},() => {
+          that.$emit('printOrder', item)
+        })
+      }else{
+        that.$emit('printOrder', item)
+      }
 		},
     statusFormat(status) {
         switch (status) {

ghsApp/src/pagesOrder/detail.vue

@@ -315,7 +315,7 @@
 			<button class="admin-button-com default" v-if="detailInfo.status == 4" @click="shareOrder()">分享</button>
 			<!-- #endif -->
 
-			<button class="admin-button-com default" style="width:240upx;" v-if="detailInfo.status != 1 && detailInfo.status != 5" @click="printOrder(detailInfo)">打印(无价格)</button>
+			<button class="admin-button-com default" style="width:240upx;" v-if="detailInfo.status != 1 && detailInfo.status != 5" @click="printOrder(detailInfo)">打印(无价)</button>
 
 			<button @click="cancelOrderFn(detailInfo)" v-if="detailInfo.status == 1" class="admin-button-com default" :class="active">取消</button>
 			<template v-for="s in detailInfo.buttonList">
@@ -639,11 +639,28 @@ export default {
 			return unixTimestamp;
 		},
 		printOrder(item){
+			let that = this
+			if(item.printNum && Number(item.printNum)>0){
+				this.$util.confirmModal({content:'请检查是否发过货，确认补打？'},() => {
+					that.beginPrintNoPrice(item)
+				})
+			}else{
+				that.beginPrintNoPrice(item)
+			}
+		},
+		beginPrintNoPrice(item){
 			uni.showLoading({title:"打印中..."})
 			cloudPrintOrder({id:item.id,showPrice:0}).then((res) => {
 				uni.hideLoading()
 			})
 		},
+		printHasPrice(item){
+			uni.showLoading({title:"打印中..."})
+			cloudPrintOrder({id:item.id}).then((res) => {
+				item.printNum++
+				uni.hideLoading()
+			})
+		},
 		clickBtn(s, item) {
 			this.orderId = item.id;
 			if (s.type === "selfGet") {
@@ -658,12 +675,14 @@ export default {
 				this.pageTo({url: "/pagesOrder/arrival",query: {id: item.id}});
 			} else if (s.type === "print") {
 				if(item.hasCloudPrint == 1){
-					//云打印
-					uni.showLoading({title:"打印中..."})
-					cloudPrintOrder({id:item.id}).then((res) => {
-						item.printNum++
-						uni.hideLoading()
-					})
+					let that = this
+					if(item.printNum && Number(item.printNum)>0){
+						this.$util.confirmModal({content:'请检查是否发过货，确认补打？'},() => {
+							that.printHasPrice(item)
+						})
+					}else{
+						that.printHasPrice(item)
+					}
 				}
 			} else if (s.type === "send") {
 				//发货