From d892f98a6fc7bacca5c39c92f3f74ef2e81ba3f2 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 27 十二月 2023 17:40:20 +0800
Subject: [PATCH] modified: src/views/warehouse/pallettransports/index.vue modified: vue.config.js
---
src/views/warehouse/pallettransports/index.vue | 139 +++++++++++++++++++++++++++++----------------
1 files changed, 89 insertions(+), 50 deletions(-)
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index 5353e18..80c83f1 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -3,6 +3,7 @@
<basic-container>
<el-row>
<el-col :span="9">
+
<ttable :table="table" @currentChange="palletTransportsChange" :uploadInfo="uploadInfo" :prelang="prelang"
:options="options" :ajaxFun="ajaxFun" :fixedHeight="palletTransportsFixedHeight" ref="pallettransportsTable">
<template #toolbar>
@@ -10,6 +11,7 @@
@click="addOrUpdateHandle()">鏂板</el-button>
</template>
</ttable>
+
<div style="margin:0px 20px 0px;display:flex;height:36px;justify-content: space-between;align-items:center;">
<div>
<span style="font-weight:bold;">瀵瑰簲宸ュ崟</span>
@@ -52,15 +54,16 @@
</div>
</div>
<div>
- <el-table class="pallet-transports-material-table" @current-change="handleCurrentChange" :data="palletTransportsMaterialData" style="width: 100%;"
+ <el-table class="pallet-transports-material-table" @selection-change="handleCurrentChange" :data="palletTransportsMaterialData" style="width: 100%;"
height="350px" border stripe
ref="palletTransportsMaterialTable">
<!--鍗曢�夋 @selection-change="palletTransportsMaterialSelectionChange"-->
- <el-table-column align="center" width="55" label="鍗曢��">
+ <!-- <el-table-column align="center" width="55" label="澶氶��">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.commonChecked" @change="handleCurrentChange(scope.row)" ></el-checkbox>
</template>
- </el-table-column>
+ </el-table-column> -->
+ <el-table-column type="selection" width="55"> </el-table-column>
<el-table-column prop="partNo" label="闆朵欢鍙�" align="center" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="partDesc" label="闆朵欢鎻忚堪" align="center" show-overflow-tooltip>
@@ -96,13 +99,13 @@
<div style="margin-top:10px;display:flex;height:36px;justify-content: space-between;align-items:center;">
<div>
<span style="font-weight:bold;">绉诲簱鏄庣粏</span>
- <span style="color:red;">({{
+ <!-- <span style="color:red;">({{
palletTransportsMaterialMultipleSelection.length > 0
? palletTransportsMaterialMultipleSelection[
palletTransportsMaterialMultipleSelection.length - 1
].partDesc
: ''
- }})</span>
+ }})</span> -->
</div>
<div>
<el-button type="primary" v-if="permissions.warehouse_pallettransports_detail_add" round
@@ -118,6 +121,7 @@
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="part_no" label="闆朵欢鍙�" align="center" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="part_desc" label="闆朵欢鎻忚堪" align="center" show-overflow-tooltip>
@@ -128,8 +132,15 @@
</el-table-column> -->
<el-table-column prop="operation_task_no" label="宸ュ崟" align="center" show-overflow-tooltip>
</el-table-column>
+
+
<el-table-column prop="transfer_quantity" label="绉诲簱鏁伴噺" align="center">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.transfer_quantity" border="none"></el-input>
+ </template>
</el-table-column>
+
+
<el-table-column prop="unit" label="鍗曚綅" align="center">
</el-table-column>
<!-- <el-table-column prop="fromIfsLocationNo" label="IFS浠庡簱浣�" align="center">
@@ -325,6 +336,7 @@
detailList: [],
palletTransportsOptaskData: [],
currOptask: null,
+ cid:null,
stateOptions: [
{ value: 'draft', label: '鑽夌' },
{ value: 'processing', label: '杩涜涓�' },
@@ -348,13 +360,13 @@
...mapGetters(['permissions'])
},
watch:{
- palletTransportsMaterialMultipleSelection(newVal){
- if(newVal.length>0){
- this.palletTransportsMaterialSelectionChange(newVal)
- }else{
- this.palletTransportsDetailData = []
- }
- }
+ // palletTransportsMaterialMultipleSelection(newVal){
+ // if(newVal.length>0){
+ // this.palletTransportsMaterialSelectionChange(newVal)
+ // }else{
+ // this.palletTransportsDetailData = []
+ // }
+ // }
},
created() {
if(this.permissions.warehouse_pallettransports_edit){
@@ -369,17 +381,69 @@
}
},
methods: {
+ palletTransportsChange(val) {
+ this.cid = val.id
+ this.currPalletTransportsRow = val
+ if (this.currPalletTransportsRow) {
+ this.getPalletTransportsMaterialData()
+ this.getOptasks()
+ this.palletTransportsMaterialSelectionChange(val)
+ }
+ },
+ palletTransportsMaterialSelectionChange() {
+ if(this.cid){
+ selectAll({transportsId:this.cid}).then((res)=>{
+ console.log(res.data.data);
+ this.palletTransportsDetailData = res.data.data.map(el =>{
+ return{
+ part_no:el.partNo,
+ part_desc:el.partDesc,
+ operation_task_no:el.operationTaskNo,
+ transfer_quantity:el.transferQuantity,
+ unit:el.unit,
+ to_ifs_location_no:el.toIfsLocationName,
+ state:el.state,
+ id:el.id,
+ }
+ })
+
+ })
+
+ }
+ // this.palletTransportsMaterialMultipleSelection = val
+ // if(val && val.length>0){
+ // let ids =[]
+ // this.palletTransportsMaterialMultipleSelection.forEach(el =>{ids.push(el.id)})
+ // let pId = ids[ids.length - 1];
+ // if(pId!=null){
+ // selectAll({
+ // transportsId:this.currPalletTransportsRow.id,
+ // transportsMaterialId: pId
+ // }).then((res) =>{
+ // this.palletTransportsDetailData = []
+ // if(res.data.data){
+ // this.palletTransportsDetailData.push(res.data.data)
+ // }
+ // })
+ // }else{
+ // this.palletTransportsDetailData = []
+ // }
+ // }
+ },
// 鍗曡閫変腑
handleCurrentChange(row) {
- this.palletTransportsMaterialData.forEach((item) => {
- // 鎺掍粬,姣忔閫夋嫨鏃舵妸鍏朵粬閫夐」閮芥竻闄�
- if (item.id !== row.id) {
- item.commonChecked = false
- }else{
- item.commonChecked = true
- }
- })
- this.palletTransportsMaterialSelectionChange([row])
+ console.log(row,"--->1");
+ this.palletTransportsMaterialMultipleSelection = row
+ // this.palletTransportsMaterialData.forEach((item) => {
+ // // 鎺掍粬,姣忔閫夋嫨鏃舵妸鍏朵粬閫夐」閮芥竻闄�
+ // if (item.id !== row.id) {
+ // item.commonChecked = false
+ // }else{
+ // item.commonChecked = true
+ // }
+ // })
+ // this.palletTransportsMaterialSelectionChange([row])
+ // this.palletTransportsDetailData = data
},
// 宸ヨ壓绫诲瀷涓枃鏍煎紡鍖�
formatStateType(row, column, cellValue) {
@@ -580,6 +644,7 @@
// 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
getPalletTransportsDetailData() {
let transportsDetails =[]
+ console.log(this.palletTransportsMaterialMultipleSelection,"----+");
transportsDetails = this.palletTransportsMaterialMultipleSelection.map(el =>{
return{
partNo:el.partNo,
@@ -613,7 +678,7 @@
this.$message.error('娣诲姞绉诲簱鏄庣粏澶辫触')
}
// this.getPalletTransportsMaterialData()
- this.palletTransportsMaterialSelectionChange(selectionList)
+ this.palletTransportsMaterialSelectionChange()
})
// .catch(() => {
// })
@@ -693,6 +758,7 @@
flag = false
}
})
+ console.log("-----------",flag,ids);
if (flag) {
executeMoveLocation(ids).then((response) => {
const resData = response.data
@@ -725,35 +791,8 @@
this.currDetailRow = row
this.showDetailStock = true
},
- palletTransportsChange(val) {
- this.currPalletTransportsRow = val
- if (this.currPalletTransportsRow) {
- this.getPalletTransportsMaterialData()
- this.getOptasks()
- }
- },
- palletTransportsMaterialSelectionChange(val) {
- this.palletTransportsMaterialMultipleSelection = val
- if(val && val.length>0){
- let ids =[]
- this.palletTransportsMaterialMultipleSelection.forEach(el =>{ids.push(el.id)})
- let pId = ids[ids.length - 1];
- if(pId!=null){
- selectAll({
- transportsId:this.currPalletTransportsRow.id,
- transportsMaterialId: pId
- }).then((res) =>{
- this.palletTransportsDetailData = []
- if(res.data.data){
- this.palletTransportsDetailData.push(res.data.data)
- }
- })
- }else{
- this.palletTransportsDetailData = []
- }
- }
- },
palletTransportsDetailSelectionChange(val) {
+ console.log(val,"-=-=-=");
this.palletTransportsDetailMultipleSelection = val
},
getOptasks() {
--
Gitblit v1.9.3