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

src/pages/fg/receiptByPlan.vue

@@ -469,6 +469,8 @@
 					uni.navigateTo({
 						url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
 					});
+				}).catch(error => {
+					_this.showErrorMessage(error)
 				})
 			},
 			print(pointData){
@@ -486,6 +488,10 @@
 				pointData.forEach(item=>{
 					packingNumber.push(item.packageCode)
 				})
+				if(packingNumber.length==0){
+					_this.showErrorMessage('包装号不能为空！')
+					return
+				}
 				getBalanceToPackage({
 					packingNumber: packingNumber.join(',')
 				}).then(res => {

src/pages/pointPutawayJob/index.vue

@@ -1,11 +1,11 @@
 <template>
 	<!-- 采购上架对应的采购收货打印页面-->
 	<view class="content" style="padding:0rpx 20rpx 100rpx;min-height: calc(100vh - 120rpx);">
-		<view class="tabs-box" v-if="isHave">
+		<view class="tabs-box" v-if="isHaveOn && data1 && data1.inspectDTOList && data1.inspectDTOList.length>0">
 			<view @click="tabIndex = 1" :class="tabIndex == 1?'active1' :''" style="padding: 10rpx 0px;">检验指引单</view>
 			<view @click="tabIndex = 2" :class="tabIndex == 2?'active1' :''" style="padding: 10rpx 0px;">上架指引单</view>
 		</view>
-		<view class="" :style="{'paddingTop':isHave?'100rpx': '30rpx'}">
+		<view class="" :style="{'paddingTop':isHaveOn && data1 && data1.inspectDTOList && data1.inspectDTOList.length>0?'100rpx': '30rpx'}">
 			<view class="box" style="page-break-before:always;" v-if="tabIndex == 1">
 				<view class="">
 					<table border='1'>
@@ -59,10 +59,10 @@
 
 		</view>
 		<view class="" style="position: fixed;width: 100%;bottom: 0rpx;left: 0px;">
-			<button @click="printImage" v-if="tabIndex == 1 && data1.inspectDTOList && data1.inspectDTOList.length>0"
+			<button @click="printImage" v-if="tabIndex == 1  && data1.inspectDTOList && data1.inspectDTOList.length>0"
 				style='background:rgb(60, 156, 255) !important ;color: white;margin-top: 80rpx;'> 打印检验指引单
 			</button>
-			<button @click="printImage" v-if="tabIndex == 2&&isHave && data.sublist && data.sublist.length>0"
+			<button @click="printImage" v-if="tabIndex == 2&&isHaveOn && data.sublist && data.sublist.length>0"
 				style='background:rgb(60, 156, 255) !important ;color: white;margin-top: 80rpx;'> 打印上架指引单
 			</button>
 		</view>
@@ -110,7 +110,8 @@
 				currentPage1: 1,
 				pageSize1: 20,
 				number: '',
-				isHave: false
+				isHaveOn: false,//显示上架指引单
+				// isHaveInspect:false,//显示检验指引单
 			}
 		},
 
@@ -271,13 +272,14 @@
 		onLoad(option) {
 			if (option.data) {
 				this.data = JSON.parse(decodeURIComponent(option.data));
-				this.isHave = true
+				this.isHaveOn = true
 			}
 			if (option.number) {
 				this.number = option.number;
 			}
 		},
 		async onShow() {
+			// 获取上架指引单
 			await getJimuPutawayJobDetail({
 				masterIds: this.data.ids
 			}).then(res => {
@@ -289,6 +291,11 @@
 				number: this.number
 			}).then(async res1 => {
 				this.data1 = res1.data
+				this.data1.inspectDTOList = this.data1.inspectDTOList.filter(item=>item.sampleQty>0)
+				// this.data1.inspectDTOList=[]
+				if(this.data1&&this.data1.inspectDTOList&&this.data1.inspectDTOList.length == 0){
+					this.tabIndex =2
+				}
 				this.getTableInspectDTOList()
 			})
 			this.getPointPutawayJobHtml()

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -584,6 +584,7 @@
 														',')
 												}
 												console.log(dataParams)
+												uni.hideLoading()
 												uni.redirectTo({
 													url: '/pages/pointPutawayJob/index?number='+that.jobContent.number+'&data=' +
 														encodeURIComponent(JSON.stringify(dataParams))