diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index fa04514..1707e6b 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.130'; //正式版本号 + version = '0.0.131'; //正式版本号 //version = '0.0.14'; //测试版本号 //***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本**************** //isTest = true; diff --git a/src/pages/wms/Raw/ProductionREQ/index.vue b/src/pages/wms/Raw/ProductionREQ/index.vue index 4f405c8..0e4c911 100644 --- a/src/pages/wms/Raw/ProductionREQ/index.vue +++ b/src/pages/wms/Raw/ProductionREQ/index.vue @@ -305,28 +305,27 @@ export default class ProductionREQ extends BasePage { return; } - if (this.list.length == 0 || this.list == '') { - (this.$refs.uToast as any).show({ - title: '请先扫描标志卡', - // url: '/pages/user/index' - }); - return; - } + // if (this.list.length == 0 || this.list == '') { + // (this.$refs.uToast as any).show({ + // title: '请先扫描标志卡', + // // url: '/pages/user/index' + // }); + // return; + // } let guozhannglist = []; - guozhannglist = this.materilist - .filter((item) => { - return item.isguozhang.value == '1' || item.planNumber > item.outNumber; - }) - .map((item) => { - console.log('item', item); - return { id: item.id }; - }); - let params = []; - this.list.map((item) => { - item.createBy = session.loginName; - item.factoryCode = session.FactoryCode; - params.push(item); + this.materilist.filter((item) => { + if (item.isguozhang.value == '1' || item.planNumber <= item.outNumber) { + guozhannglist.push({ id: item.id }); + } }); + let params = []; + if (this.list.length) { + this.list.map((item) => { + item.createBy = session.loginName; + item.factoryCode = session.FactoryCode; + params.push(item); + }); + } //console.log('list', {orderList: params, gzList: guozhannglist}); await this.model.out({ orderList: params, gzList: guozhannglist }); if (this.model.SubmitCode == '200') {