From b9c4cbf7d9417ba22b0b5c16f8b75b325cfa2496 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 16 Nov 2023 16:36:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E=E9=A2=84?=
=?UTF-8?q?=E7=BA=A6=E5=8D=95=E9=80=89=E6=8B=A9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../inventory/distributionStockList.vue | 5 +--
.../distributionStockListDetails.vue | 31 ++++++++++++-------
.../reservation/reservationAddFrom.vue | 12 +++----
3 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/src/views/distribution/inventory/distributionStockList.vue b/src/views/distribution/inventory/distributionStockList.vue
index 20c88585..487f5534 100644
--- a/src/views/distribution/inventory/distributionStockList.vue
+++ b/src/views/distribution/inventory/distributionStockList.vue
@@ -72,7 +72,7 @@
</template>
</tablecmt>
</el-row>
- <el-row class='el-fy'>
+ <el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
<!-- 分页模块 -->
@@ -1090,6 +1090,7 @@ export default {
query: {
marketId: row.row.marketId,
materialId: row.row.materialId,
+ incomingBatch: row.row.incomingBatch,
name: row.row.descriptionGoods + ' — 明细',
},
});
@@ -1286,6 +1287,6 @@ export default {
.el-fy {
flex: 1;
display: flex;
-align-items: flex-end;
+ align-items: flex-end;
}
</style>
diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue
index 23b7b1ed..ebd1af5d 100644
--- a/src/views/distribution/inventory/distributionStockListDetails.vue
+++ b/src/views/distribution/inventory/distributionStockListDetails.vue
@@ -129,7 +129,9 @@
</div>
</el-tab-pane>
<el-tab-pane label="入库明细" name="enter">
- <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain>导 出</el-button>
+ <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain
+ >导 出</el-button
+ >
<tablecmt
:columnList="columnListarrs.columnWarehousing"
:tableData="data2"
@@ -221,7 +223,9 @@ import {
add,
update,
remove,
- getListAllocation, stockExport, stockInfoExport
+ getListAllocation,
+ stockExport,
+ stockInfoExport,
} from '@/api/distribution/distributionStockList';
import option from '@/option/distribution/distributionStockList';
import { mapGetters } from 'vuex';
@@ -475,7 +479,8 @@ export default {
fixed: false,
sortable: true,
head: false,
- }, {
+ },
+ {
prop: 'stockQuantity',
label: '数量',
type: 2,
@@ -566,28 +571,30 @@ export default {
},
},
methods: {
-
//导出
handleExport() {
- let row = { };
- if(!!this.ids){
+ let row = {};
+ if (!!this.ids) {
row.ids = this.ids;
}
row.marketId = this.queryOwn.marketId;
row.serviceType = this.queryOwn.serviceType;
row.materialId = this.queryOwn.materialId;
row.warehouseId = this.queryOwn.warehouseId;
- row.storeId = !!this.queryOwn.storeId && this.queryOwn.storeId != '-1' ? this.queryOwn.storeId : null;
+ row.storeId =
+ !!this.queryOwn.storeId && this.queryOwn.storeId != '-1' ? this.queryOwn.storeId : null;
if (!!this.queryOwn.pid) {
row.pid = this.queryOwn.pid;
}
- stockInfoExport(row).then( res =>{
+ stockInfoExport(row).then(res => {
console.log(res.data);
downloadXls(res.data, `${this.$route.query.name}库存品入库明细数据.xlsx`);
});
-
},
-
+ inputsc() {},
+ timesc() {},
+ btnsc() {},
+ selectsc() {},
handleClick(tab, event) {
console.log(tab, event);
console.log(tab.props.name);
@@ -790,7 +797,9 @@ export default {
this.query.serviceType = this.queryOwn.serviceType;
this.query.materialId = this.queryOwn.materialId;
this.query.warehouseId = this.queryOwn.warehouseId;
- this.query.storeId = !!this.queryOwn.storeId && this.queryOwn.storeId != '-1' ? this.queryOwn.storeId : null;
+ this.query.incomingBatch = this.$route.query.incomingBatch;
+ this.query.storeId =
+ !!this.queryOwn.storeId && this.queryOwn.storeId != '-1' ? this.queryOwn.storeId : null;
if (!!this.queryOwn.pid) {
this.query.pid = this.queryOwn.pid;
}
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 1d576f98..b8949ba3 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -1067,7 +1067,7 @@ export default {
label: '订单自编号',
type: 2,
values: '',
- width: '150',
+ width: '260',
checkarr: [],
fixed: false,
sortable: true,
@@ -2639,7 +2639,7 @@ export default {
onSubmitOrder() {
console.log('orderList-------------》', this.orderList);
if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!');
- const list = this.orderList;
+ const list = [...this.orderList, ...this.orderData];
let _name = list[0].customerName;
let _address = list[0].customerAddress;
let _phone = list[0].customerTelephone;
@@ -2678,7 +2678,6 @@ export default {
...this.orderData,
...this.orderList.filter(item => !_ids.includes(item.id)),
];
-
this.orderShow = false;
},
selectionClear() {
@@ -2806,9 +2805,8 @@ export default {
Object.assign(params, this.query)
);
const { records, total } = res.data.data;
- const _filterArr = records
-
- // this.stockArticleInfo = records;
+
+ this.stockArticleInfo = records;
console.log('this.stockArticleInfo :>> ', this.stockArticleInfo);
this.stockArticleInfo.forEach((item, index) => {
//检查订单是否冻结
@@ -2817,7 +2815,7 @@ export default {
});
if (this.orderData.length !== 0) {
const ids = this.orderData.map(val => val.id);
- const _orderData = this.stockArticleInfo.filter(val => !ids.includes(val.id));
+ this.stockArticleInfo = this.stockArticleInfo.filter(val => !ids.includes(val.id));
// this.orderSelectList = this.stockArticleInfo.filter(val => ids.includes(val.id));
console.log('orderSelectList :>> ', this.orderSelectList);
}