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/product/workbench/feed-form.vue | 79 ++++++++++++++++++++++++++++-----------
1 files changed, 57 insertions(+), 22 deletions(-)
diff --git a/src/views/product/workbench/feed-form.vue b/src/views/product/workbench/feed-form.vue
index 95816f1..484bf96 100644
--- a/src/views/product/workbench/feed-form.vue
+++ b/src/views/product/workbench/feed-form.vue
@@ -1,6 +1,7 @@
<template>
<el-dialog
- width="40%"
+ width="60%"
+ top="5vh"
title="鎶曟枡"
:visible.sync="innerVisible"
append-to-body
@@ -15,17 +16,20 @@
:key="tableKey"
:data="dataList"
border
- style="width: 100%;"
+ height="400"
+ style="width: 100%;overflow-y: scroll;"
@cell-dblclick="dblhandleCurrentChange"
show-summary
:span-method="objectSpanMethod"
:summary-method="getSummaries"
>
+ <el-table-column header-align="center" align="center" type="index" label="搴忓彿"></el-table-column>
<el-table-column
prop="partNo"
header-align="center"
align="center"
label="闆朵欢缂栧彿"
+ show-overflow-tooltip
>
</el-table-column>
<el-table-column
@@ -33,22 +37,24 @@
header-align="center"
align="center"
label="闆朵欢"
+ show-overflow-tooltip
>
</el-table-column>
<el-table-column
- prop="partBatchNo"
+ prop="ifsBatchNo"
header-align="center"
align="center"
- label="闆朵欢鎵瑰彿"
+ label="鎵瑰彿"
+ show-overflow-tooltip
>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
prop="specs"
header-align="center"
align="center"
label="瑙勬牸鍨嬪彿"
>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
prop="suppliedQuantity"
header-align="center"
@@ -72,7 +78,13 @@
header-align="center"
align="center"
label="鍗曚綅"
+ show-overflow-tooltip
>
+ </el-table-column>
+ <el-table-column prop="menu" label="鎿嶄綔" header-align="center" align="center">
+ <template scope="scope">
+ <el-button type="text" icon="el-icon-circle-close" @click="cancelFeed(scope.$index,scope.row)">鍙栨秷</el-button>
+ </template>
</el-table-column>
</el-table>
</div>
@@ -142,6 +154,12 @@
password: null
}
},
+ beforeUpdate(){
+ this.$nextTick(()=>{
+ this.objectSpanMethod()
+ this.$refs.table.doLayout()
+ })
+ },
directives: {
focus: {
inserted: function(el, option) {
@@ -162,6 +180,10 @@
}
},
methods: {
+ //鎶曞叆鍙栨秷鎸夐挳
+ cancelFeed(index,row){
+ this.dataList.splice(index,1)
+ },
confirmData() {
if (this.password != null) {
checkSubmitPassword({ password: this.password }).then((response) => {
@@ -197,22 +219,20 @@
pullFeed() {
var partNoList = []
var partNoLists
- console.log('this.dataList', this.dataList)
for (var i = 0; i < this.dataList.length; i++) {
partNoLists = this.dataList[i].partNo
partNoList.push(partNoLists)
}
getCheckRawPart(partNoList).then((response) => {
- console.log(response)
if (response.data.code === 0) {
// 闇�瑕佸瘑鐮佺‘璁ゆ儏鍐�
- if (response.data.data.success === false) {
- this.messages = response.data.data.message
- this.onnerVisible = true
- } else {
+ //if (response.data.data.success === false) {
+ // this.messages = response.data.data.message
+ // this.onnerVisible = true
+ //} else {
// 涓嶉渶瑕佸瘑鐮� 鐩存帴鎶曟枡
this.saveFeed()
- }
+ //}
}
})
},
@@ -243,7 +263,15 @@
partBatchNo: this.dataList[i].partBatchNo,
systemNo: this.dataList[i].systemNo,
partName: this.dataList[i].partName,
- unit: this.dataList[i].unit ? this.dataList[i].unit : ''
+ unit: this.dataList[i].unit ? this.dataList[i].unit : '',
+ partNo: this.dataList[i].partNo,
+ ifsBatchNo: this.dataList[i].ifsBatchNo,
+ ifsWdr: this.dataList[i].ifsWdr,
+ locationNo: this.dataList[i].locationNo,
+ serialNo:this.dataList[i].serialNo,
+ engChgLevel:this.dataList[i].engChgLevel,
+ configurationId:this.dataList[i].configurationId,
+ activitySeq:this.dataList[i].activitySeq
}
feeds.push(feed)
}
@@ -279,16 +307,16 @@
return reg.test(value)
},
objectSpanMethod() {
- setTimeout(() => {
+ this.$nextTick(()=>{
if (this.$refs.table.$el) {
const current = this.$refs.table.$el
.querySelector('.el-table__footer-wrapper')
.querySelector('.el-table__footer')
const cell = current.rows[0].cells
// cell[1].style.display = 'none'
- cell[0].colSpan = '4'
+ cell[0].colSpan = '6'
}
- }, 50)
+ })
},
getSummaries(param) {
const { columns, data } = param
@@ -318,12 +346,19 @@
},
watch: {
currshowlist() {
- this.innerVisible = this.currshowlist
- this.password = null
- if (this.currshowlist) {
- this.$nextTick(() => {})
+ const _than = this
+ _than.innerVisible = _than.currshowlist
+ _than.password = null
+ if (!_than.currshowlist) {
+ _than.$nextTick(() => {
+ })
}
- }
+ },
+ },
+ created(){
+ this.$nextTick(()=>{
+ this.objectSpanMethod()
+ })
},
mounted() {}
}
--
Gitblit v1.9.3