From 6e60bc042d1670013ecdc93e87618ac95cd3b332 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 12 九月 2023 17:52:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

---
 src/components/view/mbom.vue |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/components/view/mbom.vue b/src/components/view/mbom.vue
index fbfa699..cfe1abd 100644
--- a/src/components/view/mbom.vue
+++ b/src/components/view/mbom.vue
@@ -136,10 +136,15 @@
 		</div>
 		<div class="thing">
 			<div class="left">
-				<el-input v-model="search.technology" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable ></el-input>
-                <el-tree :data="list" ref="tree"  highlight-current
+				<el-input v-model="search.technology" @input="query" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�"  size="small" clearable ></el-input>
+                <el-tree 
+				:data="list" ref="tree"  
+				style="height: 500px;overflow-y: auto;" 
+				highlight-current
 				:props="{children: 'children',label: 'name'}" 
-				node-key="id" default-expand-all  @node-click="handleNodeClick" >
+				node-key="name" 
+				default-expand-all   
+				@node-click="handleNodeClick" >
 					<div class="custom-tree-node" slot-scope="{ node, data }">
 						<span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
 							{{data.code}} {{ data.name }}</span>
@@ -183,7 +188,7 @@
 			return {
               search:{
 					type: 0,
-					technology: null
+					technology: ''
 				},
               list:[],
 				process:{},
@@ -284,14 +289,22 @@
 				this.typeselect = val
 				this.selectAllleft()
 			},
+			query() {
+				this.selectAllleft()
+			},
 			//宸﹁竟
 			selectAllleft() {
 			this.$axios.get(this.$api.url.selectAllleft,{
-				params:{type:this.typeselect}
+				params:{type:this.typeselect,
+						message:this.search.technology
+				}
 			}).then(res => {
 				this.list = res.data;
 				console.log(this.list);
 				this.selectDataList()
+				this.$nextTick(() => {
+				this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // 榛樿閫変腑鑺傜偣绗竴涓�
+			})
 			}, {
 				headers: {
                 		"Content-Type": "application/json"
@@ -347,6 +360,14 @@
 				
 				this.dialogVisible = false
 			},
+			//delAllMbom 鎵归噺鍒犻櫎
+			delAllMbom() {
+                this.$axios.post(this.$api.url.delAllMbom,{
+                    ids:this.delete
+                }).then(res =>{
+                    this.selectAllMbom()
+                })
+            },
 			dels() {
 				this.selects.forEach(a => {
 					for (var b = 0; b < this.tableData.length; b++) {
@@ -356,6 +377,12 @@
 						}
 					}
 				})
+				let cc = this.selects.map(el => {
+					return el.id
+				})
+				this.delete = cc.join(',')
+				console.log(this.delete);
+				this.delAllMbom()
 				this.$message.success('鍒犻櫎瀹屾垚')
 			},
 			handleSelectionChange(val) {

--
Gitblit v1.9.3