diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue index 3a411615..24f8e380 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue @@ -1266,6 +1266,11 @@ export default { this.$message.warning(item.orderCode + ' - 未齐套，无法转为库存品！！！'); return false; } + console.log('item :>> ', item); + if (item.isZero === '1') { + this.$message.warning(item.orderCode + ' - 为零担订单，暂无法转为库存品') + return false + } console.log('111 :>> ', 111); ids.push(item.id); return true; @@ -1282,6 +1287,7 @@ export default { }); // console.log("包件物料不存在！！",res.data.data.records); lost = res.data.data.records.every(val => { + console.log('val.materialId :>> ', val.materialId); if (!val.materialId) return false; return true; }); diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue index 89a8cf69..20bd59f1 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue @@ -1145,6 +1145,12 @@ export default { this.$message.warning(item.orderCode + ' - 为冻结单，无法转为库存品！！！'); return false; } + + if (item.isZero === '1') { + this.$message.warning(item.orderCode + ' - 为零担订单，暂无法转为库存品') + return false + } + ids.push(item.id); return true; }); @@ -1170,6 +1176,14 @@ export default { '订单信息不完整，请完善包件信息！如没有请维护物料信息，在选择！！！' ); } + + if (this.selectionList.length === 1) { + console.log('111>>>>>>>>>>>>>>', this.selectionList[0]); + return this.$router.push( + '/distribution/inventory/distributionStockArticleFrom?id=' + this.selectionList[0].id + ); + } + this.getSock(); }, getSock() { diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue index f06774f9..cfe2dd43 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue @@ -1382,6 +1382,11 @@ export default { return false; } + if (item.isZero === '1') { + this.$message.warning(item.orderCode + ' - 为零担订单，暂无法转为库存品') + return false + } + ids.push(item.id); return true; }); @@ -1406,6 +1411,14 @@ export default { '订单信息不完整，请完善包件信息！如没有请维护物料信息，在选择！！！' ); } + + if (this.selectionList.length === 1) { + console.log('111>>>>>>>>>>>>>>', this.selectionList[0]); + return this.$router.push( + '/distribution/inventory/distributionStockArticleFrom?id=' + this.selectionList[0].id + ); + } + this.getSock(); }, getSock() { diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue b/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue index 763e7159..c9c3b181 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue @@ -1139,6 +1139,11 @@ export default { this.$message.warning(item.orderCode + ' - 为冻结单，无法转为库存品！！！'); return false; } + console.log('item :>> ', item); + if (item.isZero === '1') { + this.$message.warning(item.orderCode + ' - 为零担订单，暂无法转为库存品') + return false + } ids.push(item.id); return true; }); @@ -1164,6 +1169,14 @@ export default { '订单信息不完整，请完善包件信息！如没有请维护物料信息，在选择！！！' ); } + + if (this.selectionList.length === 1) { + console.log('111>>>>>>>>>>>>>>', this.selectionList[0]); + return this.$router.push( + '/distribution/inventory/distributionStockArticleFrom?id=' + this.selectionList[0].id + ); + } + this.getSock(); }, getSock(){ diff --git a/src/views/distribution/inventory/distributionStockArticleFrom.vue b/src/views/distribution/inventory/distributionStockArticleFrom.vue index 366492f5..0e5db271 100644 --- a/src/views/distribution/inventory/distributionStockArticleFrom.vue +++ b/src/views/distribution/inventory/distributionStockArticleFrom.vue @@ -38,22 +38,37 @@ > - + - - + --> - - - - - - - + +
@@ -114,9 +129,19 @@ export default { data: [], }; }, - mounted() { - this.init(); - this.onLoad(this.page); + watch: { + // 初始化执行并深度监听路由 + $route:{ + handler(to, form){ + console.log('to :>> ', to); + console.log('form :>> ', form); + this.init(); + + this.onLoad(this.page); + }, + deep: true, + immediate: true + } }, computed: { ...mapGetters(['permission']), @@ -130,9 +155,24 @@ export default { }, methods: { async handleTrade() { + if (this.ids.length > 0) { - let a = await addStockRow({ids: this.ids}); - console.log('>>>>===', a.data); + console.log(this.$route) + + let res = await addStockRow({ids: this.ids}); + const {code, msg} = res.data + if(code === 200){ + this.$message({ + type: 'success', + message: msg + }) + // 跳转回之前的页面 + this.$router.go (-1) + // 关闭页面标签 + this.contextmenuFlag = false; + this.$store.commit('DEL_TAG_CURRENT'); + } + // console.log('>>>>===', a.data); // if (a.data.success) { // this.onLoad(this.page); // } @@ -272,6 +312,7 @@ export default { this.onLoad(this.page); }, onLoad(page, params = {}) { + console.log('1111 :>> ', 1111); this.loading = true; this.query.stockArticleId = this.$route.query.id; this.query.conditions = '1';