diff --git a/src/api/httpRequest3.js b/src/api/httpRequest3.js
index 99e3086e..ea11f417 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
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/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/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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index 0aa3edde..207ed519 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 + "]")
}
diff --git a/src/pages/putaway/job/quantityPutawayJob.vue b/src/pages/putaway/job/quantityPutawayJob.vue
index fbbae604..279ccb2b 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()
}
}