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 | 224 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 150 insertions(+), 74 deletions(-)
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index f52ae19..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,9 +54,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" @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="澶氶��">
+ <template slot-scope="scope">
+ <el-checkbox v-model="scope.row.commonChecked" @change="handleCurrentChange(scope.row)" ></el-checkbox>
+ </template>
+ </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>
@@ -76,12 +84,12 @@
</el-table-column>
<el-table-column prop="toIfsLocationNo" label="绉昏嚦搴撲綅" align="center">
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="100">
+ <el-table-column label="鎿嶄綔" align="center" width="100" v-if="permissions.warehouse_pallettransports_demand_edit">
<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>
@@ -91,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
@@ -113,27 +121,35 @@
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">
+ <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">
</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">
@@ -146,10 +162,10 @@
}}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="85">
+ <el-table-column label="鎿嶄綔" align="center" width="85" v-if="permissions.warehouse_pallettransports_detail_edit">
<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 +204,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'
@@ -204,6 +221,7 @@
export default {
data() {
return {
+ partDesc: null,
ajaxFun: palletTransportsFetchList,
currPalletTransportsRow: null,
palletTransportsMaterialMultipleSelection: [],
@@ -214,6 +232,7 @@
url: ''
},
WorkOrder:{},
+ datalistAPI:'',
prelang: 'pallettransports',
options: {
height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
@@ -295,14 +314,7 @@
}
],
toolbar: [],
- operator: [
- {
- text: '鍒犻櫎',
- type: 'text',
- size: 'small',
- fun: this.deleteHandle
- }
- ],
+ operator: null,
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
@@ -324,6 +336,7 @@
detailList: [],
palletTransportsOptaskData: [],
currOptask: null,
+ cid:null,
stateOptions: [
{ value: 'draft', label: '鑽夌' },
{ value: 'processing', label: '杩涜涓�' },
@@ -346,8 +359,92 @@
computed: {
...mapGetters(['permissions'])
},
- created() { },
+ watch:{
+ // palletTransportsMaterialMultipleSelection(newVal){
+ // if(newVal.length>0){
+ // this.palletTransportsMaterialSelectionChange(newVal)
+ // }else{
+ // this.palletTransportsDetailData = []
+ // }
+ // }
+ },
+ created() {
+ if(this.permissions.warehouse_pallettransports_edit){
+ this.table.operator = [
+ {
+ text: '鍒犻櫎',
+ type: 'text',
+ size: 'small',
+ fun: this.deleteHandle
+ }
+ ]
+ }
+ },
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) {
+ 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) {
this.stateOptions.forEach((obj) => {
@@ -396,7 +493,8 @@
unit: item.unit,
transportsId: item.transportsId,
detailExistState: item.detailExistState,
- canEdit: false
+ canEdit: false,
+ commonChecked: false
}
this.palletTransportsMaterialData.push(palletTransportsMaterial)
})
@@ -487,12 +585,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
@@ -547,9 +643,8 @@
},
// 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
getPalletTransportsDetailData() {
- console.log("瀵瑰簲宸ュ崟",this.WorkOrder);
- console.log("鐗╂枡闇�姹�",this.palletTransportsMaterialMultipleSelection);
let transportsDetails =[]
+ console.log(this.palletTransportsMaterialMultipleSelection,"----+");
transportsDetails = this.palletTransportsMaterialMultipleSelection.map(el =>{
return{
partNo:el.partNo,
@@ -563,31 +658,34 @@
operationTaskId:this.WorkOrder.id,
unit: el.unit,
}})
- this.palletTransportsDetailData = transportsDetails
+ // 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()
})
- .catch(() => {
- })
+ // .catch(() => {
+ // })
}
},
// 娣诲姞ifs鐗╂枡搴撳瓨鍥炶皟
addIfsStockCallback() {
- // 鍒锋柊鐗╂枡闇�姹傘�佸埛鏂扮Щ搴撴槑缁�
- // this.getPalletTransportsMaterialData()
- // 鍒锋柊璐х洏杩愯緭浠诲姟鍒楄〃
- // if (this.showStock) {
- // this.getPallettransportsData()
- // }
const currRow = this.currPalletTransportsRow
this.getPallettransportsData().then(() => {
if (currRow) {
@@ -619,24 +717,22 @@
if (row.state === '01initial') {
this.detailList = []
this.detailList.push(row)
- this.showDetailLocation = true
+ // this.showDetailLocation = true
} else {
this.$message.error('绉诲簱鏄庣粏宸叉墽琛�')
}
},
// 鍒犻櫎绉诲簱鏄庣粏
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) {
@@ -662,12 +758,14 @@
flag = false
}
})
+ console.log("-----------",flag,ids);
if (flag) {
executeMoveLocation(ids).then((response) => {
const resData = response.data
if (resData.code === 0) {
this.$message.success('鎵ц鎴愬姛')
// this.getPalletTransportsMaterialData()
+ this.palletTransportsDetailData=[]
const currRow = this.currPalletTransportsRow
this.getPallettransportsData().then(() => {
if (currRow) {
@@ -693,29 +791,8 @@
this.currDetailRow = row
this.showDetailStock = true
},
- palletTransportsChange(val) {
- this.currPalletTransportsRow = val
- if (this.currPalletTransportsRow) {
- this.getPalletTransportsMaterialData()
- this.getOptasks()
- }
- },
- 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()
- },
palletTransportsDetailSelectionChange(val) {
+ console.log(val,"-=-=-=");
this.palletTransportsDetailMultipleSelection = val
},
getOptasks() {
@@ -730,7 +807,6 @@
})
},
optaskRowClick(row, column) {
- console.log(row,222222222222222);
this.WorkOrder = row
this.palletTransportsOptaskData.forEach((item) => {
if (row.id !== item.id) {
--
Gitblit v1.9.3