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] =?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 @@
-
+
只看待处理
@@ -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 @@
+
+
+
-
-
+
+
-
+
@@ -29,7 +32,7 @@
-->
@@ -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()
}
}