From 33fc3fbb08c598afbe31437b4be42ac46f8b212f Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期五, 23 二月 2024 18:44:45 +0800 Subject: [PATCH] 追溯搜索修改 --- src/views/product/producttraceability/index.vue | 90 ++++++++++++++++++++++++++++++--------------- 1 files changed, 60 insertions(+), 30 deletions(-) diff --git a/src/views/product/producttraceability/index.vue b/src/views/product/producttraceability/index.vue index e526c63..c24a617 100644 --- a/src/views/product/producttraceability/index.vue +++ b/src/views/product/producttraceability/index.vue @@ -2,16 +2,26 @@ <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 v-model="selBatchNo" class="lmes-select" placeholder="璇烽�夋嫨鎵规鍙�"> + <el-option :label="item" :key="index" v-for="(item,index) in selBatchNoList"></el-option> + </el-select> + </el-col> + </el-row> + </div> <div style="margin-left:20px;"> <el-radio v-model="traceType" label="posite" @change="changeTraceType" @@ -305,7 +315,7 @@ </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 +340,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"> @@ -975,7 +985,8 @@ import { queryByNo, queryDiagram, - queryOperationTask + queryOperationTask, + queryByCustomerOrderId } from '@/api/product/producttraceability' import { getTemplateRecord, @@ -1000,20 +1011,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 +1137,15 @@ this.resize() }, methods: { + queryBatchNoData(){ + queryByCustomerOrderId({customerOrderId : this.systemNo}).then(res=>{ + if(res.status===200){ + this.selBatchNoList = res.data.data + } + }).catch(error=>{ + console.error(error) + }) + }, // 鍔犺浇娴忚鍣ㄧ獥鍙e彉鍖栬嚜閫傚簲 resize() { window.addEventListener('resize', () => { @@ -1182,14 +1216,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 }, @@ -1262,7 +1296,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 +1389,6 @@ _that.paramTabs = [] } else { // 宸ユ淇℃伅 - console.log('nodeData', nodeData.batchNo) _that.getStepRecords({ id: _that.currOperateTask.id, sn: nodeData.batchNo.split('SN鍙�:')[1] @@ -1384,7 +1416,6 @@ }) } }) - console.log(param.diagram.selection) }, // 鏍规嵁宸ュ崟id锛屾煡璇㈠搴旂殑宸ヨ壓鍙傛暟淇℃伅 queryTechnologyInfo(taskId) { @@ -1570,7 +1601,6 @@ }, // 鍒囨崲杩芥函妯″紡 changeTraceType() { - console.log('traceType', this.traceType) this.changePart() }, paramsTableHeaderStyle({ row, column, rowIndex, columnIndex }) { -- Gitblit v1.9.3