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/product-record-form.vue | 32 ++++++--------------------------
1 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/src/views/product/workbench/product-record-form.vue b/src/views/product/workbench/product-record-form.vue
index 309af6e..c91b2e6 100644
--- a/src/views/product/workbench/product-record-form.vue
+++ b/src/views/product/workbench/product-record-form.vue
@@ -10,7 +10,7 @@
>
<div class="product-record-form-header">
<div>
- <span>鐢熶骇妯℃澘</span>
+ <span>璁板綍妯℃澘锛�</span>
<el-select
v-model="selectedTemplateId"
placeholder="鐢熶骇璁板綍妯℃澘"
@@ -63,7 +63,7 @@
</div>
</div>
</div>
- <div class="product-record-form-header">
+ <!-- <div class="product-record-form-header">
<div>
<span>鍒嗗壊妯℃澘</span>
<el-select
@@ -117,9 +117,9 @@
</el-input>
</div>
</div>
- </div>
+ </div> -->
<div class="table">
- <div class="table-sn">
+ <!-- <div class="table-sn">
<el-table :data="outputPartsList" :border="true">
<el-table-column label="搴忓彿" type="index"></el-table-column>
<el-table-column label="SN鍙�">
@@ -138,7 +138,7 @@
</template>
</el-table-column>
</el-table>
- </div>
+ </div> -->
<div class="table-product">
<el-table
ref="productRecordFormTable"
@@ -219,7 +219,7 @@
flex: 0.35;
}
.table-product {
- flex: 0.6;
+ flex: 1;
}
}
.product-record-form-table >>> .stripe-row {
@@ -395,7 +395,6 @@
endTime: this.endTime
// criteria: JSON.stringify(obj)
}).then((res) => {
- console.log(res.data.data.length)
if (res.data.data.length) {
const arr = []
arr.push(res.data.data[0])
@@ -407,7 +406,6 @@
this.scanArr.push(res.data.data[0].id)
this.idList = [...new Set(this.scanArr)]
this.part = null
- console.log(this.idList)
}
})
}
@@ -472,7 +470,6 @@
templateType: this.currTemplateType
})
).then((response) => {
- console.log(response)
this.paramTemplatesList = response.data.data.records
})
},
@@ -507,7 +504,6 @@
this.params = JSON.parse(JSON.stringify(list))
}
})
- console.log(this.selectedTemplateId)
},
getParamValuesi() {
this.params = []
@@ -524,7 +520,6 @@
this.params = JSON.parse(JSON.stringify(list))
}
})
- console.log(this.selectedTemplateIds)
},
saveProductRecord() {
this.saveDisabled = true
@@ -661,11 +656,8 @@
// this.part = val.systemNo + ' ' + val.outBatchNo
this.part = val.outBatchNo
this.productOutId = val.id
- console.log(this.part)
const forData = []
- console.log(val)
forData.push(val)
- console.log(forData)
for (let i = 0; i < forData.length; i++) {
if (!this.produceList.some((e) => e.id === forData[i].id))
this.produceList.push(forData[i])
@@ -692,8 +684,6 @@
}
}
// this.idList = [...new Set(arr)]
- console.log(this.outputPartsList)
- console.log(this.idList)
}
},
selectProductOutPuts(val) {
@@ -705,11 +695,8 @@
// this.part = val.systemNo + ' ' + val.outBatchNo
this.parts = val.partBatchNo
this.productOutId = val.id
- console.log(this.parts)
const forData = []
- console.log(val)
forData.push(val)
- console.log(forData)
for (let i = 0; i < forData.length; i++) {
if (!this.cutApartList.some((e) => e.id === forData[i].id))
this.cutApartList.push(forData[i])
@@ -735,12 +722,9 @@
}
}
// this.idLists = [...new Set(arr)]
- console.log(this.outputPartsList)
- console.log(this.idLists)
}
},
handleDelete(index, row) {
- console.log(index, row)
this.outputPartsList = this.outputPartsList.filter(
(item) => item.id !== row.id
)
@@ -749,8 +733,6 @@
this.produceList = this.produceList.filter((item) => item.id !== row.id)
this.cutApartList = this.cutApartList.filter((item) => item.id !== row.id)
- console.log(this.idList)
- console.log(this.outputPartsList)
},
// 鍥炶溅鎹㈣
nextFocus(index) {
@@ -774,9 +756,7 @@
this.paramObj.endTime = this.getNowFormatDate()
this.paramObjs.startTime = this.getNowFormatDate()
this.paramObjs.endTime = this.getNowFormatDate()
- console.log(123456)
} else if (this.createDateRangeArr.length !== 0) {
- console.log(123456)
this.paramObj.startTime = this.createDateRangeArr[0]
.split('-')
.join('')
--
Gitblit v1.9.3