Merge branch 'hella_online_20240803' into master_hella

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
 

src/manifest.json

@@ -3,8 +3,8 @@
     "package" : "uni.UNI43932FE",
     "appid" : "__UNI__C9CF4BF",
     "description" : "",
-    "versionName" : "1.0.65",
+    "versionName" : "1.0.67",
-    "versionCode" : 65,
+    "versionCode" : 67,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

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 {

src/pages.json

@@ -462,7 +462,7 @@
 		{
 			"path": "pages/putaway/job/quantityPutawayJob",
 			"style": {
-				"navigationBarTitleText": "采购上架(批量)",
+				"navigationBarTitleText": "批量采购上架",
 				"enablePullDownRefresh": false,
 				"titleNView": {
 					// "autoBackButton": "true",

src/pages/customerReturn/record/returnRecord.vue

@@ -335,7 +335,7 @@
 							submitItem.itemDesc1 = detail.package.itemDesc1;
 							submitItem.itemDesc2 = detail.package.itemDesc2;
 
-							submitItem.inventoryStatus = this.toInventoryStatuses;
+							submitItem.inventoryStatus = detail.inventoryStatus;
 							submitItem.toInventoryStatus = this.toInventoryStatuses;
 
 							submitItem.fromPackingNumber = info.packingNumber;

src/pages/fg/receiptByPlan.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page-wraper" style="background-color: #fff;">
 
-		<view class="header" >
+		<view class="header">
 			<view class="">
 				<com-blank-view @goScan='openFg' v-if="!dataContent"></com-blank-view>
 			</view>
@@ -132,7 +132,9 @@
 	import {
 		Exception
 	} from 'sass';
-import { nextTick } from 'vue';
+	import {
+		nextTick
+	} from 'vue';
 
 	export default {
 		components: {
@@ -273,9 +275,9 @@ import { nextTick } from 'vue';
 					console.log(JSON.stringify(params))
 
 					let list = []
-					try{
+					try {
 						var planData = await planReceiptSubmit(params)
-						console.log('planData',planData)
+						console.log('planData', planData)
 						if (planData.data) {
 
 							planData.data.forEach(item => {
@@ -300,9 +302,9 @@ import { nextTick } from 'vue';
 						} else {
 							throw new Error("提交失败")
 						}
-					}catch(error){
+					} catch (error) {
-						console.log('异常',error)
+						console.log('异常', error)
-						if(error.indexOf('请返回开工阶段')>-1){
+						if (error.indexOf('请返回开工阶段') > -1) {
 							uni.hideLoading()
 							this.showErrorMessage('计划已完成')
 							this.clearData()
@@ -333,21 +335,16 @@ import { nextTick } from 'vue';
 
 					var queryParams = {
 						filters: [{
-								column: "plan_type",
+							column: "number",
-								action: "==",
+							action: "==",
-								value: "assemble"
+							value: this.dataContent.planNumber
-							},
+						}],
-							{
-								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)
+					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) {
@@ -360,7 +357,7 @@ import { nextTick } from 'vue';
 							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.dataContent.subList = []
 							this.showList = [];
 							this.allList = []
 							this.index = 1
@@ -370,16 +367,16 @@ import { nextTick } from 'vue';
 					// 	throw new Error("未查找到单据信息")
 					// }
 					uni.hideLoading()
-					if(isAllSubmit){
+					if (isAllSubmit) {
 						this.clearData()
-					}else{
+					} else {
 						this.showList = [];
 						this.allList = [];
 						this.index = 1;
 						this.dataContent.handleQty = 0;
 					}
 
-					nextTick(()=>{
+					nextTick(() => {
 						this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + list[0].requestNumber, list)
 					})
 
@@ -469,7 +466,8 @@ import { nextTick } from 'vue';
 				// 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.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();
 					}
@@ -487,7 +485,7 @@ import { nextTick } from 'vue';
 					this.$refs.scanPopup.losefocus();
 				}
 			},
-			getH5BatchPrintingLable( number) {
+			getH5BatchPrintingLable(number) {
 				let _this = this
 				batchPrintingLable(number).then(resLable => {
 					console.log('batchPrintingLable', resLable)
@@ -503,7 +501,7 @@ import { nextTick } from 'vue';
 					_this.showErrorMessage(error)
 				})
 			},
-			print(pointData){
+			print(pointData) {
 				let _this = this
 
 				// #ifdef APP
@@ -515,10 +513,10 @@ import { nextTick } from 'vue';
 				// #endif
 				// #ifdef H5
 				let packingNumber = []
-				pointData.forEach(item=>{
+				pointData.forEach(item => {
 					packingNumber.push(item.packageCode)
 				})
-				if(packingNumber.length==0){
+				if (packingNumber.length == 0) {
 					_this.showErrorMessage('包装号不能为空！')
 					return
 				}
@@ -555,8 +553,6 @@ import { nextTick } from 'vue';
 </script>
 
 <style scoped lang="scss">
- 
-
 	.item {
 		background-color: #fff;
 	}

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 + "]")
 							}

src/pages/issue/job/issueJob.vue

@@ -539,11 +539,11 @@
 								value: balance.locationCode
 							}
 						]
-						if(productionLineCode){
+						if(this.productionLineCode){
 							filters.push({
 								column: "productionLineCode",
 								action: "==",
-								value: productionLineCode
+								value: this.productionLineCode
 							})
 						}
 						

src/pages/putaway/job/quantityPutawayJob.vue

@@ -1,5 +1,8 @@
 <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" :current="pageNo"/>
+		</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'
@@ -7,7 +10,7 @@
 			: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() {
+		// onReachBottom() {
-			//避免多次触发
+		// 	//避免多次触发
-			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
+		// 	if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
-				return;
+		// 		return;
-			}
+		// 	}
-			this.getList("more");
+		// 	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";
+					// this.loadingType = "loadmore";
-					if (list == null || list.length == 0) {
+					// if (list == null || list.length == 0) {
-						this.loadingType = "nomore";
+					// 	this.loadingType = "nomore";
-						return;
+					// 	return;
-					}
+					// }
-					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
+					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
 				});
-				
+				this.status  = "1"
-				if (params.status) {
-					this.status  = params.status
-					
-				}else{
-					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()
 			}
 			
 		}