Browse Source

修复库存品打印

dev-xx
qb 11 months ago
parent
commit
ccadaf52f5
  1. 13
      src/views/distribution/inventory/distributionStockArticleFrom.vue
  2. 32
      src/views/distribution/inventory/distributionStockListDetails.vue

13
src/views/distribution/inventory/distributionStockArticleFrom.vue

@ -1,5 +1,5 @@
<template> <template>
<basic-container> <basic-container v-loading="loadingObj.pageLoading">
<div class="avue-crud"> <div class="avue-crud">
<div class="avue-crud__header"> <div class="avue-crud__header">
<!-- 头部左侧按钮模块 --> <!-- 头部左侧按钮模块 -->
@ -137,6 +137,9 @@ export default {
this.selectionClear(); this.selectionClear();
}); });
}, 10), }, 10),
loadingObj: {
pageLoading: false,
},
}; };
}, },
watch: { watch: {
@ -165,6 +168,9 @@ export default {
}, },
methods: { methods: {
async handleTrade() { async handleTrade() {
try {
this.loadingObj.pageLoading = true;
if (this.ids.length > 0) { if (this.ids.length > 0) {
const flag = this.selectionList.every(val => val.materialId); const flag = this.selectionList.every(val => val.materialId);
if (!flag) return this.$message.error('有订单物料信息未维护!!!'); if (!flag) return this.$message.error('有订单物料信息未维护!!!');
@ -191,6 +197,11 @@ export default {
} else { } else {
this.$message.warning('请选择需要转的包件信息!!!'); this.$message.warning('请选择需要转的包件信息!!!');
} }
} catch (error) {
console.log('error :>> ', error);
} finally {
this.loadingObj.pageLoading = false;
}
}, },
// //
handleNumberRange(e, row) { handleNumberRange(e, row) {

32
src/views/distribution/inventory/distributionStockListDetails.vue

@ -1,6 +1,6 @@
<template> <template>
<basic-container> <basic-container>
<div class="avue-crud"> <div class="avue-crud" v-loading="loadingObj.pageLoading">
<!-- <el-row v-if="!search" style="padding:6px 18px">--> <!-- <el-row v-if="!search" style="padding:6px 18px">-->
<!-- 查询模块 --> <!-- 查询模块 -->
<el-form :model="queryOwn" label-width="80px"> <el-form :model="queryOwn" label-width="80px">
@ -617,6 +617,9 @@ export default {
data2: [], data2: [],
data3: [], data3: [],
leibiao: '', leibiao: '',
loadingObj: {
pageLoading: false,
},
}; };
}, },
mounted() { mounted() {
@ -628,7 +631,7 @@ export default {
// console.log(newVal, oldVal); // console.log(newVal, oldVal);
if (this.$route.path !== '/distribution/inventory/distributionStockListDetails') return; if (this.$route.path !== '/distribution/inventory/distributionStockListDetails') return;
this.activeName = 'library'; this.activeName = 'library';
this.query = {} this.query = {};
this.init(); this.init();
}, },
deep: true, deep: true,
@ -647,22 +650,23 @@ export default {
}, },
methods: { methods: {
// //
handleInventoryQRCode(scope) { async handleInventoryQRCode({ row }) {
const { row } = scope;
console.log('执行查看二维码------------>row:', row); console.log('执行查看二维码------------>row:', row);
this.materialQRCode = row; try {
console.log('---------------->', row); this.loadingObj.pageLoading = true;
let qr = { let res = await showInventorySourcePackageCode(row.incomingBatch, row.parcelListId);
ids: row.id,
};
this.html = ''; this.html = '';
showInventorySourcePackageCode(row.incomingBatch, row.parcelListId).then(res => {
// this.orderPackageCode = res.data const { code, data } = res.data;
console.log(res.data); if (code !== 200) return;
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml); this.html = this.getHtmls(data.dataList, data.templateHtml);
});
this.dialogVisibleF = true; this.dialogVisibleF = true;
} catch (error) {
console.log('error :>> ', error);
} finally {
this.loadingObj.pageLoading = false;
}
}, },
revokeFn(val) { revokeFn(val) {
ElMessageBox.confirm('撤销物料会产生库存数量扣减,是否继续?', 'Warning', { ElMessageBox.confirm('撤销物料会产生库存数量扣减,是否继续?', 'Warning', {

Loading…
Cancel
Save