From e0ff382cd71d451190021e3ed12af99b9a965ee9 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 11 九月 2023 11:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/standard.vue | 192 +++++++++++++++++++++++++----------------------
1 files changed, 101 insertions(+), 91 deletions(-)
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 94c7173..0b372ee 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -16,11 +16,11 @@
<div class="left">
<el-input v-model="search" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable></el-input>
- <el-tree :data="list" ref="tree" :default-expand-all="false" :props="{ children: 'children', label: 'name' }"
+ <el-tree :data="list" ref="tree" default-expand-all :props="{ children: 'children', label: 'name' }"
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 != '[4]' ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
- {{ data.name }}</span>
+ <span><i :class="`node_i ${data.code != '[5]' ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
+ {{ data.code }}{{ data.name }}</span>
<el-button type="text" size="mini" @click.stop="remove(node, data)">
<i class="el-icon-delete"></i>
</el-button>
@@ -42,7 +42,7 @@
<span>{{ tableType == 1 ? '椤圭洰锛�' : '宸ヨ壓鍚嶇О锛�' }}</span>
<el-input v-model="searchName" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right: 24px;"
clearable></el-input>
- <span>{{ tableType == 1 ? '鐗堟湰锛�' : '宸ヨ壓鍚嶇О锛�' }}</span>
+ <span>{{ tableType == 1 ? '鐗堟湰锛�' : '鐗堟湰锛�' }}</span>
<el-select v-model="VER" @change="verevent" style="width: 280px;" placeholder="璇烽�夋嫨">
<el-option v-for="item in version" :key="item" :label="item" :value="item">
</el-option>
@@ -52,54 +52,15 @@
璇�</span></el-button>
</div>
- <!-- <div v-if="this.typeselect == 0">
- 宸ヨ壓璺嚎
+ <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">鎶�鏈寚鏍�</div>
<div v-if="this.typeselect == 2">
- 鐗╂枡娓呭崟
+ <bom :tableType="tableType" :tableData="tableData"></bom>
</div>
- <div v-if="this.typeselect == 3">
- 鐢熶骇宸ヨ壓
- </div> -->
-
- <!-- <div>
- <el-table :data="tableData" style="width: 100%;margin-bottom: 20px;" row-key="name" border
- @selection-change="handleSelectionChange" default-expand-all
- :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
- <el-table-column type="selection" width="55">
- </el-table-column>
- <el-table-column type="index" width="50" label="搴忓彿">
- </el-table-column>
- <el-table-column prop="name" label="宸ュ簭" sortable width="300px">
- <template slot-scope="scope">
- <el-tag>
- <div class="firstDiv" :style="`color: ${scope.row.children? '#16a7ff' : '#58c173'}`">
- {{ scope.row.children ? "01" : "02" }}
- </div>
- </el-tag>
- <span style="color: black">{{ scope.row.name }}</span>
-
- </template>
- </el-table-column>
- <el-table-column prop="" sortable label="宸ヨ壓鍚嶇О">
- </el-table-column>
- <el-table-column prop="" label="鎸囨爣鍚嶇О">
- </el-table-column>
- <el-table-column prop="" label="鍗曚綅">
- </el-table-column>
- <el-table-column prop="" label="鍐呮帶鍊�">
- </el-table-column>
- <el-table-column prop="unit" label="鏍囧噯鍊�">
- </el-table-column>
- </el-table>
- </div> -->
-
- <div class="table">
- <technology v-if="tableData.length !== 0" :tableType="tableType" :tableData="tableData"></technology>
- </div>
+ <div v-if="this.typeselect == 3">鐢熶骇宸ヨ壓</div>
+
</div>
</div>
@@ -120,8 +81,11 @@
<script>
import technology from "./standard-table/technology.vue"
+import material from "./standard-table/material.vue"
+import bom from "./standard-table/bom.vue"
export default {
- components: { technology },
+ components: { technology,material,bom },
+
data() {
return {
// BOM鏍戞暟鎹粨鏋�
@@ -132,7 +96,6 @@
checkTreeNode: {},// 鐐瑰嚮閫変腑鏍戣妭鐐�
tableData: [],
bomAddModelVisible: false,// 鎺у埗bom鏂板妯℃�佹鏄惁鏄剧ず
- list: [],
typeselect: 0,
returntree: {
id:28,
@@ -152,27 +115,52 @@
// }
// },
mounted() {
+ this.tableType=0
this.selectMaterialTree()
this.selectVersion()
- this.selectAll()
},
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]'
+ if (c.children != undefined) {
+ c.children.forEach(d => {
+ d.code = '[4]'
+ if (d.children != undefined) {
+ d.children.forEach(e => {
+ e.code = '[5]'
+ })
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+ })
+ },
handleSelectionChange() {
},
TYPE(val) {//绫诲瀷.鏁版嵁
- console.log(val);
+ // console.log(val);
this.typeselect = val
-
- // console.log(this.typeselect);
+
+ console.log(this.typeselect);
this.selectVersion()
},
handleNodeClick(val) {//鏍戠殑鍊�
- console.log(val);
+ // 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,
@@ -182,36 +170,44 @@
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
+ this.selectAll()
+ },
+ //鍙充晶鏁版嵁
+ selectAll() {
+ this.$axios.get(this.$api.url.selectAll, {
+ params: {
+ specificationsId: this.returntree.id,//tree鐨勭偣鍑诲弽棣�
+ type: this.typeselect,//绫诲瀷
+ version: this.character,//鐗堟湰
+ }
+ }).then(res => {
+ let arr = res.data;
+ console.log(arr);
+ for(var i=0;i<arr.length;i++){
+ arr[i].id = "0" + i;
+ }
+ this.tableData = arr;
})
},
verevent(val) {
- console.log(val);
+ // console.log(val);
let cc = val.replace('v', '')
- console.log(cc);
+ // console.log(cc);
this.character = cc
this.selectAll()
// const { v, ...newObj } = val;
// delete newObj.v
// console.log(newObj);
},
- //鍙充晶鏁版嵁
- selectAll() {
- console.log(this.$axios.get(this.$api.url.selectAll));
- this.$axios.get(this.$api.url.selectAll, {
- params: {
- specificationsId: this.returntree.id,
- type: this.typeselect,
- version: this.character,
- }
- }).then(res => {
- this.tableData = res.data
- })
- },
//浜旂骇鏍�
selectMaterialTree() {
- this.$axios.get(this.$api.url.selectTreeByMaterial).then(res => {
- this.list = res.data
+ this.$axios.get(this.$api.url.selectTreeByMaterial).then( res => {
+ this.list=res.data
this.list.forEach((el, idx, arr) => {
if (idx == 0) {
arr[idx].name = '鎴愬搧'
@@ -219,24 +215,35 @@
if (idx == 1) {
arr[idx].name = '鍗婃垚鍝�'
}
- el.children.forEach((newEl, newIdx, newArr) => {
- if (newIdx == 0) {
- newArr[newIdx].name = '姗¤兌杩炴帴鍣�'
- }
- if (newIdx == 1) {
- newArr[newIdx].name = '閲戝睘杩炴帴鍣�'
- }
- if (newIdx == 2) {
- newArr[newIdx].name = '婀挎彃鎷旂數杩炴帴鍣�'
- }
- if (newIdx == 3) {
- newArr[newIdx].name = '鍒嗘敮缁勪欢'
- }
- })
})
- console.log(this.list);
+ this.selectDataList()
+ // 榛樿绗竴涓簲绾ц妭鐐规悳绱紝鏂板閰嶇疆椤�
+ const treeOptions = JSON.parse(JSON.stringify(this.list));
+ this.getDefault(treeOptions, 0);
+ this.formTypeOptions = treeOptions;
+ this.$nextTick().then(() => {
+ const firstNode = document.querySelector(
+ ".el-tree-node .el-tree-node__children .el-tree-node .el-tree-node__children .el-tree-node .el-tree-node__children .el-tree-node .el-tree-node__children .el-tree-node"
+ );
+ try {
+ firstNode.click();
+ } catch (e) {
+ //TODO handle the exception
+ }
+ });
})
},
+ getDefault(arr, index) {
+ for (const item of arr) {
+ if (item.children && item.children.length > 0) {
+ // 鏈夊瓙鑺傜偣
+ this.getDefault(item.children, index + 1);
+ if (index === 2) {
+ item.children = null;
+ }
+ }
+ }
+ },
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
@@ -285,6 +292,9 @@
<style scoped>
.standard {}
+.standard .contentTable{
+}
+
.standard .title .el-button {
height: 32px;
border: 1px solid rgba(190, 190, 190, 0.44);
--
Gitblit v1.9.3