From cb44cab30ca6b51d4488c66d7db911deecf4dbea Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期一, 11 九月 2023 09:35:53 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before --- src/components/view/standard.vue | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue index 2d72360..d799745 100644 --- a/src/components/view/standard.vue +++ b/src/components/view/standard.vue @@ -20,7 +20,7 @@ node-key="id" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current> <div class="custom-tree-node" slot-scope="{ node, data }"> <span><i :class="`node_i ${data.code != '[5]' ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i> - {{ data.name }}</span> + {{ data.code }}{{ data.name }}</span> <el-button type="text" size="mini" @click.stop="remove(node, data)"> <i class="el-icon-delete"></i> </el-button> @@ -119,8 +119,8 @@ // } // }, mounted() { + this.tableType=0 this.selectMaterialTree() - // this.selectAll() this.selectVersion() }, methods: { @@ -163,8 +163,8 @@ console.log(val); this.returntree = val }, - selectVersion() {//鐗堟湰 - this.$axios.get(this.$api.url.selectVersion, { + async selectVersion() {//鐗堟湰 + let v=await this.$axios.get(this.$api.url.selectVersion, { params: { specificationsId: this.returntree.id, type: this.typeselect, @@ -174,8 +174,13 @@ this.version = this.verdata.map(el => { return el = `v${el}` }) - console.log(this.verdata); + // console.log("鐗堟湰"); + return this.verdata[0] }) + this.character=v + this.VER="v"+v + console.log(this.character); + this.selectAll() }, //鍙充晶鏁版嵁 selectAll() { @@ -205,8 +210,8 @@ }, //浜旂骇鏍� selectMaterialTree() { - this.$axios.get(this.$api.url.selectTreeByMaterial).then(res => { - this.list = res.data + this.$axios.get(this.$api.url.selectTreeByMaterial).then( res => { + _that.list = res.data this.list.forEach((el, idx, arr) => { if (idx == 0) { arr[idx].name = '鎴愬搧' -- Gitblit v1.9.3