From c880739ec4cd5ede33b31eb98ad5f7628ea288e5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 十二月 2023 17:41:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/warehouse/pallettransports/index.vue | 120 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 71 insertions(+), 49 deletions(-)
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index b529d04..5303f6a 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -52,10 +52,15 @@
</div>
</div>
<div>
- <el-table class="pallet-transports-material-table" :data="palletTransportsMaterialData" style="width: 100%;"
- height="350px" border @selection-change="palletTransportsMaterialSelectionChange" stripe
+ <el-table class="pallet-transports-material-table" @current-change="handleCurrentChange" :data="palletTransportsMaterialData" style="width: 100%;"
+ height="350px" border stripe
ref="palletTransportsMaterialTable">
- <el-table-column type="selection" width="55"> </el-table-column>
+ <!--鍗曢�夋 @selection-change="palletTransportsMaterialSelectionChange"-->
+ <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 prop="partNo" label="闆朵欢鍙�" align="center" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="partDesc" label="闆朵欢鎻忚堪" align="center" show-overflow-tooltip>
@@ -78,10 +83,10 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="100">
<template slot-scope="scope">
- <el-button v-show="!scope.row.canEdit" type="text" :disabled="scope.row.detailExistState"
- @click="scope.row.canEdit = true">缂栬緫</el-button>
- <el-button v-show="scope.row.canEdit" type="text" :disabled="scope.row.detailExistState"
- @click="updateMaterial(scope.row)">淇濆瓨</el-button>
+ <!-- <el-button v-show="!scope.row.canEdit" type="text" :disabled="scope.row.detailExistState"
+ @click="scope.row.canEdit = true">缂栬緫</el-button> -->
+ <!-- <el-button v-show="scope.row.canEdit" type="text" :disabled="scope.row.detailExistState"
+ @click="updateMaterial(scope.row)">淇濆瓨</el-button> -->
<el-button type="text" :disabled="scope.row.detailExistState"
@click="delMaterial(scope.row)">鍒犻櫎</el-button>
</template>
@@ -205,6 +210,7 @@
export default {
data() {
return {
+ partDesc: null,
ajaxFun: palletTransportsFetchList,
currPalletTransportsRow: null,
palletTransportsMaterialMultipleSelection: [],
@@ -215,6 +221,7 @@
url: ''
},
WorkOrder:{},
+ datalistAPI:'',
prelang: 'pallettransports',
options: {
height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
@@ -347,8 +354,29 @@
computed: {
...mapGetters(['permissions'])
},
+ watch:{
+ palletTransportsMaterialMultipleSelection(newVal){
+ if(newVal.length>0){
+ this.palletTransportsMaterialSelectionChange(newVal)
+ }else{
+ this.palletTransportsDetailData = []
+ }
+ }
+ },
created() { },
methods: {
+ // 鍗曡閫変腑
+ handleCurrentChange(row) {
+ this.palletTransportsMaterialData.forEach((item) => {
+ // 鎺掍粬,姣忔閫夋嫨鏃舵妸鍏朵粬閫夐」閮芥竻闄�
+ if (item.id !== row.id) {
+ item.commonChecked = false
+ }else{
+ item.commonChecked = true
+ }
+ })
+ this.palletTransportsMaterialSelectionChange([row])
+ },
// 宸ヨ壓绫诲瀷涓枃鏍煎紡鍖�
formatStateType(row, column, cellValue) {
this.stateOptions.forEach((obj) => {
@@ -397,7 +425,8 @@
unit: item.unit,
transportsId: item.transportsId,
detailExistState: item.detailExistState,
- canEdit: false
+ canEdit: false,
+ commonChecked: false
}
this.palletTransportsMaterialData.push(palletTransportsMaterial)
})
@@ -488,12 +517,10 @@
openLocationDialog() {
if (this.palletTransportsMaterialMultipleSelection.length > 0) {
let flag = true
- console.log(this.palletTransportsMaterialMultipleSelection)
this.palletTransportsMaterialMultipleSelection.forEach((item) => {
if (item.detailExistState) {
flag = false
}
- console.log(item.detailExistState)
})
if (flag) {
this.showLocation = true
@@ -548,8 +575,6 @@
},
// 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
getPalletTransportsDetailData() {
- console.log("瀵瑰簲宸ュ崟",this.WorkOrder);
- console.log("鐗╂枡闇�姹�",this.palletTransportsMaterialMultipleSelection);
let transportsDetails =[]
transportsDetails = this.palletTransportsMaterialMultipleSelection.map(el =>{
return{
@@ -566,29 +591,32 @@
}})
// this.palletTransportsDetailData = transportsDetails
if (transportsDetails.length > 0) {
+ let selectionList = this.palletTransportsMaterialMultipleSelection
saveBatchPalletTransportsDetail(transportsDetails)
.then((response) => {
const resData = response.data
if (resData.code === 0) {
this.innerVisible = false
this.$message.success('娣诲姞绉诲簱鏄庣粏鎴愬姛')
- this.$emit('refreshDataList')
+ let materialRow = selectionList[selectionList.length - 1]
+ this.palletTransportsMaterialData.forEach(ele=>{
+ if(ele.id==materialRow.id){
+ ele.transferQuantity = materialRow.surplusQuantity
+ ele.surplusQuantity = 0
+ }
+ })
} else {
this.$message.error('娣诲姞绉诲簱鏄庣粏澶辫触')
}
+ // this.getPalletTransportsMaterialData()
+ this.palletTransportsMaterialSelectionChange(selectionList)
})
- .catch(() => {
- })
+ // .catch(() => {
+ // })
}
},
// 娣诲姞ifs鐗╂枡搴撳瓨鍥炶皟
addIfsStockCallback() {
- // 鍒锋柊鐗╂枡闇�姹傘�佸埛鏂扮Щ搴撴槑缁�
- // this.getPalletTransportsMaterialData()
- // 鍒锋柊璐х洏杩愯緭浠诲姟鍒楄〃
- // if (this.showStock) {
- // this.getPallettransportsData()
- // }
const currRow = this.currPalletTransportsRow
this.getPallettransportsData().then(() => {
if (currRow) {
@@ -617,7 +645,6 @@
},
// 鎵撳紑鍗曚釜鏄庣粏鎵归噺鏇存柊搴撲綅寮规
openSingleLocationDialog(row) {
- console.log(row);
if (row.state === '01initial') {
this.detailList = []
this.detailList.push(row)
@@ -628,17 +655,15 @@
},
// 鍒犻櫎绉诲簱鏄庣粏
delDetail(row) {
- /* const delRow = this.palletTransportsDetailData.find((item) => {
+ const delRow = this.palletTransportsDetailData.find((item) => {
return item.id === row.id
- }) */
-
+ })
delPalletTransportsDetailObj(row.id).then((response) => {
const resData = response.data
if (resData.code === 0) {
- // const findRowIndex = this.palletTransportsDetailData.indexOf(delRow)
- // this.palletTransportsDetailData.splice(findRowIndex, 1)
+ const findRowIndex = this.palletTransportsDetailData.indexOf(delRow)
+ this.palletTransportsDetailData.splice(findRowIndex, 1)
this.$message.success('绉诲簱鏄庣粏鍒犻櫎鎴愬姛')
- // this.getPalletTransportsMaterialData()
const currRow = this.currPalletTransportsRow
this.getPallettransportsData().then(() => {
if (currRow) {
@@ -670,6 +695,7 @@
if (resData.code === 0) {
this.$message.success('鎵ц鎴愬姛')
// this.getPalletTransportsMaterialData()
+ this.palletTransportsDetailData=[]
const currRow = this.currPalletTransportsRow
this.getPallettransportsData().then(() => {
if (currRow) {
@@ -704,27 +730,24 @@
},
palletTransportsMaterialSelectionChange(val) {
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(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 = []
+ }
}
- // if (this.palletTransportsMaterialMultipleSelection.length > 0) {
- // const currPalletTransportsMaterial = this
- // .palletTransportsMaterialMultipleSelection[
- // this.palletTransportsMaterialMultipleSelection.length - 1
- // ]
- // this.materialRow = currPalletTransportsMaterial
- // } else {
- // this.materialRow = null
- // }
- // this.getPalletTransportsDetailData()
},
palletTransportsDetailSelectionChange(val) {
this.palletTransportsDetailMultipleSelection = val
@@ -741,7 +764,6 @@
})
},
optaskRowClick(row, column) {
- console.log(row,222222222222222);
this.WorkOrder = row
this.palletTransportsOptaskData.forEach((item) => {
if (row.id !== item.id) {
--
Gitblit v1.9.3