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

src/api/request2.js

@@ -2610,7 +2610,17 @@ export function deliverRequestClose(id) {
 		data: {},
 	});
 }
-
+/**
+ * 翻包任务 关闭任务
+ * @param {*} params 
+ */
+export function packageoverRequestClose(id) {
+	return request({
+		url: baseApi + "/wms/packageover-job-main/close?id=" + id,
+		method: "put",
+		data: {},
+	});
+}
 /**
  * 制品发货申请 提交审批
  * @param {*} params 

src/pages/package/job/overPackageJob.vue

@@ -34,6 +34,7 @@
 	import {
 		cancleTakeOverPageJob,
 		getOverPageJobList,
+		packageoverRequestClose
 	} from '@/api/request2.js';
 	import {
 		goHome,
@@ -113,6 +114,14 @@
 		onReady() {
 			this.detailOptions = getDetailOption();
 			this.detailGiveupOptions = getDetailGiveupOption();
+			this.detailOptions = [...this.detailOptions,{
+				text:"关闭",
+				style:{
+					backgroundColor:"#F56C6C"
+				}
+			}]
+			console.log('this.detailGiveupOptions',this.detailGiveupOptions)
+			console.log('this.detailOptions',this.detailOptions)
 		},
 		onReachBottom() {
 			//避免多次触发
@@ -278,12 +287,33 @@
 								this.cancleJob(dataContent.masterId);
 							}
 						});
+				} else if (e.content.text == "关闭") {
+					this.$refs.comMessage.showQuestionMessage("确定要关闭当前任务?",
+						res => {
+							if (res) {
+								this.closeJob(dataContent.masterId);
+							}
+						});
 				}
 			},
 
 			openjobInfoPopup(item) {
 				this.$refs.jobInfoPopup.openPopup(item)
 			},
+			closeJob(id){
+				packageoverRequestClose(id).then(res => {
+					if(res.data){
+						this.getList("refresh")
+						uni.showToast({
+							title:"关闭任务成功"
+						})
+					}else {
+						this.showMessage("关闭任务失败")
+					}
+				}).catch(error => {
+					this.showMessage(error)
+				})
+			},
 
 			cancleJob(id) {
 				cancleTakeOverPageJob(id).then(res => {

src/pages/query/item.vue

@@ -3,14 +3,14 @@
 	<view class="uni-flex" style="flex-direction: column">
 		<itemFilter ref="filter" @onConfirmClick="confirm">
 		</itemFilter>
-		<view class="top" style="">
+		<view ref="topContent" class="top" >
 			<com-blank-view @goScan='openScanPopup' v-if="itemCode==''"></com-blank-view>
 			<item-info v-if="itemDetail" :itemdetail='itemDetail'></item-info>
 			<z-tabs v-if="itemCode" :list="tabList" @change="tabChange" />
 		</view>
 
-		<view style="padding-top: 230rpx;width:100%">
-			<view v-if="totalCount>0" style="margin:10rpx; font-size:35rpx; font-weight:bold">总数 : {{totalCount}}
+		<view style="width:100%;" :style="{'margin-top':topHeight+'px'}">
+			<view v-if="totalCount>0" style="margin:10rpx; font-size:35rpx; font-weight:bold;;">总数 : {{totalCount}}
 			</view>
 			<view v-for="(item, index) in dataList" style="width:100%" :key="index">
 				<view class="uni-flex uni-row"
@@ -51,6 +51,7 @@
 	import comItemDetailCard from '@/pages/query/coms/comItemDetailCard.vue'
 	import itemFilter from '@/mycomponents/item/itemFilter.vue'
 	import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
+import { nextTick } from 'vue';
 
 	export default {
 		components: {
@@ -75,7 +76,8 @@
 				totalCount: 0,
 				locationCode: "",
 				inventoryStatus: "",
-				pageSize:10
+				pageSize:10,
+				topHeight:115
 			}
 		},
 		//返回首页
@@ -134,6 +136,11 @@
 						this.closeScanPopup();
 						this.itemCode = res.data.list[0].code;
 						this.itemDetail = res.data.list[0];
+						nextTick(()=>{
+							this.topHeight = this.$refs.topContent.$el.clientHeight
+							
+							console.log('topContent',this.$refs.topContent)
+						})
 						this.tabChange(0)
 					} else {
 						this.showMessage('未查找到物料【' + code + '】');