From 7af57170702277127862dd2c791ea72eaf9a086e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 19 十二月 2023 13:30:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/warehouse/pallettransports/index.vue | 579 ++++++++++++++++++++-------------------------------------
1 files changed, 207 insertions(+), 372 deletions(-)
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index ccce219..5303f6a 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -3,321 +3,149 @@
<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"
- >
+ <ttable :table="table" @currentChange="palletTransportsChange" :uploadInfo="uploadInfo" :prelang="prelang"
+ :options="options" :ajaxFun="ajaxFun" :fixedHeight="palletTransportsFixedHeight" ref="pallettransportsTable">
<template #toolbar>
- <el-button
- v-if="permissions.warehouse_pallettransports_add"
- type="primary"
- @click="addOrUpdateHandle()"
- >鏂板</el-button
- >
+ <el-button v-if="permissions.warehouse_pallettransports_add" type="primary"
+ @click="addOrUpdateHandle()">鏂板</el-button>
</template>
</ttable>
- <div
- style="margin:0px 20px 0px;display:flex;height:36px;justify-content: space-between;align-items:center;"
- >
+ <div style="margin:0px 20px 0px;display:flex;height:36px;justify-content: space-between;align-items:center;">
<div>
<span style="font-weight:bold;">瀵瑰簲宸ュ崟</span>
</div>
<div></div>
</div>
<div style="padding:0px 20px 0px;">
- <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 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="鍗曢��">
<template slot-scope="scope">
- <el-checkbox
- class="optask-table-single-checkbox"
- v-model="scope.row.commonChecked"
- disabled
- ></el-checkbox>
+ <el-checkbox class="optask-table-single-checkbox" v-model="scope.row.commonChecked"
+ disabled></el-checkbox>
</template>
</el-table-column>
- <el-table-column
- prop="optaskNo"
- label="宸ュ崟鍙�"
- align="center"
- show-overflow-tooltip
- >
+ <el-table-column prop="optaskNo" label="宸ュ崟鍙�" align="center" show-overflow-tooltip>
</el-table-column>
- <el-table-column
- prop="partName"
- label="闆朵欢"
- align="center"
- show-overflow-tooltip
- >
+ <el-table-column prop="partName" label="闆朵欢" align="center" show-overflow-tooltip>
</el-table-column>
- <el-table-column
- prop="workCenter"
- label="宸ヤ綔涓績"
- align="center"
- show-overflow-tooltip
- >
+ <el-table-column prop="workCenter" label="宸ヤ綔涓績" align="center" show-overflow-tooltip>
</el-table-column>
- <el-table-column
- prop="workstationName"
- label="宸ヤ綔绔�"
- align="center"
- show-overflow-tooltip
- >
+ <el-table-column prop="workstationName" label="宸ヤ綔绔�" align="center" show-overflow-tooltip>
</el-table-column>
- <el-table-column
- prop="plannedQuantity"
- label="璁″垝鏁伴噺"
- align="center"
- show-overflow-tooltip
- >
+ <el-table-column prop="plannedQuantity" label="璁″垝鏁伴噺" align="center" show-overflow-tooltip>
</el-table-column>
- <el-table-column
- prop="unit"
- label="鍗曚綅"
- align="center"
- show-overflow-tooltip
- >
+ <el-table-column prop="unit" label="鍗曚綅" align="center" show-overflow-tooltip>
</el-table-column>
</el-table>
</div>
</el-col>
<el-col :span="15" style="padding-left: 10px;padding-right: 10px">
- <div
- style="display:flex;height:36px;justify-content: space-between;align-items:center;"
- >
+ <div style="display:flex;height:36px;justify-content: space-between;align-items:center;">
<div><span style="font-weight:bold;">鐗╂枡闇�姹�</span></div>
<div>
- <el-button
- type="text"
- v-if="permissions.warehouse_pallettransports_demand_add"
- @click="openPartDialog"
- >鏂板</el-button
- ><el-button
- type="text"
- v-if="permissions.warehouse_pallettransports_ifs"
- @click="openLocationDialog"
- >IFS鑷冲簱浣�</el-button
- >
+ <el-button type="text" v-if="permissions.warehouse_pallettransports_demand_add"
+ @click="openPartDialog">鏂板</el-button><el-button type="text"
+ v-if="permissions.warehouse_pallettransports_ifs" @click="openLocationDialog">绉昏嚦搴撲綅</el-button>
</div>
</div>
<div>
- <el-table
- class="pallet-transports-material-table"
- :data="palletTransportsMaterialData"
- style="width: 100%;"
- height="350px"
- border
- @selection-change="palletTransportsMaterialSelectionChange"
- stripe
- ref="palletTransportsMaterialTable"
- >
- <el-table-column type="selection" width="55"> </el-table-column>
- <el-table-column
- prop="partNo"
- label="闆朵欢鍙�"
- align="center"
- show-overflow-tooltip
- >
+ <el-table class="pallet-transports-material-table" @current-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 prop="partNo" label="闆朵欢鍙�" align="center" show-overflow-tooltip>
</el-table-column>
- <el-table-column
- prop="partDesc"
- label="闆朵欢鎻忚堪"
- align="center"
- show-overflow-tooltip
- >
+ <el-table-column prop="partDesc" label="闆朵欢鎻忚堪" align="center" show-overflow-tooltip>
</el-table-column>
- <el-table-column
- prop="demandQuantity"
- label="闇�姹傛暟閲�"
- align="center"
- >
+ <el-table-column prop="demandQuantity" label="闇�姹傛暟閲�" align="center">
<template slot-scope="scope">
- <el-input
- v-show="scope.row.canEdit"
- v-model="scope.row.demandQuantity"
- ></el-input>
+ <el-input v-show="scope.row.canEdit" v-model="scope.row.demandQuantity"></el-input>
<span v-show="!scope.row.canEdit">{{
scope.row.demandQuantity
}}</span>
</template>
</el-table-column>
- <el-table-column
- prop="transferQuantity"
- label="绉诲簱鏁伴噺"
- align="center"
- >
+ <el-table-column prop="transferQuantity" label="绉诲簱鏁伴噺" align="center">
</el-table-column>
- <el-table-column
- prop="surplusQuantity"
- label="鍓╀綑鏁伴噺"
- align="center"
- >
+ <el-table-column prop="surplusQuantity" label="鍓╀綑鏁伴噺" align="center">
</el-table-column>
<el-table-column prop="unit" label="璁￠噺鍗曚綅" align="center">
</el-table-column>
- <el-table-column
- prop="toIfsLocationNo"
- label="IFS鑷冲簱浣�"
- align="center"
- >
+ <el-table-column prop="toIfsLocationNo" label="绉昏嚦搴撲綅" align="center">
</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
- type="text"
- :disabled="scope.row.detailExistState"
- @click="delMaterial(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>
</el-table-column>
</el-table>
</div>
- <div
- style="margin-top:10px;display:flex;height:36px;justify-content: space-between;align-items:center;"
- >
+ <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;"
- >({{
- palletTransportsMaterialMultipleSelection.length > 0
- ? palletTransportsMaterialMultipleSelection[
- palletTransportsMaterialMultipleSelection.length - 1
- ].partDesc
- : ''
- }})</span
- >
+ <span style="font-weight:bold;">绉诲簱鏄庣粏</span>
+ <span style="color:red;">({{
+ palletTransportsMaterialMultipleSelection.length > 0
+ ? palletTransportsMaterialMultipleSelection[
+ palletTransportsMaterialMultipleSelection.length - 1
+ ].partDesc
+ : ''
+ }})</span>
</div>
<div>
- <el-button
- type="primary"
- v-if="permissions.warehouse_pallettransports_detail_add"
- round
- @click="openStockDialog"
- >娣诲姞鏄庣粏</el-button
- >
- <el-button
- type="warning"
- v-if="permissions.warehouse_pallettransports_detail_library"
- round
- @click="openDetailLocationDialog"
- >涓�閿嚦搴撲綅</el-button
- >
- <el-button
- type="success"
- v-if="permissions.warehouse_pallettransports_detail_execute"
- round
- @click="executeMove"
- >鎵� 琛�</el-button
- >
+ <el-button type="primary" v-if="permissions.warehouse_pallettransports_detail_add" round
+ @click="getPalletTransportsDetailData">娣诲姞鏄庣粏</el-button>
+ <!-- <el-button type="warning" v-if="permissions.warehouse_pallettransports_detail_library" round
+ @click="openDetailLocationDialog">涓�閿嚦搴撲綅</el-button> -->
+ <el-button type="success" v-if="permissions.warehouse_pallettransports_detail_execute" round
+ @click="executeMove">鎵� 琛�</el-button>
</div>
</div>
<div>
- <el-table
- class="pallet-transports-detail-table"
- :data="palletTransportsDetailData"
- style="width: 100%;"
- v-adaptive="{ bottomOffset: 20, fixedHeight: 0 }"
- height="100px"
- border
- @selection-change="palletTransportsDetailSelectionChange"
- stripe
- ref="palletTransportsDetailTable"
- >
+ <el-table class="pallet-transports-detail-table" :data="palletTransportsDetailData" style="width: 100%;"
+ 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 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="operation_task_no" label="宸ュ崟" align="center" show-overflow-tooltip>
</el-table-column>
- <el-table-column
- prop="operationTaskNo"
- 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="IFS鑷冲簱浣�"
- align="center"
- >
- <template slot-scope="scope">
- <el-link
- type="primary"
- @click="openSingleLocationDialog(scope.row)"
- >{{ scope.row.toIfsLocationNo }}</el-link
- >
- </template>
+ <!-- <el-table-column prop="fromIfsLocationNo" label="IFS浠庡簱浣�" align="center">
+ </el-table-column> -->
+ <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> -->
</el-table-column>
<el-table-column prop="state" label="鐘舵��" align="center">
<template slot-scope="scope">
<span>{{
scope.row.state == null
- ? ''
- : scope.row.state === '01initial'
+ ? ''
+ : scope.row.state === '01initial'
? '宸插垱寤�'
: '宸叉墽琛�'
}}</span>
@@ -325,18 +153,10 @@
</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="delDetail(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>
</el-table-column>
</el-table>
@@ -344,44 +164,22 @@
</el-col>
</el-row>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
- <pallettransportsFormDialog
- :currshowlist.sync="showPallettransportsForm"
- :palletTransportsId="palletTransportsId"
- @refreshPalletTransports="getPallettransportsData"
- />
+ <pallettransportsFormDialog :currshowlist.sync="showPallettransportsForm" :palletTransportsId="palletTransportsId"
+ @refreshPalletTransports="getPallettransportsData" />
<!-- 寮圭獥, 闆朵欢鍒楄〃 -->
- <partDialog
- :currshowlist.sync="showPart"
- @listenToPartEvent="selectPartCallback"
- />
+ <partDialog :currshowlist.sync="showPart" @listenToPartEvent="selectPartCallback" />
<!-- 寮圭獥, IFS搴撲綅鍒楄〃 -->
- <ifsLocationDialog
- :currshowlist.sync="showLocation"
- :transportsList="palletTransportsMaterialMultipleSelection"
- @refreshDataList="selectLocationCallback"
- />
+ <ifsLocationDialog :currshowlist.sync="showLocation" :transportsList="palletTransportsMaterialMultipleSelection"
+ @refreshDataList="selectLocationCallback" />
<!-- 寮圭獥, IFS搴撳瓨鍒楄〃 -->
- <ifsStockDialog
- :currshowlist.sync="showStock"
- :materialRow="materialRow"
- :transportsRow="currPalletTransportsRow"
- :optask="currOptask"
- @refreshDataList="addIfsStockCallback"
- />
+ <ifsStockDialog :currshowlist.sync="showStock" :materialRow="materialRow" :transportsRow="currPalletTransportsRow"
+ :optask="currOptask" @refreshDataList="addIfsStockCallback" />
<!-- 寮圭獥, 缂栬緫IFS搴撳瓨鍒楄〃 -->
- <detailIfsStockDialog
- :currshowlist.sync="showDetailStock"
- :materialRow="materialRow"
- :transportsRow="currPalletTransportsRow"
- :detailRow="currDetailRow"
- @refreshDataList="addIfsStockCallback"
- />
+ <detailIfsStockDialog :currshowlist.sync="showDetailStock" :materialRow="materialRow"
+ :transportsRow="currPalletTransportsRow" :detailRow="currDetailRow" @refreshDataList="addIfsStockCallback" />
<!-- 寮圭獥, 鏄庣粏鐨処FS搴撲綅鍒楄〃 -->
- <detailIfsLocationDialog
- :currshowlist.sync="showDetailLocation"
- :detailList="detailList"
- @refreshDataList="selectDetailLocationCallback"
- />
+ <detailIfsLocationDialog :currshowlist.sync="showDetailLocation" :detailList="detailList"
+ @refreshDataList="selectDetailLocationCallback" />
</basic-container>
</div>
</template>
@@ -395,7 +193,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'
@@ -407,10 +206,11 @@
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 {
+ partDesc: null,
ajaxFun: palletTransportsFetchList,
currPalletTransportsRow: null,
palletTransportsMaterialMultipleSelection: [],
@@ -420,6 +220,8 @@
isShow: false,
url: ''
},
+ WorkOrder:{},
+ datalistAPI:'',
prelang: 'pallettransports',
options: {
height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
@@ -552,8 +354,29 @@
computed: {
...mapGetters(['permissions'])
},
- created() {},
+ 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) => {
@@ -602,7 +425,8 @@
unit: item.unit,
transportsId: item.transportsId,
detailExistState: item.detailExistState,
- canEdit: false
+ canEdit: false,
+ commonChecked: false
}
this.palletTransportsMaterialData.push(palletTransportsMaterial)
})
@@ -624,31 +448,6 @@
}
})
},
- // 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
- getPalletTransportsDetailData() {
- this.palletTransportsDetailData = []
- if (this.palletTransportsMaterialMultipleSelection.length > 0) {
- const currPalletTransportsMaterial = this
- .palletTransportsMaterialMultipleSelection[
- this.palletTransportsMaterialMultipleSelection.length - 1
- ]
- const queryParam = Object.assign(
- {
- current: 1,
- size: 200
- },
- {
- transportsMaterialId: currPalletTransportsMaterial.id
- }
- )
- palletTransportsDetailFetchList(queryParam).then((response) => {
- const resData = response.data
- if (resData.code === 0) {
- this.palletTransportsDetailData = resData.data.records
- }
- })
- }
- },
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
if (row != null) {
@@ -666,7 +465,7 @@
closeOnClickModal: false,
type: 'warning'
})
- .then(function() {
+ .then(function () {
return delPalletTransportsObj(row.id)
})
.then((data) => {
@@ -675,7 +474,7 @@
this.palletTransportsMaterialData = []
this.palletTransportsDetailData = []
})
- .catch(() => {})
+ .catch(() => { })
},
// 鎵撳紑闆朵欢鍒楄〃
openPartDialog() {
@@ -718,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
@@ -776,22 +573,50 @@
}
})
},
- // 鎵撳紑ifs鐗╂枡搴撳瓨鍒楄〃
- openStockDialog() {
- if (this.palletTransportsMaterialMultipleSelection.length > 0) {
- this.showStock = true
- } else {
- this.$message.error('璇峰厛閫夋嫨鐗╂枡闇�姹�')
- }
+ // 鑾峰彇绉诲簱鏄庣粏鏁版嵁鍒楄〃
+ getPalletTransportsDetailData() {
+ 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) {
+ let selectionList = this.palletTransportsMaterialMultipleSelection
+ saveBatchPalletTransportsDetail(transportsDetails)
+ .then((response) => {
+ const resData = response.data
+ if (resData.code === 0) {
+ this.innerVisible = false
+ this.$message.success('娣诲姞绉诲簱鏄庣粏鎴愬姛')
+ 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(() => {
+ // })
+ }
},
// 娣诲姞ifs鐗╂枡搴撳瓨鍥炶皟
addIfsStockCallback() {
- // 鍒锋柊鐗╂枡闇�姹傘�佸埛鏂扮Щ搴撴槑缁�
- // this.getPalletTransportsMaterialData()
- // 鍒锋柊璐х洏杩愯緭浠诲姟鍒楄〃
- // if (this.showStock) {
- // this.getPallettransportsData()
- // }
const currRow = this.currPalletTransportsRow
this.getPallettransportsData().then(() => {
if (currRow) {
@@ -823,24 +648,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) {
@@ -872,6 +695,7 @@
if (resData.code === 0) {
this.$message.success('鎵ц鎴愬姛')
// this.getPalletTransportsMaterialData()
+ this.palletTransportsDetailData=[]
const currRow = this.currPalletTransportsRow
this.getPallettransportsData().then(() => {
if (currRow) {
@@ -906,16 +730,24 @@
},
palletTransportsMaterialSelectionChange(val) {
this.palletTransportsMaterialMultipleSelection = val
- if (this.palletTransportsMaterialMultipleSelection.length > 0) {
- const currPalletTransportsMaterial = this
- .palletTransportsMaterialMultipleSelection[
- this.palletTransportsMaterialMultipleSelection.length - 1
- ]
- this.materialRow = currPalletTransportsMaterial
- } else {
- this.materialRow = null
+ 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 = []
+ }
}
- this.getPalletTransportsDetailData()
},
palletTransportsDetailSelectionChange(val) {
this.palletTransportsDetailMultipleSelection = val
@@ -932,6 +764,7 @@
})
},
optaskRowClick(row, column) {
+ this.WorkOrder = row
this.palletTransportsOptaskData.forEach((item) => {
if (row.id !== item.id) {
item.commonChecked = false
@@ -951,57 +784,59 @@
}
</script>
<style scoped>
-.pallet-transports-material-table >>> .el-table__header th {
+.pallet-transports-material-table>>>.el-table__header th {
color: #666666;
}
-.pallet-transports-material-table >>> th {
+.pallet-transports-material-table>>>th {
padding: 3px 0px;
height: 31px;
}
-.pallet-transports-material-table >>> td {
+
+.pallet-transports-material-table>>>td {
padding: 1px 0 0 0;
}
-.pallet-transports-detail-table >>> .el-table__header th {
+.pallet-transports-detail-table>>>.el-table__header th {
color: #666666;
}
-.pallet-transports-detail-table >>> th {
+.pallet-transports-detail-table>>>th {
padding: 3px 0px;
height: 31px;
}
-.pallet-transports-detail-table >>> td {
+
+.pallet-transports-detail-table>>>td {
padding: 1px 0 0 0;
}
-.pallet-transports-optask-table >>> .el-table__header th {
+.pallet-transports-optask-table>>>.el-table__header th {
color: #666666;
}
-.pallet-transports-optask-table >>> th {
+.pallet-transports-optask-table>>>th {
padding: 3px 0px;
height: 31px;
}
-.pallet-transports-optask-table >>> td {
+
+.pallet-transports-optask-table>>>td {
padding: 1px 0 0 0;
}
-.optask-table-single-checkbox
- >>> .el-checkbox__input.is-disabled.is-checked
- .el-checkbox__inner {
+
+.optask-table-single-checkbox>>>.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
background-color: #006eff;
border-color: #006eff;
}
-.optask-table-single-checkbox
- >>> .el-checkbox__input.is-disabled
- .el-checkbox__inner {
+
+.optask-table-single-checkbox>>>.el-checkbox__input.is-disabled .el-checkbox__inner {
background-color: #ffffff;
cursor: pointer;
}
-.optask-table-single-checkbox >>> .el-checkbox__inner::after {
+
+.optask-table-single-checkbox>>>.el-checkbox__inner::after {
border: 1px solid #fff !important;
border-left: 0 !important;
border-top: 0 !important;
cursor: pointer !important;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3