From b6cce5bc444c5e9d272e4566541e51d8a8eaf253 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 21 Aug 2024 15:18:47 +0800
Subject: [PATCH 1/6] =?UTF-8?q?HL-5227=E6=8F=90=E4=BE=9B=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E9=87=87=E8=B4=AD=E4=B8=8A=E6=9E=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E4=B8=BA=E4=BA=86=E8=A7=A3=E5=86=B3=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=9C=B0=E5=A0=86=E5=BA=93=E4=BD=8D=E7=9A=84=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=93=8D=E4=BD=9C=E7=B9=81=E7=90=90=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/job/jobFilter.vue           |  8 +-
 src/pages.json                               |  2 +-
 src/pages/putaway/job/quantityPutawayJob.vue | 80 ++++++++++++--------
 3 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index 0b47d7e6..feb2e9bf 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -11,7 +11,7 @@
 				<u-switch v-model="checkedTodayModel" active-color="#4DD865" inactive-color="#eee" size="35"
 					@change="switchChangeToday"></u-switch>
 			</view>
-			<view class="uni-flex space-between u-col-center" style="width: 100%;margin-top: 30rpx;">
+			<view class="uni-flex space-between u-col-center" style="width: 100%;margin-top: 30rpx;"  v-if="isShowStatus">
 
 				<view class="" style="font-size: 32rpx;">
 					只看待处理
@@ -152,7 +152,11 @@
 			isShowToAreaCode: {
 				type: Boolean,
 				default: false
-			}
+			},
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
 		},
 		data() {
 			return {
diff --git a/src/pages.json b/src/pages.json
index 419f3380..0e300d43 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -462,7 +462,7 @@
 		{
 			"path": "pages/putaway/job/quantityPutawayJob",
 			"style": {
-				"navigationBarTitleText": "采购上架(批量)",
+				"navigationBarTitleText": "批量采购上架",
 				"enablePullDownRefresh": false,
 				"titleNView": {
 					// "autoBackButton": "true",
diff --git a/src/pages/putaway/job/quantityPutawayJob.vue b/src/pages/putaway/job/quantityPutawayJob.vue
index fbbae604..ae4a2297 100644
--- a/src/pages/putaway/job/quantityPutawayJob.vue
+++ b/src/pages/putaway/job/quantityPutawayJob.vue
@@ -1,13 +1,16 @@
 <template>
 	<view class="">
+		<view class="" style="background: white;padding: 20rpx;position: fixed;width: 100%;box-shadow: 0px 0px 10px 10px rgba(1, 1, 1, 0.05);z-index: 22;">
+			<uni-pagination :total="totalCount" title="标题文字" :pageSize='pageSize'  @change="changePage"/>
+		</view>
 		<com-empty-view v-if="jobList.length==0"></com-empty-view>
 		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
 		 :isShowToAreaCode="true"  :isShowQurery='true' :isShowToday='false'  :isShowStatus='false'
 			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
 			:checkedWaitTask="checkedWaitTask"  @onQuery="getListByFilter">
 		</job-filter>
-
-		<view v-if="jobList.length>0" style="padding-bottom: 100rpx;">
+	
+		<view v-if="jobList.length>0" style="padding-bottom: 100rpx;padding-top: 100rpx;">
 			<uni-swipe-action ref="swipeAction">
 				<view v-for="(item, index) in jobList" :key="index">
 					<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
@@ -20,7 +23,7 @@
 
 			<putaway-info-popup ref='jobInfoPopup'></putaway-info-popup>
 			<putaway-job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></putaway-job-list-popup>
-			<uni-load-more :status="loadingType" v-if="jobList.length>0" />
+			<!-- <uni-load-more :status="loadingType" v-if="jobList.length>0" /> -->
 
 		</view>
 		<!-- <win-scan-button @goScan='openScanPopup' v-if="jobList.length>0"></win-scan-button> -->
@@ -29,7 +32,7 @@
 		</winScanPackJob> -->
 		<jobList ref="jobList" @selectItem="selectItem"></jobList>
 		<view class="footer" v-if="jobList.length>0">
-			<button class="btn_single_commit" hover-class="btn_commit_after" @click="takeAllJob">全部执行</button>
+			<button class="btn_single_commit" hover-class="btn_commit_after" @click="takeAllJob">执行当前页</button>
 		</view>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
@@ -42,7 +45,8 @@
 		getPutawayJobList,
 		cancleTakePutawayJob,
 		putawayJobAllExecute,
-		takeAllPutawayJob
+		takeAllPutawayJob,
+		cancleAllTakePutawayJob
 	} from '@/api/request2.js';
 
 	import {
@@ -130,13 +134,13 @@
 				this.$refs.filter.openFilter();
 			}
 		},
-		onReachBottom() {
-			//避免多次触发
-			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
-				return;
-			}
-			this.getList("more");
-		},
+		// onReachBottom() {
+		// 	//避免多次触发
+		// 	if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+		// 		return;
+		// 	}
+		// 	this.getList("more");
+		// },
 		onPullDownRefresh() {
 			this.getList('refresh');
 		},
@@ -174,12 +178,12 @@
 					action: "==",
 					value: this.$store.state.user.id
 				})
