Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into intex

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -856,6 +856,7 @@
 				console.log(877,params)
 				// return;
 				purchaseReceiptJobSubmit(params).then(res => {
+					
 					if (res.data) {
 						let isCheckPrint = getSwitchInfoByCode(this.switchCode)//是否显示上架指引单
 						let isCheckPrint1 = getSwitchInfoByCode(this.switchCode1)//是否显示采购收货检验指引单
@@ -867,7 +868,7 @@
 							})
 						}else if(!isCheckPrint1 && !isCheckPrint){
 							 this.showCommitSuccessMessage("提交成功\n生成采购收货记录\n" + res.data.number)
-						}else if(this.source_type!='TOOL'&&this.source_type!='Develop'){
+						}else if(that.source_type!='TOOL'&&that.source_type!='Develop'){
 							// if (res.data == '打印任务已发送，等待打印机处理！') {
 							// 	this.showCommitSuccessMessage(res.data)
 							// 	const purchaseReceiptDetailPointParams = {
@@ -941,6 +942,9 @@
 								})
 							}, 2000)
 
+						}else if(that.source_type=='TOOL'||that.source_type=='Develop'){
+							uni.hideLoading()
+							this.showCommitSuccessMessage("提交成功\n生成采购收货记录\n" + res.data.number)
 						}
 
 					} else {