From 6e367e4dc24da9085fc93556ee3a778119adebd9 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 九月 2023 12:46:22 +0800
Subject: [PATCH] modified: src/components/view/standard-table/material.vue new file: src/components/view/standard-table/target.vue modified: src/components/view/standard-table/technology.vue modified: src/components/view/standard.vue
---
src/components/view/standard.vue | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 2d72360..d040ac1 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>
@@ -55,17 +55,13 @@
<div class="contentTable" v-if="this.typeselect == 0">
<technology :tableType="tableType" :tableData="tableData"></technology>
</div>
- <div v-if="this.typeselect == 1">鎶�鏈寚鏍�</div>
+ <div v-if="this.typeselect == 1">
+ <target :tableType="tableType" :tableData="tableData"></target>
+ </div>
<div v-if="this.typeselect == 2">
<material :tableType="tableType" :tableData="tableData"></material>
</div>
<div v-if="this.typeselect == 3">鐢熶骇宸ヨ壓</div>
- <!-- <div class="table">
- <technology v-if="tableData.length !== 0" :tableType="tableType" :tableData="tableData"></technology>
- </div> -->
- <!-- <div class="table">
- <technology v-if="tableData.length !== 0" :tableType="tableType" :tableData="tableData"></technology>
- </div> -->
</div>
</div>
@@ -87,9 +83,9 @@
<script>
import technology from "./standard-table/technology.vue"
import material from "./standard-table/material.vue"
+import target from "./standard-table/target.vue"
export default {
- components: { technology,material },
-
+ components: { technology,material,target },
data() {
return {
// BOM鏍戞暟鎹粨鏋�
@@ -119,8 +115,8 @@
// }
// },
mounted() {
+ this.tableType=0
this.selectMaterialTree()
- // this.selectAll()
this.selectVersion()
},
methods: {
@@ -155,7 +151,6 @@
TYPE(val) {//绫诲瀷.鏁版嵁
console.log(val);
this.typeselect = val
-
// console.log(this.typeselect);
this.selectVersion()
},
@@ -163,8 +158,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 +169,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() {
@@ -187,11 +187,18 @@
}
}).then(res => {
let arr = res.data;
- for(var i=0;i<arr.length;i++){
- arr[i].id = "0" + i;
- }
+ this.formatData(arr)
this.tableData = arr;
})
+ },
+ formatData(data){
+ let arr = data;
+ for(var i=0;i<arr.length;i++){
+ arr[i].rowId = Math.random();
+ if(arr[i].children != undefined){
+ this.formatData(arr[i].children);
+ }
+ }
},
verevent(val) {
console.log(val);
@@ -205,7 +212,7 @@
},
//浜旂骇鏍�
selectMaterialTree() {
- this.$axios.get(this.$api.url.selectTreeByMaterial).then(res => {
+ this.$axios.get(this.$api.url.selectTreeByMaterial).then( res => {
this.list = res.data
this.list.forEach((el, idx, arr) => {
if (idx == 0) {
--
Gitblit v1.9.3