-				if(toAreaCode){
+				if(this.toAreaCode){
 					//到库区
 					filters.push({
 						column: "toAreaCode",
 						action: "==",
-						value: toAreaCode
+						value: this.toAreaCode
 					})
 				}
 				var params = {
@@ -197,15 +201,16 @@
 
 					var list = res.data.list;
 					this.totalCount = res.data.total
+					console.log(333,this.totalCount)
 					updateTitle(this.title + "(" + this.totalCount + ")");
-					this.loadingType = "loadmore";
-					if (list == null || list.length == 0) {
-						this.loadingType = "nomore";
-						return;
-					}
-					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					// this.loadingType = "loadmore";
+					// if (list == null || list.length == 0) {
+					// 	this.loadingType = "nomore";
+					// 	return;
+					// }
+					this.jobList = list
 					this.jobNumberList = list.map(item=>item.number)
-					this.pageNo++;
+					// this.pageNo++;
 
 				}).catch(error => {
 					if (type === "refresh") {
@@ -273,7 +278,7 @@
 
 			switchChangeWait(state, jobStatus) {
 				this.checkedWaitTask = state;
-				this.status = jobStatus;
+				// this.status = jobStatus;
 				this.getList("refresh");
 			},
 
@@ -446,13 +451,7 @@
 					title: "加载中­....",
 					mask: true
 				});
-				
-				if (params.status) {
-					this.status  = params.status
-					
-				}else{
-					this.status  = "1"
-				}
+				this.status  = "1"
 				if(params.creationTime==""){
 					this.checkedToday = false;
 				}
@@ -492,17 +491,38 @@
 						uni.hideLoading()
 						this.$refs.comMessage.showSuccessMessage( "执行任务成功", res => {
 							if (res) {
-								this.getList("refresh")
+								this.getList()
 							}
 						});
 					} else {
 						uni.hideLoading()
 						this.showMessage("执行任务失败")
+						this.cancleAllJob()
+						
 					}
 				}).catch(error => {
 					uni.hideLoading()
 					this.showMessage(error)
+					this.cancleAllJob()
 				})
+				
+			},
+			//  取消承接全部任务
+			cancleAllJob(){
+				cancleAllTakePutawayJob({
+					jobNumberList:this.jobNumberList
+				}).then(res => {
+					
+				}).catch(error => {
+					uni.hideLoading()
+					this.showMessage(error)
+				})
+			},
+			changePage(e){
+				console.log(e)
+				this.pageNo = e.current
+				this.status = 1
+				this.getList()
 			}
 			
 		}

From cfd75ddf93993a23ae2bc1e4ae292593723b9b26 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 21 Aug 2024 19:02:49 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=9F=A5=E8=AF=A2=E5=8D=95=E6=8D=AE=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/manifest.json              |    4 +-
 src/pages/fg/receiptByPlan.vue | 1138 ++++++++++++++++----------------
 2 files changed, 569 insertions(+), 573 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 14ca485d..7a74e63a 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,8 +3,8 @@
     "package" : "uni.UNI43932FE",
     "appid" : "__UNI__C9CF4BF",
     "description" : "",
