diff --git a/pages.json b/pages.json index 40d68fb..36481ee 100644 --- a/pages.json +++ b/pages.json @@ -279,6 +279,30 @@ "bounce": "none" } } + }, + { + "path" : "pages/distribution/distribution", + "style" : + { + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "disableScroll": true, + "app-plus": { + "bounce": "none" + } + } + }, + { + "path" : "pages/distribution/detail", + "style" : + { + "navigationStyle": "custom", + "enablePullDownRefresh": false, + "disableScroll": true, + "app-plus": { + "bounce": "none" + } + } } ], "globalStyle": { diff --git a/pages/customOrder/detail.vue b/pages/customOrder/detail.vue index 6eca28a..584c202 100644 --- a/pages/customOrder/detail.vue +++ b/pages/customOrder/detail.vue @@ -365,7 +365,7 @@ // on cancel }); - } else { + } else if (form.value.customOrder.status === '待主管审核') { showConfirmDialog({ title: '提示', message: '是否确认通过本单?', @@ -381,6 +381,22 @@ .catch(() => { // on cancel }); + } else if (form.value.customOrder.status === '取消审核中') { + showConfirmDialog({ + title: '提示', + message: '是否确认通过本单?', + }).then(() => { + let url = '/customOrder/dispatcherCheckCancel/' + form.value.customOrder.id + putAction(url).then((res : any) => { + if (res.code === 200) { + showToast('操作成功!') + uni.navigateBack() + } + }) + }) + .catch(() => { + // on cancel + }); } } @@ -406,7 +422,7 @@ 取消 + v-if="!'取消审核中,已取消,被驳回'.includes(form.customOrder.status)">取消 编辑 @@ -512,7 +528,7 @@ - + 驳回 通过 diff --git a/pages/distribution/detail.vue b/pages/distribution/detail.vue new file mode 100644 index 0000000..6b35caa --- /dev/null +++ b/pages/distribution/detail.vue @@ -0,0 +1,191 @@ + + + + + \ No newline at end of file diff --git a/pages/distribution/distribution.vue b/pages/distribution/distribution.vue new file mode 100644 index 0000000..a108207 --- /dev/null +++ b/pages/distribution/distribution.vue @@ -0,0 +1,537 @@ + + + + + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 1bb4391..f416395 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -93,6 +93,11 @@ const ListData =ref([ name:'定做单列表', type:'', }, + { + path:'../distribution/distribution', + name:'待配货列表', + type:'', + } ] as any[])