From 41e0df8413624e6034c967f3afae30da59370879 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 十二月 2023 16:20:15 +0800
Subject: [PATCH] modified: src/components/verifition/Verify/VerifyPoints.vue modified: src/const/crud/admin/sys-public-param.js modified: src/page/full-screen/fullScreenPlus.vue modified: src/page/index/logo.vue modified: src/page/index/sidebar/sidebarItem.vue modified: src/page/login/index.vue modified: src/page/login/thirdpartylogin.vue modified: src/util/elAttr.js modified: src/views/accounting/unitworkfactor/unitworkfactor-form.vue modified: src/views/accounting/unitworkfactor/updateQuota-form.vue modified: src/views/basic/discmaintenance/discmaintenance-form.vue modified: src/views/basic/log/index.vue modified: src/views/basic/part/part-form.vue modified: src/views/basic/part/print-label-form.vue modified: src/views/basic/poc/index.vue modified: src/views/basic/tabletest/index.vue modified: src/views/basic/template/index.vue modified: src/views/basic/template/template-form.vue modified: src/views/basic/workstation/workstation-form.vue modified: src/views/common/custom-table.vue modified: src/views/common/documentDetail.vue modified: src/views/common/operationParamTemplate.vue modified: src/views/common/rawMaterial-part.vue modified: src/views/common/search-select.vue modified: src/views/common/ztt-table.vue modified: src/views/huawei/code19bind/list.vue modified: src/views/huawei/code19gen/form.vue modified: src/views/huawei/grossweightcode/list.vue modified: src/views/huawei/grossweightcode/task-secret-form.vue modified: src/views/oa/JiegouModal.vue modified: src/views/oa/PeizhiModal.vue modified: src/views/oa/technology-document-new.vue modified: src/views/oa/technology-document.vue modified: src/views/plan/customer/index.vue modified: src/views/plan/customerorder/confirm-pull-customerorder.vue modified: src/views/plan/customerorder/customerorder-config-history.vue modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/customerorder-return.vue modified: src/views/plan/customerorder/customerorder-ztt-table.vue modified: src/views/plan/customerorder/index.vue modified: src/views/plan/customerorder/other-customer-order-line.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue modified: src/views/plan/customerorder/schedule-table.vue modified: src/views/plan/manufacturingorder/auto-operationtask.vue modified: src/views/plan/manufacturingorder/customerorder.vue modified: src/views/plan/manufacturingorder/customize-param-template.vue modified: src/views/plan/manufacturingorder/order-operation-form.vue modified: src/views/plan/manufacturingorder/productorder-form.vue modified: src/views/plan/manufacturingorderapply/index.vue modified: src/views/plan/masterproductionschedule/auto-manufacturingorder.vue modified: src/views/plan/operationtask/gantt.vue modified: src/views/plan/operationtask/operationtask-form.vue modified: src/views/plan/operationtask/task-material.vue modified: src/views/plan/productionschedul/index.vue modified: src/views/plan/productionschedul/template-form.vue modified: src/views/plan/schedule/gantt.vue modified: src/views/plan/schedulelookover/ganttview.vue modified: src/views/plan/segmentmerge/index.vue modified: src/views/plan/segmentmerge/operate-dialog.vue modified: src/views/plan/segmentmerge/operation-technology-form.vue modified: src/views/product/dutyrecord/index.vue modified: src/views/product/producttraceability/index.vue modified: src/views/product/producttraceability/traceability-diagram.vue modified: src/views/product/workbench/batchproductout-form-new.vue modified: src/views/product/workbench/batchproductout-form.vue modified: src/views/product/workbench/feed-form.vue modified: src/views/product/workbench/feed-pane.vue modified: src/views/product/workbench/feed-tab.vue modified: src/views/product/workbench/handymantype.vue modified: src/views/product/workbench/index.vue modified: src/views/product/workbench/mould-pane.vue modified: src/views/product/workbench/operation-task-pane.vue modified: src/views/product/workbench/product-record-form.vue modified: src/views/product/workbench/productout-form-by-batch.vue modified: src/views/product/workbench/productout-form.vue modified: src/views/product/workbench/productrecord-tab.vue modified: src/views/product/workbench/producttracking-tab.vue modified: src/views/product/workbench/shift-productout-form.vue modified: src/views/product/workbench/splitTaskForm.vue modified: src/views/product/workbench/taskinfo-pane.vue modified: src/views/quality/Packaging_ledger/pack-from.vue modified: src/views/quality/apply/index.vue modified: src/views/quality/exception/exception.vue modified: src/views/quality/exception/index.vue modified: src/views/quality/finishedProductInspection/finishedProduct-form.vue modified: src/views/quality/finishedProductInspection/finishedProduct-print.vue modified: src/views/quality/finishedProductInspection/finishedProducter-print.vue modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/newReport/ReportForm.vue modified: src/views/quality/processInspect/index.vue modified: src/views/quality/processInspect/processInspect-form.vue modified: src/views/quality/processconfiguration/index.vue modified: src/views/quality/processconfiguration/table-form.vue modified: src/views/quality/rawMaterial/QrcodeReader.vue modified: src/views/quality/rawMaterial/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue modified: src/views/quality/report/index.vue modified: src/views/quality/standardbind/standardbind-form.vue modified: src/views/quality/statistics/rateChart.vue modified: src/views/quality/testitemlayout/index.vue modified: src/views/quality/testplan/testplan-form.vue modified: src/views/quality/unqualifiedprocess/examineApproveform.vue modified: src/views/quality/unqualifiedprocess/index.vue modified: src/views/quality/unqualifiedprocess/loaction-form.vue modified: src/views/quality/unqualifiedprocess/unqualifiedprocessform.vue modified: src/views/technology/completeproductstructure/completeproductstructure-form.vue modified: src/views/technology/document/checkStandardTable.vue modified: src/views/technology/document/document-form.vue modified: src/views/technology/document/extendsOperation.vue modified: src/views/technology/document/extendsTestStandard.vue modified: src/views/technology/document/extendsTestStandardParam.vue modified: src/views/technology/document/teststandard.vue modified: src/views/technology/structure/single-structure-form.vue modified: src/views/warehouse/changestock/index.vue modified: src/views/warehouse/check/check-detail.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/returnstock/ifslocation-form.vue modified: src/views/warehouse/returnstock/index.vue modified: src/views/warehouse/returnstock/returnstock-form.vue modified: src/views/warehouse/returnstock/stock-part.vue modified: src/views/warehouse/stock/print-label-form.vue modified: src/views/warehouse/stock/small-print-label-form.vue modified: src/views/warehouse/stock/small-warehousing-label-form.vue modified: src/views/warehouse/stock/stock-table.vue modified: src/views/warehouse/stock/warehousing-label-form.vue modified: src/views/zte/pkgidbind/index.vue
---
src/views/warehouse/pallettransports/ifsstock-form.vue | 131 +++++++++++--------------------------------
1 files changed, 34 insertions(+), 97 deletions(-)
diff --git a/src/views/warehouse/pallettransports/ifsstock-form.vue b/src/views/warehouse/pallettransports/ifsstock-form.vue
index 9e8d42a..7175e2a 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,6 @@
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
- )
if (
this.ifsStockData[i].planMoveQuality >
this.ifsStockData[i].available
@@ -262,9 +186,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 +213,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 +226,7 @@
this.isSubmit = false
}
},
- initData() {}
+ initData() { }
},
watch: {
currshowlist() {
@@ -318,14 +249,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
})
@@ -343,9 +278,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