-    "versionName" : "1.0.66",
-    "versionCode" : 66,
+    "versionName" : "1.0.67",
+    "versionCode" : 67,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index ad34b963..7d509303 100644
--- a/src/pages/fg/receiptByPlan.vue
+++ b/src/pages/fg/receiptByPlan.vue
@@ -1,574 +1,570 @@
-<template>
-	<view class="page-wraper" style="background-color: #fff;">
-
-		<view class="header" >
-			<view class="">
-				<com-blank-view @goScan='openFg' v-if="!dataContent"></com-blank-view>
-			</view>
-			<view class="" v-if="dataContent">
-				<view class="page-header">
-					<view class="header-view">
-						<view class="" style="font-size: 35rpx;padding: 10rpx; padding-left: 15rpx;">
-							生产计划：{{dataContent.planNumber}}
-						</view>
-
-						<view class="cell_box uni-flex uni-row">
-							<view class="cell_info">
-								<view class="text_lightblue">完工库位</view>
-								<view style="font-size: 30rpx; margin-top: 13rpx;">{{dataContent.fgLocationCode}}
-								</view>
-
-							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">计划数</view>
-								<view>{{dataContent.planQty}}{{dataContent.uom}}</view>
-							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">已完工</view>
-								<view>{{ dataContent.goodQty }}{{dataContent.uom}}</view>
-							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">未完工</view>
-								<view>{{dataContent.noGoodQty}}{{dataContent.uom}}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="" style="padding: 10rpx; margin-left: 10rpx;">
-					<item :dataContent="dataContent"></item>
-				</view>
-				<view class='split_line'></view>
-				<view class="uni-flex uni-row space-between" style="align-items: center;padding: 0 10rpx;">
-					<view style="word-break: break-all;">
-						<batch :batch="dataContent.batch"></batch>
-						<view class="card_view ">
-							<text style="color: #FFA500;padding: 5px;font-size: 30rpx;">包装规格</text>
-							<text class="card_content ">{{dataContent.packUnit}} </text>
-						</view>
-					</view>
-					<view style="word-break: break-all; font-size: 35rpx; font-weight: bold;">
-						<text v-if="dataContent.handleQty>0" style="color: #FFA500;">{{dataContent.handleQty}}/</text>
-						<text class="text_recommend">{{dataContent.packQtyHint}}</text>
-					</view>
-				</view>
-				<view class='split_line' v-if="dataContent"></view>
-			</view>
-		</view>
-
-
-		<view style="padding-bottom: 160rpx;" v-if="dataContent">
-			<scroll-view scroll-y="true" class="">
-				<view class="scan_view" v-for="(item, index) in showList" :key="index">
-					<uni-swipe-action>
-						<uni-swipe-action-item :right-options="options" @click="swipeClick($event,item,index)">
-							<view class="uni-flex uni-row "
-								style="margin-left: 30rpx; margin-top: 10rpx; margin-bottom: 10rpx;">
-								<light :lightCode='item.content'></light>
-								<!-- 	<view class="auto-wrap" style="font-size: 35rpx;font-weight: bold; width: 100%;">
-									<text style="font-size: 30rpx;color: #B66463;">唯一码 </text>
-									{{item.content}}
-								</view> -->
-							</view>
-						</uni-swipe-action-item>
-					</uni-swipe-action>
-				</view>
-
-			</scroll-view>
-			<uni-load-more :status="loadingType" v-if="showList.length>0" />
-		</view>
-		<view class="page-footer" style="position: fixed;bottom: 0;width:100%" v-if="dataContent">
-			<view class="uni-flex u-col-center space-between " style="background-color:ghostwhite; width: 100%; ">
-				<view class="">
-					<view class="uni-flex uni-row">
-					</view>
-
-				</view>
-				<view class=" uni-flex uni-row">
-					<button class="btn_single_clear" hover-class="btn_commit_after" style="margin-right: 50rpx;"
-						@click="clear">清空</button>
-					<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit">提交</button>
-				</view>
-			</view>
-		</view>
-		<comReceiptPopup ref="comReceiptPopup" @confirm='requestConfirm'></comReceiptPopup>
-		<win-scan-button v-if="dataContent" @goScan='openScanPopup'></win-scan-button>
-		<win-scan-fg-label ref="scanPopup" @getResult='getScanResult' title='灯码标签'></win-scan-fg-label>
-		<comMessage ref="comMessage"></comMessage>
-	</view>
-</template>
-
-<script>
-	import {
-		isCheckMesCode,
-		planReceiptSubmit,
-		createPutawayRequestByPlan,
-		createInspectRequestByPlan,
-		getPlanByNumber,
-		getBalanceToPackage,
-		batchPrintingLable
-	} from '@/api/request2.js';
-	
-	import {
-		calc
-	} from '@/common/calc.js';
+<template>
+	<view class="page-wraper" style="background-color: #fff;">
+
+		<view class="header">
+			<view class="">
+				<com-blank-view @goScan='openFg' v-if="!dataContent"></com-blank-view>
+			</view>
+			<view class="" v-if="dataContent">
+				<view class="page-header">
+					<view class="header-view">
+						<view class="" style="font-size: 35rpx;padding: 10rpx; padding-left: 15rpx;">
+							生产计划：{{dataContent.planNumber}}
+						</view>
+
+						<view class="cell_box uni-flex uni-row">
+							<view class="cell_info">
+								<view class="text_lightblue">完工库位</view>
+								<view style="font-size: 30rpx; margin-top: 13rpx;">{{dataContent.fgLocationCode}}
+								</view>
+
+							</view>
+							<view class="cell_info">
+								<view class="text_lightblue">计划数</view>
+								<view>{{dataContent.planQty}}{{dataContent.uom}}</view>
+							</view>
+							<view class="cell_info">
+								<view class="text_lightblue">已完工</view>
+								<view>{{ dataContent.goodQty }}{{dataContent.uom}}</view>
+							</view>
+							<view class="cell_info">
+								<view class="text_lightblue">未完工</view>
+								<view>{{dataContent.noGoodQty}}{{dataContent.uom}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="" style="padding: 10rpx; margin-left: 10rpx;">
+					<item :dataContent="dataContent"></item>
+				</view>
+				<view class='split_line'></view>
+				<view class="uni-flex uni-row space-between" style="align-items: center;padding: 0 10rpx;">
+					<view style="word-break: break-all;">
+						<batch :batch="dataContent.batch"></batch>
+						<view class="card_view ">
+							<text style="color: #FFA500;padding: 5px;font-size: 30rpx;">包装规格</text>
+							<text class="card_content ">{{dataContent.packUnit}} </text>
+						</view>
+					</view>
+					<view style="word-break: break-all; font-size: 35rpx; font-weight: bold;">
+						<text v-if="dataContent.handleQty>0" style="color: #FFA500;">{{dataContent.handleQty}}/</text>
+						<text class="text_recommend">{{dataContent.packQtyHint}}</text>
+					</view>
+				</view>
+				<view class='split_line' v-if="dataContent"></view>
+			</view>
+		</view>
+
+
+		<view style="padding-bottom: 160rpx;" v-if="dataContent">
+			<scroll-view scroll-y="true" class="">
+				<view class="scan_view" v-for="(item, index) in showList" :key="index">
+					<uni-swipe-action>
+						<uni-swipe-action-item :right-options="options" @click="swipeClick($event,item,index)">
+							<view class="uni-flex uni-row "
+								style="margin-left: 30rpx; margin-top: 10rpx; margin-bottom: 10rpx;">
+								<light :lightCode='item.content'></light>
+								<!-- 	<view class="auto-wrap" style="font-size: 35rpx;font-weight: bold; width: 100%;">
+									<text style="font-size: 30rpx;color: #B66463;">唯一码 </text>
+									{{item.content}}
+								</view> -->
+							</view>
+						</uni-swipe-action-item>
+					</uni-swipe-action>
+				</view>
+
+			</scroll-view>
+			<uni-load-more :status="loadingType" v-if="showList.length>0" />
+		</view>
+		<view class="page-footer" style="position: fixed;bottom: 0;width:100%" v-if="dataContent">
+			<view class="uni-flex u-col-center space-between " style="background-color:ghostwhite; width: 100%; ">
+				<view class="">
+					<view class="uni-flex uni-row">
+					</view>
+
+				</view>
+				<view class=" uni-flex uni-row">
+					<button class="btn_single_clear" hover-class="btn_commit_after" style="margin-right: 50rpx;"
+						@click="clear">清空</button>
+					<button class="btn_single_commit" hover-class="btn_commit_after" @click="submit">提交</button>
+				</view>
+			</view>
+		</view>
+		<comReceiptPopup ref="comReceiptPopup" @confirm='requestConfirm'></comReceiptPopup>
+		<win-scan-button v-if="dataContent" @goScan='openScanPopup'></win-scan-button>
+		<win-scan-fg-label ref="scanPopup" @getResult='getScanResult' title='灯码标签'></win-scan-fg-label>
+		<comMessage ref="comMessage"></comMessage>
+	</view>
+</template>
+
+<script>
+	import {
+		isCheckMesCode,
+		planReceiptSubmit,
+		createPutawayRequestByPlan,
+		createInspectRequestByPlan,
+		getPlanByNumber,
+		getBalanceToPackage,
+		batchPrintingLable
+	} from '@/api/request2.js';
+
+	import {
+		calc
+	} from '@/common/calc.js';
 	import storage from '@/common/utils/storage.js'
-
-	import {
-		getRemoveOption,
-		deepCopyData,
-		getCurrDateTime,
-		compare,
-		getSwitchInfoByCode
-	} from '@/common/basic.js';
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import comBlankView from '@/mycomponents/common/comBlankView.vue'
-	import comReceiptPopup from '@/pages/fg/coms/comReceiptPopup.vue'
-	import item from '@/mycomponents/item/item.vue'
-	import batch from '@/mycomponents/balance/batch.vue'
-	import pack from '@/mycomponents/balance/pack.vue'
-	import winScanFgLabel from "@/mycomponents/scan/winScanFgLabel.vue"
-	import comFgCard from "@/pages/productReceipt/coms/comFgCard.vue"
-	import light from '@/mycomponents/balance/light.vue'
-	import {
-		Exception
-	} from 'sass';
-import { nextTick } from 'vue';
-
-	export default {
-		components: {
-			comBlankView,
-			comReceiptPopup,
-			item,
-			batch,
-			pack,
-			winScanButton,
-			winScanFgLabel,
-			comFgCard,
-			light
-		},
-		data() {
-			return {
-				dataContent: null,
-				options: [],
-				showList: [],
-				allList: [],
-				index: 1,
-				loadingType: "",
-				pageSize: 500
-
-			};
-		},
-
-		onShow() {},
-		onLoad() {
-			this.options = getRemoveOption()
-			this.openFg();
-		},
-		onReachBottom() {
-			console.log("onReachBottom")
-			//避免多次触发
-			if (this.loadingType == 'nomore') {
-				return;
-			}
-			this.index++;
-			var list = this.getDataPage(this.index, this.pageSize)
-			if (list.length > 0) {
-				// this.showList=list
-				this.showList = this.showList.concat(list)
-			} else {
-				//没有更多了
-				this.loadingType = "nomore";
-			}
-
-		},
-
-		mounted() {
-
-		},
-		methods: {
-			openFg() {
-				setTimeout(res => {
-					if (this.$refs.comReceiptPopup) {
-						this.$refs.comReceiptPopup.openRequestPopup();
-					}
-				}, 600)
-			},
-			requestConfirm(result) {
-				this.dataContent = {
-					itemCode: result.itemCode,
-					planNumber: result.planNumber, //计划单号
-					handleQty: 0,
-					qty: 0,
-					planQty: result.planQty,
-					goodQty: result.goodQty,
-					noGoodQty: calc.sub(result.planQty, result.goodQty),
-					packQtyHint: result.packQtyHint,
-					packQty: result.packQty,
-					uom: result.uom,
-					batch: result.batch,
-					packUnit: result.packUnit,
-					workStationCode: result.workStationCode,
-					fgLocationCode: result.fgLocationCode,
-					subList: []
-				}
-			},
-
-			initList() {
-				this.index = 1;
-				this.showList = []
-				this.loadingType = "";
-				this.showList = this.getDataPage(this.index, this.pageSize)
-				this.dataContent.handleQty = this.showList.length;
-				
-			},
-
-			getDataPage(pageNo, pageSize) {
-				//计算总页数
-				var totalPages = Math.ceil(this.allList.length / pageSize);
-				//当前页起始索引
-				const start = (pageNo - 1) * pageSize;
-				const end = start + pageSize; //当前页结束索引
-				return this.allList.slice(start, end)
-
-			},
-
-			swipeClick(e, dataContent, index) {
-				if (e.content.text == "移除") {
-					this.$refs.comMessage.showQuestionMessage("是否要移除", res => {
-						if (res) {
-							this.allList.splice(index, 1);
-							this.initList()
-						}
-
-					})
-				}
-
-			},
-
-			submit() {
-				if (this.allList.length == 0) {
-					this.showErrorMessage("请先扫描唯一码")
-					return;
-				}
-
-				if (this.allList.length < this.dataContent.packQty) {
-					this.$refs.comMessage.showQuestionMessage("扫描数量小于包装规格数量,是否提交?", res => {
-						if (res) {
-							this.commit()
-						}
-					});
-				} else {
-					this.commit();
-				}
-
-			},
-
-			async commit() {
-				try {
-					uni.showLoading({
-						title: "提交中...",
-						mask: true
-					})
-					let params = this.setParams()
-					console.log(JSON.stringify(params))
-
-					let list = []
-					try{
-						var planData = await planReceiptSubmit(params)
-						console.log('planData',planData)
-						if (planData.data) {
-						
-							planData.data.forEach(item => {
-								list.push({
-									itemCode: item.itemCode, // 物品代码
-									itemName: item.itemName, // 物品名称
-									packName: item.packName, // 包装名称
-									packageCode: item.toPackingNumber, // 包装号
-									batch: item.toBatch, //批次
-									parentNumber: item.parentNumber, //父包装号
-									itemType: item.itemType, //物料类型
-									asnNumber: item.asnNumber, //ASN
-									supplierCode: item.supplierCode, // 供应商
-									qty: item.qty, // 数量
-									printTimes: getCurrDateTime(), // 打印时间
-									productionLineCode: item.productionLineCode, //生产线
-									barcodeString: item.barcodeString, // 标签信息
-									barcodeBase64: '',
-									requestNumber: item.requestNumber
-								})
-							})
-						} else {
-							throw new Error("提交失败")
-						}
-					}catch(error){
-						console.log('异常',error)
-						if(error.indexOf('请返回开工阶段')>-1){
-							uni.hideLoading()
-							this.showErrorMessage('计划已完成')
-							this.clearData()
-							this.openFg();
-							return
-						}
-						
-					}
-
-					//装配收货记录 生成后 创建 制品上架申请
-					let createProductputawaySwitch = getSwitchInfoByCode(
-						"CreateProductputawayRequestAfterProductreceiptRecordCreated")
-					// if (createProductputawaySwitch) {
-					// 	createPutawayRequestByPlan(list[0].requestNumber).then(res => {
-					// 		createInspectRequestByPlan(list[0].requestNumber)
-					// 	})
-					// }
-					//创建上架申请和检验申请
-					if (createProductputawaySwitch) {
-						createPutawayRequestByPlan(list[0].requestNumber).then(res => {
-							createInspectRequestByPlan(list[0].requestNumber)
-						})
-					} else { //创建检验申请
-						createInspectRequestByPlan(list[0].requestNumber)
-					}
-					
-					
-
-					var queryParams = {
-						filters: [{
-								column: "plan_type",
-								action: "==",
-								value: "assemble"
-							},
-							{
-								column: "number",
-								action: "==",
-								value: this.dataContent.planNumber
-							}
-						],
-						pageNo: 1,
-						pageSize: 100,
-					}
-					
-					let isAllSubmit = Number(Number(this.dataContent.goodQty)+ Number(this.showList.length))==Number(this.dataContent.planQty)
-
-					var planeInfo = await getPlanByNumber(queryParams);
-					if (planeInfo.data && planeInfo.data.list.length > 0) {
-						if (planeInfo.data.list[0].goodQty >= planeInfo.data.list[0].planQty) {
-							this.clear();
-						} else {
-							this.dataContent.planNumber = planeInfo.data.list[0].number;
-							this.dataContent.handleQty = 0;
-							this.dataContent.planQty = planeInfo.data.list[0].planQty
-							this.dataContent.goodQty = planeInfo.data.list[0].goodQty
-							this.dataContent.noGoodQty = calc.sub(planeInfo.data.list[0].planQty, planeInfo.data.list[
-									0].goodQty),
-							this.dataContent.subList = []
-							this.showList = [];
-							this.allList = []
-							this.index = 1
-						}
+
+	import {
+		getRemoveOption,
+		deepCopyData,
+		getCurrDateTime,
+		compare,
+		getSwitchInfoByCode
+	} from '@/common/basic.js';
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import comReceiptPopup from '@/pages/fg/coms/comReceiptPopup.vue'
+	import item from '@/mycomponents/item/item.vue'
+	import batch from '@/mycomponents/balance/batch.vue'
+	import pack from '@/mycomponents/balance/pack.vue'
+	import winScanFgLabel from "@/mycomponents/scan/winScanFgLabel.vue"
+	import comFgCard from "@/pages/productReceipt/coms/comFgCard.vue"
+	import light from '@/mycomponents/balance/light.vue'
+	import {
+		Exception
+	} from 'sass';
+	import {
+		nextTick
+	} from 'vue';
+
+	export default {
+		components: {
+			comBlankView,
+			comReceiptPopup,
+			item,
+			batch,
+			pack,
+			winScanButton,
+			winScanFgLabel,
+			comFgCard,
+			light
+		},
+		data() {
+			return {
+				dataContent: null,
+				options: [],
+				showList: [],
+				allList: [],
+				index: 1,
+				loadingType: "",
+				pageSize: 500
+
+			};
+		},
+
+		onShow() {},
+		onLoad() {
+			this.options = getRemoveOption()
+			this.openFg();
+		},
+		onReachBottom() {
+			console.log("onReachBottom")
+			//避免多次触发
+			if (this.loadingType == 'nomore') {
+				return;
+			}
+			this.index++;
+			var list = this.getDataPage(this.index, this.pageSize)
+			if (list.length > 0) {
+				// this.showList=list
+				this.showList = this.showList.concat(list)
+			} else {
+				//没有更多了
+				this.loadingType = "nomore";
+			}
+
+		},
+
+		mounted() {
+
+		},
+		methods: {
+			openFg() {
+				setTimeout(res => {
+					if (this.$refs.comReceiptPopup) {
+						this.$refs.comReceiptPopup.openRequestPopup();
 					}
-					//  else {
-					// 	throw new Error("未查找到单据信息")
-					// }
-					uni.hideLoading()
-					if(isAllSubmit){
-						this.clearData()
-					}else{
-						this.showList = [];
-						this.allList = [];
-						this.index = 1;
-						this.dataContent.handleQty = 0;
-					}
-					
-					nextTick(()=>{
-						this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + list[0].requestNumber, list)
-					})
-					
-				} catch (error) {
-					uni.hideLoading()
-					var hint = error.message ? error.message : error
-					this.showErrorMessage(hint)
-				}
-
-			},
-
-			setParams() {
-				this.allList.forEach(res => {
-					res.outsideItemCode = res.itemCode
-					res.outsideProduceDate = null
-					res.outsideSerialNumber = res.order
-				})
-				this.dataContent.subList = this.allList
-				return this.dataContent
-			},
-
-			clear() {
-				this.$refs.comMessage.showQuestionMessage("是否要清空?", res => {
-					if (res) {
-						this.clearData()
-						this.openFg();
-					}
-
-				})
-			},
-			clearData() {
-				this.dataContent = null
-				this.showList = []
-				this.allList = []
-				this.index = 1;
-			},
-
-			openScanPopup() {
-				var itemCode = this.dataContent.itemCode
-				console.log("物料", itemCode)
-				this.$refs.scanPopup.openScanPopup(itemCode);
-			},
-			getScanResult(result) {
-				let that = this;
-				//TODO缺少零件号的对应关系
-				//查询mes码是否完工
-				isCheckMesCode(result.content).then(res => {
-					if (res.data) {
-						if (that.dataContent) {
-
-							var itemIndex = this.allList.findIndex(r =>
-								r.content == result.content);
-							//不存在
-							if (itemIndex == -1) {
-								// if (this.allList.length > this.dataContent.packQty) {
-								// 	this.showErrorMessage("唯一码数量不能大于计划数量")
-								// 	return;
-								// }
-								result.countTime = new Date();
-								this.allList.push(result);
-								this.allList.sort(compare('countTime')); //按扫描信息排序
-								this.initList()
-								this.scanPopupGetFocus();
-								this.calcFgQty();
-							} else {
-								this.$refs.comMessage.showQuestionMessage("唯一码【" + result.content +
-									'】已经扫描，是否移除',
-									res => {
-										if (res) {
-											this.allList.splice(itemIndex, 1)
-											this.allList.sort(compare('countTime')); //按扫描信息排序
-											this.initList()
-											that.calcFgQty();
-										}
-									})
-							}
-						}
-					}
-				}).catch(error => {
-					this.showErrorMessage(error)
-				})
-
-			},
-
-			calcFgQty() {
-				this.dataContent.handleQty = this.showList.length;
-				// this.dataContent.handleQty = this.allList.length;
-				// dataContent.noGoodQty 未完工
-				
-				if (this.dataContent.handleQty == this.dataContent.packQty || (this.dataContent.noGoodQty<this.dataContent.packQty&&this.dataContent.handleQty == this.dataContent.noGoodQty)) {
-					if (this.$refs.scanPopup) {
-						this.$refs.scanPopup.closeScanPopup();
-					}
-					this.commit()
-				}
-			},
-
-			scanPopupGetFocus() {
-				if (this.$refs.scanPopup) {
-					this.$refs.scanPopup.getfocus();
-				}
-			},
-			scanPopupLoseFocus() {
-				if (this.$refs.scanPopup) {
-					this.$refs.scanPopup.losefocus();
-				}
-			},
-			getH5BatchPrintingLable( number) {
-				let _this = this
-				batchPrintingLable(number).then(resLable => {
-					console.log('batchPrintingLable', resLable)
-					const webUrl = `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712`
-					const webData = {
-						token: storage.getStorage(storage.constant.token),
-						asn_number: resLable.data
-					}
-					uni.navigateTo({
-						url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
-					});
-				}).catch(error => {
-					_this.showErrorMessage(error)
-				})
-			},
-			print(pointData){
-				let _this = this
-			
-				// #ifdef APP
-				if (pointData.length > 0) {
-					uni.navigateTo({
-						url: `/pages/point/index?points=${JSON.stringify(pointData)}`
-					});
-				}
-				// #endif
-				// #ifdef H5
-				let packingNumber = []
-				pointData.forEach(item=>{
-					packingNumber.push(item.packageCode)
-				})
-				if(packingNumber.length==0){
-					_this.showErrorMessage('包装号不能为空！')
-					return
-				}
-				getBalanceToPackage({
-					packingNumber: packingNumber.join(',')
-				}).then(res => {
-					console.log('PC打印', res)
-					_this.getH5BatchPrintingLable(res.data.number)
-				
-				}).catch(error => {
-					_this.showErrorMessage(error)
-				})
-				// #endif
-			},
-			showCommitSuccessMessage(hint, pointData) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.print(pointData)
-					
-
-				})
-			},
-
-
-			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-						this.scanPopupGetFocus()
-					}
-				});
-			}
-		}
-
-	}
-</script>
-
-<style scoped lang="scss">
- 
-
-	.item {
-		background-color: #fff;
-	}
-
-	.item_scaned {
-		background-color: antiquewhite;
-	}
-
-	.auto-wrap {
-		white-space: normal;
-		word-break: break-all;
-		overflow-wrap: break-word;
-		/* 对于兼容性更好的情况 */
-	}
+				}, 600)
+			},
+			requestConfirm(result) {
+				this.dataContent = {
+					itemCode: result.itemCode,
+					planNumber: result.planNumber, //计划单号
+					handleQty: 0,
+					qty: 0,
+					planQty: result.planQty,
+					goodQty: result.goodQty,
+					noGoodQty: calc.sub(result.planQty, result.goodQty),
+					packQtyHint: result.packQtyHint,
+					packQty: result.packQty,
+					uom: result.uom,
+					batch: result.batch,
+					packUnit: result.packUnit,
+					workStationCode: result.workStationCode,
+					fgLocationCode: result.fgLocationCode,
+					subList: []
+				}
+			},
+
+			initList() {
+				this.index = 1;
+				this.showList = []
+				this.loadingType = "";
+				this.showList = this.getDataPage(this.index, this.pageSize)
+				this.dataContent.handleQty = this.showList.length;
+
+			},
+
+			getDataPage(pageNo, pageSize) {
+				//计算总页数
+				var totalPages = Math.ceil(this.allList.length / pageSize);
+				//当前页起始索引
+				const start = (pageNo - 1) * pageSize;
+				const end = start + pageSize; //当前页结束索引
+				return this.allList.slice(start, end)
+
+			},
+
+			swipeClick(e, dataContent, index) {
+				if (e.content.text == "移除") {
+					this.$refs.comMessage.showQuestionMessage("是否要移除", res => {
+						if (res) {
+							this.allList.splice(index, 1);
+							this.initList()
+						}
+
+					})
+				}
+
+			},
+
+			submit() {
+				if (this.allList.length == 0) {
+					this.showErrorMessage("请先扫描唯一码")
+					return;
+				}
+
+				if (this.allList.length < this.dataContent.packQty) {
+					this.$refs.comMessage.showQuestionMessage("扫描数量小于包装规格数量,是否提交?", res => {
+						if (res) {
+							this.commit()
+						}
+					});
+				} else {
+					this.commit();
+				}
+
+			},
+
+			async commit() {
+				try {
+					uni.showLoading({
+						title: "提交中...",
+						mask: true
+					})
+					let params = this.setParams()
+					console.log(JSON.stringify(params))
+
+					let list = []
+					try {
+						var planData = await planReceiptSubmit(params)
+						console.log('planData', planData)
+						if (planData.data) {
+
+							planData.data.forEach(item => {
+								list.push({
+									itemCode: item.itemCode, // 物品代码
+									itemName: item.itemName, // 物品名称
+									packName: item.packName, // 包装名称
+									packageCode: item.toPackingNumber, // 包装号
+									batch: item.toBatch, //批次
+									parentNumber: item.parentNumber, //父包装号
+									itemType: item.itemType, //物料类型
+									asnNumber: item.asnNumber, //ASN
+									supplierCode: item.supplierCode, // 供应商
+									qty: item.qty, // 数量
+									printTimes: getCurrDateTime(), // 打印时间
+									productionLineCode: item.productionLineCode, //生产线
+									barcodeString: item.barcodeString, // 标签信息
+									barcodeBase64: '',
+									requestNumber: item.requestNumber
+								})
+							})
+						} else {
+							throw new Error("提交失败")
+						}
+					} catch (error) {
+						console.log('异常', error)
+						if (error.indexOf('请返回开工阶段') > -1) {
+							uni.hideLoading()
+							this.showErrorMessage('计划已完成')
+							this.clearData()
+							this.openFg();
+							return
+						}
+
+					}
+
+					//装配收货记录 生成后 创建 制品上架申请
+					let createProductputawaySwitch = getSwitchInfoByCode(
+						"CreateProductputawayRequestAfterProductreceiptRecordCreated")
+					// if (createProductputawaySwitch) {
+					// 	createPutawayRequestByPlan(list[0].requestNumber).then(res => {
+					// 		createInspectRequestByPlan(list[0].requestNumber)
+					// 	})
+					// }
+					//创建上架申请和检验申请
+					if (createProductputawaySwitch) {
+						createPutawayRequestByPlan(list[0].requestNumber).then(res => {
+							createInspectRequestByPlan(list[0].requestNumber)
+						})
+					} else { //创建检验申请
+						createInspectRequestByPlan(list[0].requestNumber)
+					}
+
+
+
+					var queryParams = {
+						filters: [{
+							column: "number",
+							action: "==",
+							value: this.dataContent.planNumber
+						}],
+						pageNo: 1,
+						pageSize: 100,
+					}
+
+					let isAllSubmit = Number(Number(this.dataContent.goodQty) + Number(this.showList.length)) ==
+						Number(this.dataContent.planQty)
+
+					var planeInfo = await getPlanByNumber(queryParams);
+					if (planeInfo.data && planeInfo.data.list.length > 0) {
+						if (planeInfo.data.list[0].goodQty >= planeInfo.data.list[0].planQty) {
+							this.clear();
+						} else {
+							this.dataContent.planNumber = planeInfo.data.list[0].number;
+							this.dataContent.handleQty = 0;
+							this.dataContent.planQty = planeInfo.data.list[0].planQty
+							this.dataContent.goodQty = planeInfo.data.list[0].goodQty
+							this.dataContent.noGoodQty = calc.sub(planeInfo.data.list[0].planQty, planeInfo.data.list[
+									0].goodQty),
+								this.dataContent.subList = []
+							this.showList = [];
+							this.allList = []
+							this.index = 1
+						}
+					}
+					//  else {
+					// 	throw new Error("未查找到单据信息")
+					// }
+					uni.hideLoading()
+					if (isAllSubmit) {
+						this.clearData()
+					} else {
+						this.showList = [];
+						this.allList = [];
+						this.index = 1;
+						this.dataContent.handleQty = 0;
+					}
+
+					nextTick(() => {
+						this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + list[0].requestNumber, list)
+					})
+
+				} catch (error) {
+					uni.hideLoading()
+					var hint = error.message ? error.message : error
+					this.showErrorMessage(hint)
+				}
+
+			},
+
+			setParams() {
+				this.allList.forEach(res => {
+					res.outsideItemCode = res.itemCode
+					res.outsideProduceDate = null
+					res.outsideSerialNumber = res.order
+				})
+				this.dataContent.subList = this.allList
+				return this.dataContent
+			},
+
+			clear() {
+				this.$refs.comMessage.showQuestionMessage("是否要清空?", res => {
+					if (res) {
+						this.clearData()
+						this.openFg();
+					}
+
+				})
+			},
+			clearData() {
+				this.dataContent = null
+				this.showList = []
+				this.allList = []
+				this.index = 1;
+			},
+
+			openScanPopup() {
+				var itemCode = this.dataContent.itemCode
+				console.log("物料", itemCode)
+				this.$refs.scanPopup.openScanPopup(itemCode);
+			},
+			getScanResult(result) {
+				let that = this;
+				//TODO缺少零件号的对应关系
+				//查询mes码是否完工
+				isCheckMesCode(result.content).then(res => {
+					if (res.data) {
+						if (that.dataContent) {
+
+							var itemIndex = this.allList.findIndex(r =>
+								r.content == result.content);
+							//不存在
+							if (itemIndex == -1) {
+								// if (this.allList.length > this.dataContent.packQty) {
+								// 	this.showErrorMessage("唯一码数量不能大于计划数量")
+								// 	return;
+								// }
+								result.countTime = new Date();
+								this.allList.push(result);
+								this.allList.sort(compare('countTime')); //按扫描信息排序
+								this.initList()
+								this.scanPopupGetFocus();
+								this.calcFgQty();
+							} else {
+								this.$refs.comMessage.showQuestionMessage("唯一码【" + result.content +
+									'】已经扫描，是否移除',
+									res => {
+										if (res) {
+											this.allList.splice(itemIndex, 1)
+											this.allList.sort(compare('countTime')); //按扫描信息排序
+											this.initList()
+											that.calcFgQty();
+										}
+									})
+							}
+						}
+					}
+				}).catch(error => {
+					this.showErrorMessage(error)
+				})
+
+			},
+
+			calcFgQty() {
+				this.dataContent.handleQty = this.showList.length;
+				// this.dataContent.handleQty = this.allList.length;
+				// dataContent.noGoodQty 未完工
+
+				if (this.dataContent.handleQty == this.dataContent.packQty || (this.dataContent.noGoodQty < this
+						.dataContent.packQty && this.dataContent.handleQty == this.dataContent.noGoodQty)) {
+					if (this.$refs.scanPopup) {
+						this.$refs.scanPopup.closeScanPopup();
+					}
+					this.commit()
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+			scanPopupLoseFocus() {
+				if (this.$refs.scanPopup) {
+					this.$refs.scanPopup.losefocus();
+				}
+			},
+			getH5BatchPrintingLable(number) {
+				let _this = this
+				batchPrintingLable(number).then(resLable => {
+					console.log('batchPrintingLable', resLable)
+					const webUrl = `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712`
+					const webData = {
+						token: storage.getStorage(storage.constant.token),
+						asn_number: resLable.data
+					}
+					uni.navigateTo({
+						url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
+					});
+				}).catch(error => {
+					_this.showErrorMessage(error)
+				})
+			},
+			print(pointData) {
+				let _this = this
+
+				// #ifdef APP
+				if (pointData.length > 0) {
+					uni.navigateTo({
+						url: `/pages/point/index?points=${JSON.stringify(pointData)}`
+					});
+				}
+				// #endif
+				// #ifdef H5
+				let packingNumber = []
+				pointData.forEach(item => {
+					packingNumber.push(item.packageCode)
+				})
+				if (packingNumber.length == 0) {
+					_this.showErrorMessage('包装号不能为空！')
+					return
+				}
+				getBalanceToPackage({
+					packingNumber: packingNumber.join(',')
+				}).then(res => {
+					console.log('PC打印', res)
+					_this.getH5BatchPrintingLable(res.data.number)
+
+				}).catch(error => {
+					_this.showErrorMessage(error)
+				})
+				// #endif
+			},
+			showCommitSuccessMessage(hint, pointData) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.print(pointData)
+
+
+				})
+			},
+
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+						this.scanPopupGetFocus()
+					}
+				});
+			}
+		}
+
+	}
+</script>
+
+<style scoped lang="scss">
+	.item {
+		background-color: #fff;
+	}
+
+	.item_scaned {
+		background-color: antiquewhite;
+	}
+
+	.auto-wrap {
+		white-space: normal;
+		word-break: break-all;
+		overflow-wrap: break-word;
+		/* 对于兼容性更好的情况 */
+	}
 </style>
