From 5fdedc928cd6970423cf024c43a99e522a44dbcf Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 29 十一月 2023 11:15:28 +0800
Subject: [PATCH] modified: src/views/warehouse/pallettransports/index.vue modified: vue.config.js
---
src/views/warehouse/pallettransports/index.vue | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index f52ae19..af65c10 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'
@@ -214,6 +215,7 @@
url: ''
},
WorkOrder:{},
+ datalistAPI:'',
prelang: 'pallettransports',
options: {
height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
@@ -563,7 +565,7 @@
operationTaskId:this.WorkOrder.id,
unit: el.unit,
}})
- this.palletTransportsDetailData = transportsDetails
+ // this.palletTransportsDetailData = transportsDetails
if (transportsDetails.length > 0) {
saveBatchPalletTransportsDetail(transportsDetails)
.then((response) => {
@@ -571,13 +573,14 @@
if (resData.code === 0) {
this.innerVisible = false
this.$message.success('娣诲姞绉诲簱鏄庣粏鎴愬姛')
+ this.MobileLibrary()
this.$emit('refreshDataList')
} else {
this.$message.error('娣诲姞绉诲簱鏄庣粏澶辫触')
}
})
- .catch(() => {
- })
+ // .catch(() => {
+ // })
}
},
// 娣诲姞ifs鐗╂枡搴撳瓨鍥炶皟
@@ -616,10 +619,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,19 +705,27 @@
}
},
palletTransportsMaterialSelectionChange(val) {
- console.log(val,"12312313");
-
this.palletTransportsMaterialMultipleSelection = val
- // if (this.palletTransportsMaterialMultipleSelection.length > 0) {
- // const currPalletTransportsMaterial = this
- // .palletTransportsMaterialMultipleSelection[
- // this.palletTransportsMaterialMultipleSelection.length - 1
- // ]
- // this.materialRow = currPalletTransportsMaterial
- // } else {
- // this.materialRow = null
- // }
- // this.getPalletTransportsDetailData()
+ let ids =[]
+ this.palletTransportsMaterialMultipleSelection.forEach(el =>{ids.push(el.id)})
+ let pId = ids[ids.length - 1];
+ console.log(pId);
+ this.palletTransportsDetailData = []
+ this.datalistAPI = pId
+ this.MobileLibrary()
+ },
+ MobileLibrary(){
+ if(this.datalistAPI){
+ selectAll({
+ transportsId:this.currPalletTransportsRow.id,
+ transportsMaterialId: this.datalistAPI
+ }).then((res) =>{
+ console.log(res);
+ if(res.data.data){
+ this.palletTransportsDetailData.push(res.data.data)
+ }
+ })
+ }
},
palletTransportsDetailSelectionChange(val) {
this.palletTransportsDetailMultipleSelection = val
--
Gitblit v1.9.3