From 5f560a051958c07e747881caad835e8953889b79 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 28 十一月 2023 15:05:06 +0800
Subject: [PATCH] modified: src/api/warehouse/pallettransports.js modified: src/views/warehouse/pallettransports/index.vue
---
src/views/warehouse/pallettransports/index.vue | 39 +++++++++++++++++++++++++--------------
src/api/warehouse/pallettransports.js | 8 ++++++++
2 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/src/api/warehouse/pallettransports.js b/src/api/warehouse/pallettransports.js
index c2c2b20..54c4c69 100644
--- a/src/api/warehouse/pallettransports.js
+++ b/src/api/warehouse/pallettransports.js
@@ -23,6 +23,14 @@
})
}
+export function selectAll(data) {
+ return request({
+ url: '/mes/palletTransportsDetail/selectAll',
+ method: 'get',
+ params: data
+ })
+}
+
export function putPalletTransports(obj) {
return request({
url: '/mes/palletTransports',
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index f52ae19..b529d04 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -113,27 +113,27 @@
v-adaptive="{ bottomOffset: 20, fixedHeight: 0 }" height="100px" border
@selection-change="palletTransportsDetailSelectionChange" stripe ref="palletTransportsDetailTable">
<el-table-column type="selection" width="55"> </el-table-column>
- <el-table-column prop="partNo" label="闆朵欢鍙�" align="center" show-overflow-tooltip>
+ <el-table-column prop="part_no" label="闆朵欢鍙�" align="center" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="partDesc" label="闆朵欢鎻忚堪" align="center" show-overflow-tooltip>
+ <el-table-column prop="part_desc" label="闆朵欢鎻忚堪" align="center" show-overflow-tooltip>
</el-table-column>
<!-- <el-table-column prop="batchNo" label="鎵规鍙�" align="center" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="wdr" label="WDR" align="center">
</el-table-column> -->
- <el-table-column prop="operationTaskNo" label="宸ュ崟" align="center" show-overflow-tooltip>
+ <el-table-column prop="operation_task_no" label="宸ュ崟" align="center" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="transferQuantity" label="绉诲簱鏁伴噺" align="center">
+ <el-table-column prop="transfer_quantity" label="绉诲簱鏁伴噺" align="center">
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅" align="center">
</el-table-column>
<!-- <el-table-column prop="fromIfsLocationNo" label="IFS浠庡簱浣�" align="center">
</el-table-column> -->
- <el-table-column prop="toIfsLocationNo" label="绉昏嚦搴撲綅" align="center">
- <template slot-scope="scope">
+ <el-table-column prop="to_ifs_location_no" label="绉昏嚦搴撲綅" align="center">
+ <!-- <template slot-scope="scope">
<el-link type="primary" @click="openSingleLocationDialog(scope.row)">{{ scope.row.toIfsLocationNo
}}</el-link>
- </template>
+ </template> -->
</el-table-column>
<el-table-column prop="state" label="鐘舵��" align="center">
<template slot-scope="scope">
@@ -148,8 +148,8 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="85">
<template slot-scope="scope">
- <el-button type="text" @click="openEditStockDialog(scope.row)"
- :disabled="scope.row.state === '01initial' ? false : true">缂栬緫</el-button>
+ <!-- <el-button type="text" @click="openEditStockDialog(scope.row)"
+ :disabled="scope.row.state === '01initial' ? false : true">缂栬緫</el-button> -->
<el-button type="text" @click="delDetail(scope.row)"
:disabled="scope.row.state === '01initial' ? false : true">鍒犻櫎</el-button>
</template>
@@ -188,7 +188,8 @@
delPalletTransportsMaterialObj,
palletTransportsDetailFetchList,
delPalletTransportsDetailObj,
- executeMoveLocation
+ executeMoveLocation,
+ selectAll,
} from '@/api/warehouse/pallettransports'
import { getByPalletTransId } from '@/api/plan/operationtask'
import ttable from '@/views/common/ztt-table.vue'
@@ -563,7 +564,7 @@
operationTaskId:this.WorkOrder.id,
unit: el.unit,
}})
- this.palletTransportsDetailData = transportsDetails
+ // this.palletTransportsDetailData = transportsDetails
if (transportsDetails.length > 0) {
saveBatchPalletTransportsDetail(transportsDetails)
.then((response) => {
@@ -616,10 +617,11 @@
},
// 鎵撳紑鍗曚釜鏄庣粏鎵归噺鏇存柊搴撲綅寮规
openSingleLocationDialog(row) {
+ console.log(row);
if (row.state === '01initial') {
this.detailList = []
this.detailList.push(row)
- this.showDetailLocation = true
+ // this.showDetailLocation = true
} else {
this.$message.error('绉诲簱鏄庣粏宸叉墽琛�')
}
@@ -701,9 +703,18 @@
}
},
palletTransportsMaterialSelectionChange(val) {
- console.log(val,"12312313");
-
this.palletTransportsMaterialMultipleSelection = val
+ let nn =[]
+ this.palletTransportsMaterialMultipleSelection.forEach(el =>{nn.push(el.id)})
+ let xx = nn[nn.length - 1];
+ console.log(xx);
+ console.log(this.currPalletTransportsRow.id,"榛樿");
+ this.palletTransportsDetailData = []
+ if (xx) {
+ selectAll({transportsId:this.currPalletTransportsRow.id,transportsMaterialId:xx}).then((res) =>{
+ console.log(res.data.data);
+ this.palletTransportsDetailData.push(res.data.data)})
+ }
// if (this.palletTransportsMaterialMultipleSelection.length > 0) {
// const currPalletTransportsMaterial = this
// .palletTransportsMaterialMultipleSelection[
--
Gitblit v1.9.3