From aae958d472f1880c5069c0870cfdfa4358168c22 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 24 十一月 2023 11:04:04 +0800
Subject: [PATCH] modified: src/api/warehouse/pallettransports.js modified: src/views/warehouse/pallettransports/detail-ifslocation-form.vue modified: src/views/warehouse/pallettransports/ifslocation-form.vue modified: src/views/warehouse/pallettransports/ifsstock-form.vue modified: src/views/warehouse/pallettransports/index.vue modified: src/views/warehouse/pallettransports/detail-ifslocation-form.vue modified: src/views/warehouse/pallettransports/ifslocation-form.vue modified: src/views/warehouse/pallettransports/index.vue
---
src/views/warehouse/pallettransports/detail-ifslocation-form.vue | 7
src/views/warehouse/pallettransports/ifsstock-form.vue | 144 ++++--------
src/views/warehouse/pallettransports/index.vue | 409 +++++++++----------------------------
src/views/warehouse/pallettransports/ifslocation-form.vue | 11
src/api/warehouse/pallettransports.js | 40 +++
5 files changed, 198 insertions(+), 413 deletions(-)
diff --git a/src/api/warehouse/pallettransports.js b/src/api/warehouse/pallettransports.js
index 79dc4b4..c2c2b20 100644
--- a/src/api/warehouse/pallettransports.js
+++ b/src/api/warehouse/pallettransports.js
@@ -46,6 +46,30 @@
})
}
+export function getPalletTransportsAllDetailDataApi(query) {
+ return request({
+ url: '/mes/palletTransportsMaterial/detail/click',
+ method: 'get',
+ params: query
+ })
+}
+
+export function palletTransportsMaterialFetchListCopy(query) {
+ return request({
+ url: '/mes/palletTransportsMaterial/page/copy',
+ method: 'get',
+ params: query
+ })
+}
+
+export function palletTransportsMaterialListClick(query) {
+ return request({
+ url: '/mes/palletTransportsMaterial/page/click',
+ method: 'get',
+ params: query
+ })
+}
+
export function addPalletTransportsMaterial(obj) {
return request({
url: '/mes/palletTransportsMaterial',
@@ -56,6 +80,14 @@
export function putPalletTransportsMaterial(obj) {
return request({
url: '/mes/palletTransportsMaterial',
+ method: 'put',
+ data: obj
+ })
+}
+
+export function putPalletTransportsMaterialCopy(obj) {
+ return request({
+ url: '/mes/palletTransportsMaterial/update',
method: 'put',
data: obj
})
@@ -115,6 +147,14 @@
})
}
+export function updateBatchPalletTransportsCopy(obj) {
+ return request({
+ url: '/mes/palletTransportsMaterial/updateBatchPalletTransportsCopy',
+ method: 'put',
+ data: obj
+ })
+}
+
export function updateBatchPalletTransportsDetail(obj) {
return request({
url: '/mes/palletTransportsDetail/updateBatch',
diff --git a/src/views/warehouse/pallettransports/detail-ifslocation-form.vue b/src/views/warehouse/pallettransports/detail-ifslocation-form.vue
index fa59ea8..ebdb511 100644
--- a/src/views/warehouse/pallettransports/detail-ifslocation-form.vue
+++ b/src/views/warehouse/pallettransports/detail-ifslocation-form.vue
@@ -92,7 +92,7 @@
</el-dialog>
</template>
<script>
-import { getIfsLocationByGroup } from '@/api/warehouse/location'
+import { getIfsLocationByGroupCopyAll } from '@/api/warehouse/location'
import { updateBatchPalletTransportsDetail } from '@/api/warehouse/pallettransports'
export default {
components: {},
@@ -124,12 +124,13 @@
// 鏌ヨifs搴撲綅鍒楄〃
queryLocation() {
this.ifsLocationData = []
- getIfsLocationByGroup({
+ getIfsLocationByGroupCopyAll({
locationNo: this.dataForm.locationNo,
locationDesc: this.dataForm.locationDesc
}).then((response) => {
if (response.data.code === 0) {
- const _data = response.data.data
+ const _data = response.data.data.LIST_INFO
+ console.log(`output->_data`,_data)
this.ifsLocationData = _data.map((item, index) => {
return {
id: index + 1,
diff --git a/src/views/warehouse/pallettransports/ifslocation-form.vue b/src/views/warehouse/pallettransports/ifslocation-form.vue
index 8e65546..5bc0f5f 100644
--- a/src/views/warehouse/pallettransports/ifslocation-form.vue
+++ b/src/views/warehouse/pallettransports/ifslocation-form.vue
@@ -92,7 +92,7 @@
</el-dialog>
</template>
<script>
-import { getIfsLocationByGroup } from '@/api/warehouse/location'
+import { getIfsLocationByGroupCopyAll } from '@/api/warehouse/location'
import { updateBatchPalletTransportsMaterial } from '@/api/warehouse/pallettransports'
export default {
components: {},
@@ -113,8 +113,8 @@
innerVisible: false,
isSubmit: false,
dataForm: {
- locationNo: null,
- locationDesc: null
+ locationNo: '',
+ locationDesc: ''
},
ifsLocationData: [],
currLocationRow: null
@@ -124,12 +124,12 @@
// 鏌ヨifs搴撲綅鍒楄〃
queryLocation() {
this.ifsLocationData = []
- getIfsLocationByGroup({
+ getIfsLocationByGroupCopyAll({
locationNo: this.dataForm.locationNo,
locationDesc: this.dataForm.locationDesc
}).then((response) => {
if (response.data.code === 0) {
- const _data = response.data.data
+ const _data = response.data.data.LIST_INFO
this.ifsLocationData = _data.map((item, index) => {
return {
id: index + 1,
@@ -165,6 +165,7 @@
saveSelectRow() {
this.isSubmit = true
const transportsMaterials = []
+ console.log(`output->this.transportsList`,this.transportsList)
this.transportsList.forEach((item) => {
transportsMaterials.push({
id: item.id,
diff --git a/src/views/warehouse/pallettransports/ifsstock-form.vue b/src/views/warehouse/pallettransports/ifsstock-form.vue
index 9e8d42a..39cb352 100644
--- a/src/views/warehouse/pallettransports/ifsstock-form.vue
+++ b/src/views/warehouse/pallettransports/ifsstock-form.vue
@@ -1,93 +1,34 @@
<template>
- <el-dialog
- width="65%"
- title="IFS搴撳瓨鐗╂枡"
- top="5vh"
- :visible.sync="innerVisible"
- append-to-body
- @close="$emit('update:currshowlist', false)"
- :show="currshowlist"
- class="part-dialog"
- >
+ <el-dialog width="65%" title="IFS搴撳瓨鐗╂枡" top="5vh" :visible.sync="innerVisible" append-to-body
+ @close="$emit('update:currshowlist', false)" :show="currshowlist" class="part-dialog">
<div>
- <span>闇�姹傛暟閲忥細</span
- ><span style="color:Red;">{{
+ <span>闇�姹傛暟閲忥細</span><span style="color:Red;">{{
materialRow == null
- ? ''
- : materialRow.surplusQuantity - totalPlanMoveQuality
+ ? ''
+ : materialRow.surplusQuantity - totalPlanMoveQuality
}}</span>
</div>
- <el-table
- class="ifs-stock-table"
- :data="ifsStockData"
- style="width: 100%;"
- height="450px"
- border
- @selection-change="ifsStockSelectionChange"
- stripe
- ref="ifsStockTable"
- >
+ <el-table class="ifs-stock-table" :data="ifsStockData" style="width: 100%;" height="450px" border
+ @selection-change="ifsStockSelectionChange" stripe ref="ifsStockTables">
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column type="index" width="50" label="搴忓彿"> </el-table-column>
- <el-table-column
- prop="partNo"
- label="闆朵欢鍙�"
- align="center"
- show-overflow-tooltip
- >
+ <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="locationDesc"
- label="搴撲綅"
- align="center"
- show-overflow-tooltip
- >
+ <el-table-column prop="locationDesc" 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"
- show-overflow-tooltip
- >
+ <el-table-column prop="wdr" label="WDR" align="center" show-overflow-tooltip>
</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="available"
- label="鍙敤搴撳瓨鏁伴噺"
- align="center"
- show-overflow-tooltip
- >
+ <el-table-column prop="available" label="鍙敤搴撳瓨鏁伴噺" align="center" show-overflow-tooltip>
</el-table-column>
- <el-table-column
- prop="planMoveQuality"
- label="璁″垝绉诲簱鏁伴噺"
- align="center"
- >
+ <el-table-column prop="planMoveQuality" label="璁″垝绉诲簱鏁伴噺" align="center">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.planMoveQuality"
- @blur="blurChangeCallback(scope.row)"
- ></el-input>
+ <el-input v-model="scope.row.planMoveQuality" @blur="blurChangeCallback(scope.row)"></el-input>
</template>
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅" align="center">
@@ -97,12 +38,7 @@
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="innerVisible = false">鍙� 娑�</el-button>
- <el-button
- type="primary"
- :disabled="isSubmit"
- v-thinclick="`saveSelectRow`"
- >纭� 瀹�</el-button
- >
+ <el-button type="primary" v-thinclick="`saveSelectRow`">纭� 瀹�</el-button>
</div>
</el-dialog>
</template>
@@ -177,18 +113,18 @@
flagMsg =
flagMsg + '绗�' + (i + 1) + '琛岋紝璁″垝绉诲簱鏁伴噺鏈�澶氬叚浣嶅皬鏁帮紱'
} else {
- console.log(
- 'this.ifsStockData[i].planMoveQuality',
- this.ifsStockData[i].planMoveQuality
- )
- console.log(
- 'this.ifsStockData[i].available',
- this.ifsStockData[i].available
- )
- console.log(
- this.ifsStockData[i].planMoveQuality >
- this.ifsStockData[i].available
- )
+ // console.log(
+ // 'this.ifsStockData[i].planMoveQuality',
+ // this.ifsStockData[i].planMoveQuality
+ // )
+ // console.log(
+ // 'this.ifsStockData[i].available',
+ // this.ifsStockData[i].available
+ // )
+ // console.log(
+ // this.ifsStockData[i].planMoveQuality >
+ // this.ifsStockData[i].available
+ // )
if (
this.ifsStockData[i].planMoveQuality >
this.ifsStockData[i].available
@@ -262,9 +198,16 @@
partDesc: item.partDesc,
batchNo: item.batchNo,
wdr: item.wdr,
+ serialNo: item.serialNo,
+ engChgLevel: item.engChgLevel,
+ configurationId: item.configurationId,
+ activitySeq: item.activitySeq,
transferQuantity: item.planMoveQuality,
fromIfsLocationNo: item.locationNo,
transportsMaterialId: this.materialRow.id,
+ toIfsLocationNo: this.materialRow.toIfsLocationNo,
+ toIfsLocationName: this.materialRow.toIfsLocationName,
+ partId: this.materialRow.partId,
transportsId: this.transportsRow.id,
operationTaskId: item.optaskId,
operationTaskNo: item.optaskNo,
@@ -282,10 +225,10 @@
} else {
this.$message.error('娣诲姞绉诲簱鏄庣粏澶辫触')
}
- this.isSubmit = false
+ this.isSubmit = true
})
.catch(() => {
- this.isSubmit = false
+ this.isSubmit = true
})
} else {
this.$message.error('璇烽�夋嫨IFS搴撳瓨鐗╂枡')
@@ -295,7 +238,7 @@
this.isSubmit = false
}
},
- initData() {}
+ initData() { }
},
watch: {
currshowlist() {
@@ -318,14 +261,18 @@
id: index + 1,
partNo: item.PART_NO,
partDesc: item.PART_DESC,
- locationDesc: item.LOCATION_DESC,
+ locationDesc: item.LOCATION_NO,
locationNo: item.LOCATION_NO,
batchNo: item.LOT_BATCH_NO,
wdr: item.WAIV_DEV_REJ_NO,
available: Number(item.QTY_AVAILABLE),
unit: item.UNIT_MEAS_DESC,
engChgLevel: item.ENG_CHG_LEVEL,
+ serialNo: item.SERIAL_NO,
+ configurationId: item.CONFIGURATION_ID,
+ activitySeq: item.ACTIVITY_SEQ,
planMoveQuality: Number(item.QTY_AVAILABLE),
+ partId: this.materialRow.partId,
optaskNo: this.optask != null ? this.optask.optaskNo : null,
optaskId: this.optask != null ? this.optask.id : null
})
@@ -333,6 +280,7 @@
}
}
})
+ console.log(`output->this.ifsStockData`,this.ifsStockData)
})
}
}
@@ -343,9 +291,11 @@
.part-dialog .el-dialog__header {
padding: 10px 20px 10px;
}
+
.part-dialog .el-dialog__header .el-dialog__headerbtn {
top: 10px;
}
+
.part-dialog .el-dialog__body {
padding: 5px 20px;
}
diff --git a/src/views/warehouse/pallettransports/index.vue b/src/views/warehouse/pallettransports/index.vue
index ccce219..88d665f 100644
--- a/src/views/warehouse/pallettransports/index.vue
+++ b/src/views/warehouse/pallettransports/index.vue
@@ -3,321 +3,142 @@
<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">IFS鑷冲簱浣�</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 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-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="IFS鑷冲簱浣�" 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="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>
</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="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="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="operationTaskNo"
- label="宸ュ崟"
- align="center"
- show-overflow-tooltip
- >
+ <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="transferQuantity" 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 prop="fromIfsLocationNo" label="IFS浠庡簱浣�" align="center">
</el-table-column>
- <el-table-column
- prop="toIfsLocationNo"
- label="IFS鑷冲簱浣�"
- align="center"
- >
+ <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
- >
+ <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 +146,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 +157,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>
@@ -552,7 +343,7 @@
computed: {
...mapGetters(['permissions'])
},
- created() {},
+ created() { },
methods: {
// 宸ヨ壓绫诲瀷涓枃鏍煎紡鍖�
formatStateType(row, column, cellValue) {
@@ -666,7 +457,7 @@
closeOnClickModal: false,
type: 'warning'
})
- .then(function() {
+ .then(function () {
return delPalletTransportsObj(row.id)
})
.then((data) => {
@@ -675,7 +466,7 @@
this.palletTransportsMaterialData = []
this.palletTransportsDetailData = []
})
- .catch(() => {})
+ .catch(() => { })
},
// 鎵撳紑闆朵欢鍒楄〃
openPartDialog() {
@@ -951,57 +742,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