From a9f6b6c8ff8b7d02a1ae3c70dad71072cdb50c0c Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 13 Feb 2025 19:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E7=BB=99=E5=93=81=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                     | 21 ++++++++++++---
 src/mycomponents/job/jobComMainCard.vue |  6 ++++-
 src/mycomponents/job/jobFilter.vue      | 17 +++++++++++-
 src/mycomponents/job/jobTop.vue         |  9 ++++++-
 src/pages.json                          | 35 +++++++++++++++++++++++++
 src/pages/issue/coms/jobInfoPopup.vue   |  2 +-
 src/pages/issue/job/issueJob.vue        |  4 +--
 7 files changed, 84 insertions(+), 10 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index 7e8c6ea1..925c5fca 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -1541,7 +1541,22 @@ export function issueCheck(packNumber) {
 	});
 }
 
-
+// 补给品发料接口
+export function getIssueSuppliesList(params) {
+	return request({
+		url: baseApi + "/wms/issue-job-main/senior",
+		method: "post",
+		data: params,
+	});
+}
+// 补给品提交
+export function executeEop(params) {
+	return request({
+		url: baseApi + "wms/issue-job-main/executeEop",
+		method: "post",
+		data: params,
+	});
+}
 /**
  * 获取推荐明细接口
  * @param {*} 任务id
@@ -4405,8 +4420,8 @@ export function batchPrintingLable(params) {
  * @param {*} 
  * 
  */
-export function getBalanceByFilter(param) {
-	return request({
+export async function getBalanceByFilter(param) {
+	return await request({
 		url: baseApi + "/wms/balance/senior",
 		method: "post",
 		data: param,
diff --git a/src/mycomponents/job/jobComMainCard.vue b/src/mycomponents/job/jobComMainCard.vue
index a75716f9..c25af428 100644
--- a/src/mycomponents/job/jobComMainCard.vue
+++ b/src/mycomponents/job/jobComMainCard.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="task_card">
-			<job-top :dataContent="dataContent"></job-top>
+			<job-top :dataContent="dataContent" :isShowPlanNumber='isShowPlanNumber'></job-top>
 			<!-- <view class="split_line"></view> -->
 			<slot></slot>
 			<view class="split_line"></view>
@@ -28,6 +28,10 @@
 				type: Object,
 				default: {}
 			},
+			isShowPlanNumber: {
+				type: Boolean,
+				default: false
+			},
 		},
 
 		methods: {
diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index 7d335ece..b77cacef 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -38,6 +38,14 @@
 				<u-input style="margin-left: 20rpx;" confirmType="search" v-model="itemCode" :border="true"
 					placeholder="请输入物料代码" @confirm="itemCodeConfirm" />
 			</view>
+			<view v-if="isWorkStationCode" class="uni-flex space-between u-col-center"
+				style="width: 100%;margin-top: 30rpx;">
+				<view class="" style="font-size: 32rpx;">
+					工位
+				</view>
+				<u-input style="margin-left: 86rpx;" confirmType="search" v-model="workStationCode" :border="true"
+					placeholder="请输入工位" @confirm="workStationCodeConfirm" />
+			</view>
 			<view v-if="isShowFromLocationCode" class="uni-flex space-between u-col-center"
 				style="width: 100%;margin-top: 30rpx;">
 				<view class="" style="font-size: 32rpx;">
@@ -174,6 +182,10 @@
 				type: Boolean,
 				default: true
 			},
+			isWorkStationCode: {
+				type: Boolean,
+				default: false
+			},
 		},
 		data() {
 			return {
@@ -186,6 +198,7 @@
 				fromAreaCode: '', // 来源库区
 				toAreaCode: '', // 到库区
 				itemCode: '', //物料代码
+				workStationCode:'',//工位
 				creationTime: '',
 				status: '1,2',
 				isOnToday: false,
@@ -220,7 +233,8 @@
 					toAreaCode: this.toAreaCode, // 到库区
 					itemCode: this.itemCode,
 					creationTime: this.creationTime,
-					status: this.status
+					status: this.status,
+					workStationCode: this.workStationCode,
 				}
 				return params;
 			},
@@ -235,6 +249,7 @@
 				this.itemCode = ''
 				this.creationTime = ''
 				this.status = '1,2'
+				this.workStationCode = ''
 				this.query()
 			},
 
diff --git a/src/mycomponents/job/jobTop.vue b/src/mycomponents/job/jobTop.vue
index c6c84c24..09f4c9fb 100644
--- a/src/mycomponents/job/jobTop.vue
+++ b/src/mycomponents/job/jobTop.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="task_top">
 		<view class="uni-flex space-between u-col-center align-center" style="margin-bottom: 10rpx;">
-			<job-number :number="dataContent.number"></job-number>
+			<job-plan-number v-if="isShowPlanNumber" :number="dataContent.preparetoissuePlanNumber"></job-plan-number>
+			<job-number :number="dataContent.number" v-else></job-number>
 			<job-status :jobStatus="dataContent.status"></job-status>
 		</view>
 	</view>
@@ -9,10 +10,12 @@
 
 <script>
 	import jobNumber from '@/mycomponents/job/jobNumber.vue'
+	import jobPlanNumber from '@/mycomponents/job/jobPlanNumber.vue'
 	import jobStatus from '@/mycomponents/job/jobStatus.vue'
 	export default {
 		components: {
 			jobNumber,
+			jobPlanNumber,
 			jobStatus
 		},
 		data() {
@@ -27,6 +30,10 @@
 				type: Object,
 				default: {}
 			},
+			isShowPlanNumber: {
+				type: Boolean,
+				default: false
+			},
 		},
 
 		methods: {
diff --git a/src/pages.json b/src/pages.json
index 45ec31df..36797d0a 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -770,6 +770,41 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/issueSupplies/job/issueJob",
+			"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/issueSupplies/job/issueDetailBatch",
+			"style": {
+				"navigationBarTitleText": "补给品发料任务详情",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/issue/record/issueRecord",
 			"style": {
diff --git a/src/pages/issue/coms/jobInfoPopup.vue b/src/pages/issue/coms/jobInfoPopup.vue
index f654d6b4..a06a7829 100644
--- a/src/pages/issue/coms/jobInfoPopup.vue
+++ b/src/pages/issue/coms/jobInfoPopup.vue
@@ -42,7 +42,7 @@
 				this.dataContent = val;
 				setTimeout(res=>{
 					this.$refs.popup.open('bottom')
-				},100)
+				},300)
 				
 			},
 			closePopup() {
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index a61353ac..eb954626 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -13,9 +13,7 @@
 					<uni-swipe-action-item
 						:right-options="item.status=='2'?detailGiveupOptions:item.status=='1'?detailCloseOptions:detailOptions"
 						@click="swipeClick($event,item)">
-
-						<com-issue-job-card :dataContent="item" @click='openJobDetail(item)' :isShowGoodsShelves='true'></com-issue-job-card>
-
+						<com-issue-job-card :dataContent="item" @click.stop='openJobDetail(item)' :isShowGoodsShelves='true'></com-issue-job-card>
 					</uni-swipe-action-item>
 				</view>
 			</uni-swipe-action>