diff --git a/src/pages.json b/src/pages.json index ea72621..9b81ecf 100644 --- a/src/pages.json +++ b/src/pages.json @@ -543,6 +543,14 @@ "navigationStyle": "custom", "navigationBarTextStyle": "white" } + }, + { + "path": "pages/mes/EmptyEflux/index", + "style": { + "navigationBarTitleText": "空筛回流", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } } diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index b81cf7b..a2a6ae2 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -142,7 +142,7 @@ export default class LoginPage extends BasePage { // console.log('Version////', this.Version); } ///********版本号修改区域********** - version = '0.0.70'; //正式版本号 + version = '0.0.71'; //正式版本号 //version = '0.0.3'; //测试版本号 //***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本**************** //isTest = true; diff --git a/src/pages/mes/EmptyEflux/index.vue b/src/pages/mes/EmptyEflux/index.vue new file mode 100644 index 0000000..64db68c --- /dev/null +++ b/src/pages/mes/EmptyEflux/index.vue @@ -0,0 +1,288 @@ + + + diff --git a/src/pages/mes/EmptyEflux/model.ts b/src/pages/mes/EmptyEflux/model.ts new file mode 100644 index 0000000..2fd633a --- /dev/null +++ b/src/pages/mes/EmptyEflux/model.ts @@ -0,0 +1,24 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +import { session } from '@/store/modules/session'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.mes.EmptyEflux', +}) +export class EmptyEflux extends VuexModule { + + SubmitCode: any = ''; + //空筛回流提交 + @MutationAction + async transferWhiteBilletPlan(params: any) { + const result: any = await http.post(url.lanjumes.product.transferWhiteBilletPlan, params); + const SubmitCode = result; + return { SubmitCode }; + } +} + +export default getModule(EmptyEflux); diff --git a/src/pages/wms/product/SalesReturn/index.vue b/src/pages/wms/product/SalesReturn/index.vue index b26959e..60792d3 100644 --- a/src/pages/wms/product/SalesReturn/index.vue +++ b/src/pages/wms/product/SalesReturn/index.vue @@ -15,9 +15,9 @@ 退货单号: - + 行项目: @@ -374,6 +374,23 @@ export default class SalesReturn extends BasePage { url: this.page.wms.SalesReturndetail + '?sn=' + item.sn, }); } + async tidan(){ + if (this.orderNo == '' || this.orderNo.length == 0) { + (this.$refs.uToast as any).show({ + title: '请输入退货单号', + // url: '/pages/user/index' + }); + return; + } + await this.model.finishedProductSalesReturnTD(this.orderNo); + if(model.finishCode == 200){ + (this.$refs.uToast as any).show({ + title: '提单成功', + // url: '/pages/user/index' + }); + this.query(); + } + } }