From 901d81f1c56281bab87044d2ff562d8ed8601efa Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 11 三月 2024 09:25:17 +0800
Subject: [PATCH] 完成包装核对功能
---
src/views/product/producttraceability/index.vue | 128 +++++++++++++++++++++++++++---------------
1 files changed, 81 insertions(+), 47 deletions(-)
diff --git a/src/views/product/producttraceability/index.vue b/src/views/product/producttraceability/index.vue
index e526c63..9ba6bc5 100644
--- a/src/views/product/producttraceability/index.vue
+++ b/src/views/product/producttraceability/index.vue
@@ -2,25 +2,35 @@
<div class="product-traceability-div">
<div class="product-traceability-hearder-div">
<div style="width: 600px;margin-left:3px;">
- <tRemoteSelect
- v-model="systemNo"
- :columns="partColumn"
- :data="partList"
- :formatter="labelFormatter"
- :selectLoading="selectLoading"
- :valueColumn="valueColumn"
- @selectChange="changePart()"
- @remoteSearch="queryPart"
- ></tRemoteSelect>
+ <el-row :gutter="10">
+ <el-col :span="16">
+ <tRemoteSelect
+ v-model="systemNo"
+ :columns="partColumn"
+ :data="partList"
+ :formatter="labelFormatter"
+ :selectLoading="selectLoading"
+ :valueColumn="valueColumn"
+ @selectChange="queryBatchNoData"
+ @remoteSearch="queryPart"
+ ></tRemoteSelect>
+ </el-col>
+ <el-col :span="8">
+ <el-select @change="changePart" v-model="selBatchNo" class="lmes-select" placeholder="璇烽�夋嫨鎵规鍙�">
+ <el-option :label="item" :value="item" :key="index" v-for="(item,index) in selBatchNoList"></el-option>
+ </el-select>
+ </el-col>
+ </el-row>
+
</div>
- <div style="margin-left:20px;">
+ <!-- <div style="margin-left:20px;">
<el-radio v-model="traceType" label="posite" @change="changeTraceType"
>鍙嶅悜杩芥函</el-radio
>
<el-radio v-model="traceType" label="negate" @change="changeTraceType"
>姝ｅ悜杩芥函</el-radio
>
- </div>
+ </div> -->
</div>
<div class="product-traceability-body-div">
<div class="product-traceability-relationship-div">
@@ -262,10 +272,10 @@
<div>宸ヤ綔绔欙細</div>
<div>鎶ュ伐鍗曞彿锛�</div>
<div>鎶ュ伐浜哄憳锛�</div>
- <div>浜у搧缂栧彿锛�</div>
+ <div>鎵规鍙凤細</div>
<div>闆朵欢鍙凤細</div>
<div>鍗曚綅锛�</div>
- <div>浜у嚭鏁伴噺锛�</div>
+
</div>
<div class="product-traceability-producttracking-val-div">
<div :title="currProductTracking.workstationName">
@@ -280,7 +290,6 @@
{{ currProductTracking.partNo }}
</div>
<div>{{ currProductTracking.unit }}</div>
- <div>{{ currProductTracking.productQty }}</div>
</div>
</div>
<div class="product-traceability-producttracking-item-div">
@@ -288,24 +297,26 @@
<div>鐝粍锛�</div>
<div>姹囨姤宸ュ簭锛�</div>
<div>姹囨姤鏃堕棿锛�</div>
- <div>鎵瑰彿锛�</div>
+ <!-- <div>鎵瑰彿锛�</div> -->
<div>闆朵欢鎻忚堪锛�</div>
<div>鐢熶骇鏃ユ湡锛�</div>
+ <div>浜у嚭鏁伴噺锛�</div>
</div>
<div class="product-traceability-producttracking-val-div">
<div>{{ currProductTracking.crewName }}</div>
<div>{{ currProductTracking.operationName }}</div>
<div>{{ currProductTracking.trackingTime }}</div>
- <div>{{ currProductTracking.systemNo }}</div>
+ <!-- <div>{{ currProductTracking.systemNo }}</div> -->
<div :title="currProductTracking.partName">
{{ currProductTracking.partName }}
</div>
<div>{{ currProductTracking.productDate }}</div>
+ <div>{{ currProductTracking.productQty }}</div>
</div>
</div>
</div>
</el-tab-pane>
- <el-tab-pane label="宸ユ淇℃伅" name="宸ユ淇℃伅">
+ <!-- <el-tab-pane label="宸ユ淇℃伅" name="宸ユ淇℃伅">
<div style="margin-top:10px;">
<el-table
ref="stepRecordTable"
@@ -330,7 +341,7 @@
</el-table-column>
</el-table>
</div>
- </el-tab-pane>
+ </el-tab-pane> -->
<el-tab-pane label="妫�娴嬩俊鎭�" name="妫�娴嬩俊鎭�">
<div style="margin-top:10px;">
<el-tabs type="card">
@@ -535,7 +546,7 @@
</el-table-column>
</el-table>
</el-tab-pane>
- <el-tab-pane label="闄勪欢">
+ <!-- <el-tab-pane label="闄勪欢">
<el-upload
ref="upload"
action="/mes/operationTask/upload"
@@ -545,7 +556,7 @@
:auto-upload="false"
list-type="picture"
></el-upload
- ></el-tab-pane>
+ ></el-tab-pane> -->
</el-tabs>
</div>
</div>
@@ -657,7 +668,7 @@
</el-tabs>
</div>
</el-tab-pane>
- <el-tab-pane label="妯″叿淇℃伅" name="妯″叿淇℃伅">
+ <!-- <el-tab-pane label="妯″叿淇℃伅" name="妯″叿淇℃伅">
<div style="margin-top:10px;">
<el-table
ref="mouldRecordTable"
@@ -762,7 +773,7 @@
</el-table-column>
</el-table>
</div>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
</div>
</div>
@@ -975,7 +986,8 @@
import {
queryByNo,
queryDiagram,
- queryOperationTask
+ queryOperationTask,
+ queryByCustomerOrderId
} from '@/api/product/producttraceability'
import {
getTemplateRecord,
@@ -1000,20 +1012,34 @@
},
selectLoading: false,
systemNo: null,
+ selBatchNo: null,
+ selBatchNoList: [],
selectedProductSystemNo: null,
- valueColumn: 'systemNo',
+ valueColumn: 'customerOrderId',
partColumn: [
{
- prop: 'batchNo',
- label: '鎵规鍙�'
+ prop: 'customerOrderNo',
+ label: '閿�鍞鍗曞彿'
},
{
- prop: 'systemNo',
- label: '绯荤粺鍙�'
+ prop: 'entityName',
+ label: '椤圭洰鍚嶇О'
},
{
- prop: 'partName',
- label: '闆朵欢鍚嶇О'
+ prop: 'partNo',
+ label: '浜у搧缂栧彿'
+ },
+ {
+ prop: 'productName',
+ label: '浜у搧鍚嶇О'
+ },
+ {
+ prop: 'specs',
+ label: '浜у搧鍨嬪彿'
+ },
+ {
+ prop: 'productType',
+ label: '浜у搧绫诲瀷'
}
],
partList: [],
@@ -1112,6 +1138,16 @@
this.resize()
},
methods: {
+ queryBatchNoData(){
+ this.selBatchNo = null
+ queryByCustomerOrderId({customerOrderId : this.systemNo}).then(res=>{
+ if(res.status===200){
+ this.selBatchNoList = res.data.data
+ }
+ }).catch(error=>{
+ console.error(error)
+ })
+ },
// 鍔犺浇娴忚鍣ㄧ獥鍙ｅ彉鍖栬嚜閫傚簲
resize() {
window.addEventListener('resize', () => {
@@ -1182,14 +1218,14 @@
const part = this.partList.find((item) => ele.systemNo === item.systemNo)
if (part !== undefined) {
partLabel =
- '绯荤粺鍙凤細' +
- part.systemNo +
+ '閿�鍞鍗曞彿锛�' +
+ part.customerOrderNo +
' ' +
- '闆朵欢鍚嶇О锛�' +
- part.partName +
+ '浜у搧鍚嶇О锛�' +
+ part.productName +
' ' +
- '鎵规鍙凤細' +
- part.batchNo
+ '浜у搧缂栧彿锛�' +
+ part.partNo
}
return partLabel
},
@@ -1214,10 +1250,12 @@
} else {
this.partList = []
}
+ this.selBatchNo = null
+ this.selBatchNoList = []
},
changePart() {
- if (this.systemNo != null && this.systemNo !== '') {
- const query = { systemNo: this.systemNo, traceType: this.traceType }
+ if (this.selBatchNo != null && this.selBatchNo !== '') {
+ const query = { systemNo: this.selBatchNo, traceType: this.traceType }
queryDiagram(query)
.then((response) => {
var data = response.data
@@ -1227,15 +1265,15 @@
const hasOutNode = data.data.linkDataArray.find((ele) => {
return ele.from === item.key
})
- item.batchNo = 'SN鍙�:' + item.batchNo
+ item.batchNo = '鎵规鍙�:' + item.batchNo
item.quantity =
'鎶曞叆鏁伴噺:' +
(hasOutNode ? item.quantity : 0) +
' ' +
item.unit
- item.ifsBatchNo =
- 'IFS鎵规鍙�:' +
- (item.ifsBatchNo == null ? '' : item.ifsBatchNo)
+ // item.ifsBatchNo =
+ // 'IFS鎵规鍙�:' +
+ // (item.ifsBatchNo == null ? '' : item.ifsBatchNo)
})
this.modelData = {
nodeDataArray: data.data.nodeDataArray,
@@ -1262,7 +1300,6 @@
_that.selectedProductSystemNo = nodeData.key.split('_')[0]
// const query = { systemNo: 'XT000131' }
const query = { systemNo: nodeData.key.split('_')[0] }
- console.log(query)
queryOperationTask(query)
.then((response) => {
var data = response.data
@@ -1356,7 +1393,6 @@
_that.paramTabs = []
} else {
// 宸ユ淇℃伅
- console.log('nodeData', nodeData.batchNo)
_that.getStepRecords({
id: _that.currOperateTask.id,
sn: nodeData.batchNo.split('SN鍙�:')[1]
@@ -1384,7 +1420,6 @@
})
}
})
- console.log(param.diagram.selection)
},
// 鏍规嵁宸ュ崟id锛屾煡璇㈠搴旂殑宸ヨ壓鍙傛暟淇℃伅
queryTechnologyInfo(taskId) {
@@ -1570,7 +1605,6 @@
},
// 鍒囨崲杩芥函妯″紡
changeTraceType() {
- console.log('traceType', this.traceType)
this.changePart()
},
paramsTableHeaderStyle({ row, column, rowIndex, columnIndex }) {
--
Gitblit v1.9.3