\ No newline at end of file

From 71ca94c93f6f969351c99ef2281a1ab4e1dc7668 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 22 Aug 2024 10:49:15 +0800
Subject: [PATCH 3/6] =?UTF-8?q?HL-5553WMS=20PDA=20=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E9=9A=94=E7=A6=BB=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=98=AF=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E9=9A=94=E7=A6=BB=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/inventoryMove/job/inventoryMoveDetail.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index dad77e16..cdc32371 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -420,7 +420,11 @@
 						inventoryMoveSubmit(params).then(res => {
 							uni.hideLoading()
 							if (res.data) {
-								this.showCommitSuccessMessage("提交成功\n生成库存转移记录\n" + res.data)
+								let showTitle = this.title
+								if(this.title.indexOf('任务')==this.title.length-2){
+									showTitle = this.title.replace('任务','')
+								}
+								this.showCommitSuccessMessage("提交成功\n生成"+showTitle+"记录\n" + res.data)
 							} else {
 								this.showErrorMessage("提交失败[" + res.msg + "]")
 							}

From f78a514a0ee984c30a9e1d817638bf72fa936147 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 22 Aug 2024 13:11:18 +0800
Subject: [PATCH 4/6] =?UTF-8?q?HL-5227=E6=8F=90=E4=BE=9B=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E9=87=87=E8=B4=AD=E4=B8=8A=E6=9E=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E4=B8=BA=E4=BA=86=E8=A7=A3=E5=86=B3=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=9C=B0=E5=A0=86=E5=BA=93=E4=BD=8D=E7=9A=84=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=93=8D=E4=BD=9C=E7=B9=81=E7=90=90=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/putaway/job/quantityPutawayJob.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/putaway/job/quantityPutawayJob.vue b/src/pages/putaway/job/quantityPutawayJob.vue
index ae4a2297..279ccb2b 100644
--- a/src/pages/putaway/job/quantityPutawayJob.vue
+++ b/src/pages/putaway/job/quantityPutawayJob.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="">
 		<view class="" style="background: white;padding: 20rpx;position: fixed;width: 100%;box-shadow: 0px 0px 10px 10px rgba(1, 1, 1, 0.05);z-index: 22;">
-			<uni-pagination :total="totalCount" title="标题文字" :pageSize='pageSize'  @change="changePage"/>
+		<uni-pagination :total="totalCount" title="标题文字" :pageSize='pageSize'  @change="changePage" :current="pageNo"/>
 		</view>
 		<com-empty-view v-if="jobList.length==0"></com-empty-view>
 		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"

From 636a49b5dc79f1c3609a0961965ceeb0df4e2117 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 22 Aug 2024 13:23:21 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0refer1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/httpRequest3.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/api/httpRequest3.js b/src/api/httpRequest3.js
index 99e3086e..b194c36d 100644
--- a/src/api/httpRequest3.js
+++ b/src/api/httpRequest3.js
@@ -16,13 +16,17 @@ function service(options = {}) {
 	// }
 	var requestUrl = ""
 	requestUrl = import.meta.env.VITE_BASE_URL
-
+	// 获取当前页面路由
+	let pages = getCurrentPages();  // 获取所有页面栈的实例数组
+	let currentPage = pages[pages.length - 1];  // 获取最后一个页面的实例
+	let currentRoute = currentPage.route;  // 获取当前页面的路由
 	options.header = {
 		"content-type": "application/json",
 		"Authorization": "Bearer " + token,
 		"dataType": "json",
 		"dataSource": "PDA",
-		"tenant-id": tenantId
+		"tenant-id": tenantId,
+		"referer1":currentPage.route
 	};
 	options.timeout = 300000
 

From 18504930cabbdf09917a43d0f2e22e098a973917 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 22 Aug 2024 13:25:02 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Referer1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/httpRequest3.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/httpRequest3.js b/src/api/httpRequest3.js
index b194c36d..ea11f417 100644
--- a/src/api/httpRequest3.js
+++ b/src/api/httpRequest3.js
@@ -26,7 +26,7 @@ function service(options = {}) {
 		"dataType": "json",
 		"dataSource": "PDA",
 		"tenant-id": tenantId,
-		"referer1":currentPage.route
+		"Referer1":currentPage.route
 	};
 	options.timeout = 300000