diff --git a/src/pages.json b/src/pages.json
index 104c2b53..ba0de646 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -885,6 +885,40 @@
}
},
+ {
+ "path": "pages/productReceipt/job/scrapReceiptJob",
+ "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/productReceipt/job/scrapReceiptDetail",
+ "style": {
+ "navigationBarTitleText": "报废收货详情",
+ "enablePullDownRefresh": false
+ }
+ },
+
{
"path": "pages/productReceipt/record/productReceiptRecord",
"style": {
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index 6e83cdda..4d5a9982 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -141,12 +141,17 @@
action: "in",
value: this.status
})
+
+ filters.push({
+ column: "type",
+ action: "==",
+ value: this.type
+ })
var params = {
filters: filters,
pageNo: this.pageNo,
pageSize: this.pageSize,
- type: this.type
}
getProductReceiptJobList(params).then(res => {
@@ -159,8 +164,10 @@
this.totalCount = res.data.total
if (this.type == 'predict') {
updateTitle("预生产收货任务(" + this.totalCount + ")");
- } else {
+ } else if(this.type == 'fg'){
updateTitle("装配收货任务(" + this.totalCount + ")");
+ }else {
+ updateTitle("报废收货任务(" + this.totalCount + ")");
}
this.loadingType = "loadmore";
if (list == null || list.length == 0) {
@@ -177,8 +184,10 @@
}
if (this.type == 'predict') {
updateTitle("预生产收货任务(" + this.totalCount + ")");
- } else {
+ } else if(this.type == 'fg'){
updateTitle("装配收货任务(" + this.totalCount + ")");
+ }else {
+ updateTitle("报废收货任务(" + this.totalCount + ")");
}
this.loadingType = "";
uni.hideLoading();
@@ -191,10 +200,14 @@
uni.navigateTo({
url: './productReceiptDetail?id=' + item.id + '&status=' + item.status
});
- } else {
+ } else if(this.type == 'fg'){
uni.navigateTo({
url: './fgProductReceiptDetail?id=' + item.id + '&status=' + item.status
});
+ }else {
+ uni.navigateTo({
+ url: './scrapReceiptDetail?id=' + item.id + '&status=' + item.status
+ });
}
},
diff --git a/src/pages/productReceipt/job/scrapReceiptDetail.vue b/src/pages/productReceipt/job/scrapReceiptDetail.vue
new file mode 100644
index 00000000..8b191998
--- /dev/null
+++ b/src/pages/productReceipt/job/scrapReceiptDetail.vue
@@ -0,0 +1,418 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/productReceipt/job/scrapReceiptJob.vue b/src/pages/productReceipt/job/scrapReceiptJob.vue
new file mode 100644
index 00000000..ef0ed0e2
--- /dev/null
+++ b/src/pages/productReceipt/job/scrapReceiptJob.vue
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/productRecycle/job/productRecycleJobDetail.vue b/src/pages/productRecycle/job/productRecycleJobDetail.vue
index 7f1a600b..c6654b55 100644
--- a/src/pages/productRecycle/job/productRecycleJobDetail.vue
+++ b/src/pages/productRecycle/job/productRecycleJobDetail.vue
@@ -461,7 +461,7 @@
},
showCommitSuccessMessage(number) {
- this.$refs.comMessage.showSuccessMessage('提交成功
生成退货记录:' + number, res => {
+ this.$refs.comMessage.showSuccessMessage('提交成功
生成制品回收记录
:' + number, res => {
navigateBack(1)
})
}