diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 0216fa8..707bd26 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.165'; //正式版本号 + version = '0.0.166'; //正式版本号 //version = '0.0.14'; //测试版本号 //***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本**************** //isTest = true; diff --git a/src/pages/wms/product/SaleOutWH/index.vue b/src/pages/wms/product/SaleOutWH/index.vue index 1c2bbf8..6538b9e 100644 --- a/src/pages/wms/product/SaleOutWH/index.vue +++ b/src/pages/wms/product/SaleOutWH/index.vue @@ -15,9 +15,9 @@ 备货单号: - + @@ -121,7 +121,7 @@ 已经出库数量: - {{ item.userDefined2 }} + {{ item.outAmount }} 状态: @@ -287,7 +287,7 @@ export default class SaleOutWH extends BasePage { return; } await this.model.showProduceCode(this.orderNo); - if (model.orderNoItemList) { + if (model.orderNoItemList.length) { this.materilist = []; //let a: any = {}; this.model.orderNoItemList.forEach((item) => { @@ -334,8 +334,14 @@ export default class SaleOutWH extends BasePage { // this.orderNoItemList = this.materilist[0]; // this.outnumber = this.orderNoItemList.outQuantity; } else { + (this.$refs.uToast as any).show({ + title: model.ordermsg, + }); + this.orderNo = ''; this.materilist = []; this.prodlist = []; + this.orderNoItemList = {}; + this.picilist = []; } } diff --git a/src/pages/wms/product/SaleOutWH/model.ts b/src/pages/wms/product/SaleOutWH/model.ts index 6323f58..c6a74a3 100644 --- a/src/pages/wms/product/SaleOutWH/model.ts +++ b/src/pages/wms/product/SaleOutWH/model.ts @@ -11,14 +11,16 @@ import { session } from '@/store/modules/session'; }) export class SaleOutWH extends VuexModule { orderNoItemList: any = []; + ordermsg: any = ''; @MutationAction async showProduceCode(orderNo: any) { const result: any = await http.post(url.lanjuwms.product.SaleOutWH.selectQueryFinishedProductSales, { stockOrder: orderNo, factoryCode: session.FactoryCode, }); - const orderNoItemList = result.data; - return { orderNoItemList }; + const orderNoItemList = result.data || []; + const ordermsg = result.msg; + return { orderNoItemList, ordermsg }; } SubmitCode: any = '';