This commit is contained in:
‘937886381’
2024-02-23 16:02:55 +08:00
parent d3b87e4051
commit 05b513a862
5 changed files with 56 additions and 26 deletions

View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-01-30 10:53:32
* @LastEditTime: 2024-02-01 14:47:03
* @LastEditTime: 2024-02-23 15:16:35
* @LastEditors: zhp
* @Description:
-->
@@ -203,8 +203,11 @@ export default {
// 如果没找到这个
this.selectedEquipments.push(equipmentId);
console.log(this.selected.indexOf(equipmentId))
this.selected.forEach((ele,index) => {
if (ele.equipmentId === equipmentId ) {
console.log(equipmentId);
this.selected.forEach((ele, index) => {
console.log(ele);
if (ele.equipmentId === equipmentId) {
console.log(22222);
this.selected[index].children.push({ id: bomId })
}
})
@@ -214,11 +217,12 @@ export default {
// equMaterialBomId: bomId,
// });
// 强制更新'设备'一栏
this.refreshKey = Math.random();
this.refreshKey = Math.random();
console.log(this.selected)
// this.$emit('update', this.selected);
return;
} else {
console.log(selected);
console.log(selected)
this.selected.forEach((ele, index) => {
ele.children.forEach((e, i) => {
console.log(e)
@@ -228,10 +232,10 @@ export default {
})
})
}
console.log(this.selected)
// this.$emit('getData', this.dataForm)
// selectedItem && (selectedItem.equMaterialBomId = selected ? bomId : null);
// this.currentSelectedMaterialBomId = selected ? bomId : null;
console.log(this.selected)
},
// handleValueBomChange(equipmentId, bomId, selected) {

View File

@@ -154,7 +154,7 @@ export default {
this.urlOptions.getDataListURL(this.listQuery).then(res => {
this.tableData = res.data.list.map((item) => {
return {
datas: item.strList.toString(),
datas: item.strList ? item.strList.toString() : null,
nickName: item.nickName,
userName: item.userName,
userId: item.userId

View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-08-01 14:55:51
* @LastEditors: zhp
* @LastEditTime: 2024-02-20 08:46:05
* @LastEditTime: 2024-02-23 09:16:24
* @Description:
-->
<template>
@@ -31,6 +31,11 @@ import {
} from '@/api/quality/rawMaterialTraceability';
const tableProps = [
{
prop: 'orderName',
label: '订单名称',
},
{
prop: 'workOrderName',
label: '工单名称',
@@ -48,7 +53,7 @@ const tableProps = [
label: '包装条码',
},
{
prop: '',
prop: 'originalGlassLineName',
label: '原片产线',
},
{
@@ -57,7 +62,7 @@ const tableProps = [
filter: parseTime
},
{
prop: 'batch',
prop: 'deepProcessingLineName',
label: '深加工产线',
},
{
@@ -70,11 +75,11 @@ const tableProps = [
label: '深加工下片时间',
filter: parseTime
},
{
prop: 'scrapDetail',
label: '详情',
filter: parseTime
}
// {
// prop: 'scrapDetail',
// label: '详情',
// filter: parseTime
// }
];
export default {