From a720f2fac8272f0412d8aa7d8221c3284677211b Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 28 十一月 2023 13:04:19 +0800
Subject: [PATCH] modified: src/views/warehouse/pallettransports/index.vue modified: vue.config.js
---
src/views/warehouse/pallettransports/index.vue | 82 +++++++++++++++++++++++++---------------
1 files changed, 51 insertions(+), 31 deletions(-)
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index 9f33ac0..a0428d9 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -17,7 +17,8 @@
<div></div>
</div>
<div style="padding:0px 20px 0px;">
- <el-table class="pallet-transports-optask-table" :data="palletTransportsOptaskData" style="width: 100%;"
+ <el-table class="pallet-transports-optask-table" :data="palletTransportsOptaskData"
+ style="width: 100%;"
v-adaptive="{ bottomOffset: 20, fixedHeight: 0 }" height="100px" border highlight-current-row
@row-click="optaskRowClick" stripe ref="palletTransportsOptaskTable">
<el-table-column align="center" width="55" label="鍗曢��">
@@ -89,13 +90,14 @@
</div>
<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="font-weight:bold;">绉诲簱鏄庣粏</span>
+ <!-- <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
@@ -198,7 +200,7 @@
import detailIfsLocationDialog from './detail-ifslocation-form'
import adaptive from '@/util/adaptive'
import { mapGetters } from 'vuex'
-
+import { saveBatchPalletTransportsDetail } from '@/api/warehouse/pallettransports'
export default {
data() {
return {
@@ -211,6 +213,7 @@
isShow: false,
url: ''
},
+ WorkOrder:{},
prelang: 'pallettransports',
options: {
height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
@@ -544,25 +547,38 @@
},
// 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
getPalletTransportsDetailData() {
- this.palletTransportsDetailData = []
- if (this.palletTransportsMaterialMultipleSelection.length > 0) {
- const currPalletTransportsMaterial = this
- .palletTransportsMaterialMultipleSelection[
- this.palletTransportsMaterialMultipleSelection.length - 1
- ]
- let obj = {
- partNo: currPalletTransportsMaterial.partNo,
- partDesc: currPalletTransportsMaterial.partDesc,
- operationTaskNo: this.currOptask.optaskNo,
- transferQuantity: currPalletTransportsMaterial.surplusQuantity,
- unit: currPalletTransportsMaterial.unit,
- toIfsLocationNo: currPalletTransportsMaterial.currPalletTransportsMaterial,
- state: null
+ console.log("瀵瑰簲宸ュ崟",this.WorkOrder);
+ console.log("鐗╂枡闇�姹�",this.palletTransportsMaterialMultipleSelection);
+ let transportsDetails =[]
+ transportsDetails = this.palletTransportsMaterialMultipleSelection.map(el =>{
+ return{
+ partNo:el.partNo,
+ partDesc: el.partDesc,
+ transferQuantity: el.surplusQuantity,
+ toIfsLocationNo:el.toIfsLocationNo,
+ toIfsLocationName: el.toIfsLocationName,
+ transportsId: el.transportsId,
+ transportsMaterialId:el.id,
+ operationTaskNo:this.WorkOrder.optaskNo,
+ operationTaskId:this.WorkOrder.id,
+ unit: el.unit,
+ }})
+ this.palletTransportsDetailData = transportsDetails
+ if (transportsDetails.length > 0) {
+ saveBatchPalletTransportsDetail(transportsDetails)
+ .then((response) => {
+ const resData = response.data
+ if (resData.code === 0) {
+ this.innerVisible = false
+ this.$message.success('娣诲姞绉诲簱鏄庣粏鎴愬姛')
+ this.$emit('refreshDataList')
+ } else {
+ this.$message.error('娣诲姞绉诲簱鏄庣粏澶辫触')
+ }
+ })
+ .catch(() => {
+ })
}
- this.palletTransportsDetailData.push(obj)
- } else {
- this.$message.error('璇峰厛閫夋嫨鐗╂枡闇�姹�')
- }
},
// 娣诲姞ifs鐗╂枡搴撳瓨鍥炶皟
addIfsStockCallback() {
@@ -685,16 +701,18 @@
}
},
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
- }
+ // if (this.palletTransportsMaterialMultipleSelection.length > 0) {
+ // const currPalletTransportsMaterial = this
+ // .palletTransportsMaterialMultipleSelection[
+ // this.palletTransportsMaterialMultipleSelection.length - 1
+ // ]
+ // this.materialRow = currPalletTransportsMaterial
+ // } else {
+ // this.materialRow = null
+ // }
// this.getPalletTransportsDetailData()
},
palletTransportsDetailSelectionChange(val) {
@@ -712,6 +730,8 @@
})
},
optaskRowClick(row, column) {
+ console.log(row,222222222222222);
+ this.WorkOrder = row
this.palletTransportsOptaskData.forEach((item) => {
if (row.id !== item.id) {
item.commonChecked = false
--
Gitblit v1.9.3