From 4beefba67c39fc863b849e312b86d8f51a89005f Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 08 九月 2023 17:15:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/mbom.vue | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/components/view/mbom.vue b/src/components/view/mbom.vue
index 155fb78..570c088 100644
--- a/src/components/view/mbom.vue
+++ b/src/components/view/mbom.vue
@@ -32,7 +32,7 @@
<el-form-item label="宸ュ簭">
<template>
<el-select v-model="search.work"
- placeholder="璇烽�夋嫨绫诲瀷"
+ placeholder="璇烽�夋嫨"
allow-create
filterable
@change="workevent"
@@ -141,11 +141,11 @@
:props="{children: 'children',label: 'name'}"
node-key="id" default-expand-all @node-click="handleNodeClick" >
<div class="custom-tree-node" slot-scope="{ node, data }">
- <span><i :class="`node_i ${data.code != '[3]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
+ <span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
{{data.code}} {{ data.name }}</span>
- <el-button type="text" size="mini" @click.stop="remove(node, data)">
+ <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
<i class="el-icon-delete"></i>
- </el-button>
+ </el-button> -->
</div>
</el-tree>
</div>
@@ -181,7 +181,10 @@
export default {
data() {
return {
- search:{},
+ search:{
+ type: 0,
+ technology: null
+ },
list:[],
process:{},
// handleClose:[],
@@ -196,12 +199,6 @@
specifications:'',
unit:'',
}],
- search:{
- type:'',
- work:'',
- craft:'',
-
- },
addsearch:{},
upData:{},
form:{},
@@ -216,6 +213,22 @@
this.selectAllMbom()
},
methods:{
+ selectDataList() {
+ this.list.forEach(a => {
+ a.code = '[1]'
+ if (a.children != undefined) {
+ a.children.forEach(b => {
+ b.code = '[2]'
+ if (b.children != undefined) {
+ b.children.forEach(c => {
+ c.code = '[3]'
+ })
+ }
+ })
+ }
+ })
+ this.upIndex++
+ },
workevent(val){
console.log(val);
let idx = this.process.findIndex(el => el.name === val)
@@ -278,6 +291,7 @@
}).then(res => {
this.list = res.data;
console.log(this.list);
+ this.selectDataList()
}, {
headers: {
"Content-Type": "application/json"
--
Gitblit v1.9.3