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/ifsstock-form.vue | 144 +++++++++++++++--------------------------------
1 files changed, 47 insertions(+), 97 deletions(-)
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;
}
--
Gitblit v1.9.3