协定收货任务+号试收货任务

src/pages.json

@@ -254,6 +254,62 @@
 				}
 			}
 		},
+		{
+			"path": "pages/purchaseReceipt/job/purchaseReceiptTool",
+			"style": {
+				"navigationBarTitleText": "协定品收货",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+		
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+		
+						},
+						{
+		
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
+		{
+			"path": "pages/purchaseReceipt/job/purchaseReceiptDevelop",
+			"style": {
+				"navigationBarTitleText": "号试品收货",
+				"enablePullDownRefresh": true,
+				"titleNView": {
+					// "autoBackButton": "true",
+					"buttons": [
+						// 右边按钮
+						{
+		
+							"float": "right",
+							"fontSize": "58rpx", //按钮上文字的大小
+							"text": "\ue696",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+		
+						},
+						{
+		
+							"float": "right",
+							"fontSize": "52rpx", //按钮上文字的大小
+							"text": "\ue6e2",
+							"fontSrc": "/static/ali_icon/iconfont.ttf"
+						}
+					]
+				}
+			}
+		},
 		{
 			"path": "pages/purchaseReceipt/job/purchaseReject",
 			"style": {

src/pages/purchaseReceipt/job/purchaseReceipt.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<receipt-job :title="title" scanTitle="箱标签/ASN单号" :isShowAsn="false" :isShowJob="false" ref="receiptjob" operation='receipt'></receipt-job>
+		<receipt-job source_type="ASN" :title="title" scanTitle="箱标签/ASN单号" :isShowAsn="false" :isShowJob="false" ref="receiptjob" operation='receipt'></receipt-job>
 	</view>
 </template>
 

src/pages/purchaseReceipt/job/purchaseReceiptDevelop.vue

@@ -0,0 +1,52 @@
+<template>
+	<view class="">
+		<receipt-job :title="title" source_type="Develop" scanTitle="箱标签/ASN单号" :isShowAsn="false" :isShowJob="false" ref="receiptjob" operation='receipt'></receipt-job>
+	</view>
+</template>
+
+<script>
+	import receiptJob from '@/pages/purchaseReceipt/job/receiptJob.vue'
+
+	export default {
+		name: 'purchaseReceiptTool',
+		components: {
+			receiptJob
+		},
+		data() {
+			return {
+				title:''
+			};
+		},
+		onShow() {
+			if(this.$refs.receiptjob!=undefined){
+				this.$refs.receiptjob.refresh();
+			}
+		},
+		onLoad(option) {
+			this.title = option.title
+		},
+
+		onPullDownRefresh() {
+			this.$refs.receiptjob.refresh();
+		},
+		
+		onReachBottom() {
+			this.$refs.receiptjob.onReach();
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				this.$refs.receiptjob.goHome();
+				// this.$refs.receiptjob.refresh();
+			} else if (e.index == 1) {
+				this.$refs.receiptjob.openFilter();
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/pages/purchaseReceipt/job/purchaseReceiptTool.vue

@@ -0,0 +1,52 @@
+<template>
+	<view class="">
+		<receipt-job :title="title" source_type="TOOL" scanTitle="箱标签/ASN单号" :isShowAsn="false" :isShowJob="false" ref="receiptjob" operation='receipt'></receipt-job>
+	</view>
+</template>
+
+<script>
+	import receiptJob from '@/pages/purchaseReceipt/job/receiptJob.vue'
+
+	export default {
+		name: 'purchaseReceiptTool',
+		components: {
+			receiptJob
+		},
+		data() {
+			return {
+				title:''
+			};
+		},
+		onShow() {
+			if(this.$refs.receiptjob!=undefined){
+				this.$refs.receiptjob.refresh();
+			}
+		},
+		onLoad(option) {
+			this.title = option.title
+		},
+
+		onPullDownRefresh() {
+			this.$refs.receiptjob.refresh();
+		},
+		
+		onReachBottom() {
+			this.$refs.receiptjob.onReach();
+		},
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				this.$refs.receiptjob.goHome();
+				// this.$refs.receiptjob.refresh();
+			} else if (e.index == 1) {
+				this.$refs.receiptjob.openFilter();
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -176,7 +176,8 @@
 				switchCode1: "",
 				isCheckLocation: 'purchaseReceiptLocationCodeValidate', //校验收货库位
 				reasonText: "",
-				packingNumberList:[],
+				packingNumberList:[],
+				source_type:'',
 				// printDeafult: {}, //默认打印机
 				// templateDeafult: {} //默认的模板
 			};
@@ -187,7 +188,8 @@
 			this.id = option.id;
 			this.scanMessage = option.scanMessage;
 			this.operation = option.operation;
-			this.status = option.status;
+			this.status = option.status;
+			this.source_type = option.source_type;
 			this.switchCode = "purchasereceiptPrintPDA" //采购收货PDA打印开关
 			this.switchCode1 = "EnableQms" //根据开关中是否启用QMS去判断，如果为TRUE显示检验指引单，如果为FALSE不显示检验指引单
 		},
@@ -863,7 +865,7 @@
 							})
 						}else if(!isCheckPrint1 && !isCheckPrint){
 							 this.showCommitSuccessMessage("提交成功\n生成采购收货记录\n" + res.data.number)
-						}else {
+						}else if(this.source_type!='TOOL'&&this.source_type!='Develop'){
 							// if (res.data == '打印任务已发送，等待打印机处理！') {
 							// 	this.showCommitSuccessMessage(res.data)
 							// 	const purchaseReceiptDetailPointParams = {
@@ -873,12 +875,13 @@
 							// 	uni.setStorageSync('purchaseReceiptDetailPointParams', purchaseReceiptDetailPointParams)
 							// } else {
 							// 	this.showErrorMessage(res.data)
-							// }
+							// }
+							
 							uni.showLoading({
 								title: "提交成功,将跳转到打印页面",
 								mask: true
-							});
-
+							});
+							
 							// 获取上架任务
 							let timerCount = 0
 							const timer1 = setInterval(async () => {

src/pages/purchaseReceipt/job/receiptJob.vue

@@ -101,6 +101,10 @@
 			title: {
 				type: String,
 				default: ''
+			},
+			source_type: {
+				type: String,
+				default: ''
 			},
 		},
 
@@ -198,7 +202,15 @@
 					column: "accept_user_id",
 					action: "==",
 					value: this.$store.state.user.id
-				})
+				})
+				if(this.source_type){
+					filters.push({
+						column: "source_type",
+						action: "==",
+						value: this.source_type
+					})
+				}
+				
 
 				var params = {
 					filters: filters,
@@ -298,7 +310,7 @@
 			openJobDetail(item, scanMessage = '') {
 				uni.navigateTo({
 					url: './receiptDetail?id=' + item.masterId + '&status=' + item.status + '&operation=' + this
-						.operation + '&scanMessage=' + scanMessage
+						.operation + '&scanMessage=' + scanMessage + '&source_type=' + this.source_type
 				});
 				this.scanMessage = ""
 			},