From 7965761658b890fce87de832a1ae76cc82a3c33b Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 九月 2023 12:53:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/standard.vue | 189 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 153 insertions(+), 36 deletions(-)
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 0923393..4c54a89 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -7,20 +7,26 @@
<el-button type="primary" icon="el-icon-plus" style="background: #004EA2;"
@click="bomAddModelVisible = true">鏂板</el-button>
<el-button icon="el-icon-plus">鏂板鐗堟湰</el-button>
- <el-button icon="el-icon-edit-outline">淇敼</el-button>
- <el-button icon="el-icon-delete">鍒犻櫎</el-button>
+ <el-button @click="bomRightUp=true" icon="el-icon-edit-outline">淇敼</el-button>
+ <el-button @click="bomRightDl=true" icon="el-icon-delete">鍒犻櫎</el-button>
</el-col>
</el-row>
</div>
<div class="thing">
<div class="left">
- <el-input v-model="search" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable></el-input>
-
+ <el-row>
+ <el-col :span="21">
+ <el-input v-model="search" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable></el-input>
+ </el-col>
+ <el-col :span="2">
+ <el-button size="mini" icon="el-icon-plus" @click="bomLeftAdd=true"></el-button>
+ </el-col>
+ </el-row>
<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 != '[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>
@@ -52,36 +58,62 @@
璇�</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">
- 鎶�鏈寚鏍�
+ <target :tableType="tableType" :tableData="tableData"></target>
</div>
<div v-if="this.typeselect == 2">
- <material :tableType="tableType" :tableData="tableData"></material>
+ <bom :tableType="tableType" :tableData="tableData"></bom>
</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 v-if="this.typeselect == 3">鐢熶骇宸ヨ壓</div>
+
</div>
</div>
<div class="bom-add-model">
<el-dialog title="BOM鏂板" :visible.sync="bomAddModelVisible" width="30%">
- <el-form>
-
- </el-form>
+ <div>
+ <!-- 鐗╂枡娓呭崟鏂板 -->
+ <bomClickAdd v-if="typeselect===2"/>
+ </div>
<span slot="footer" class="dialog-footer">
<el-button @click="bomAddModelVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="bomAddModelVisible = false">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <!-- 宸︿晶鐐瑰嚮+鎸夐挳 -->
+ <el-dialog title="BOM鏂板" :visible.sync="bomLeftAdd" width="29%">
+ <el-form ref="leftAdd" :model="leftAdd">
+ <el-form-item label="绫诲瀷">
+ <el-cascader v-model="leftAdd.type" size="mini" style="width: 93%;" :options="formTypeOptions" :props="{ checkStrictly: true }" clearable></el-cascader>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="bomLeftAdd = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="bomLeftAdd = false">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <!-- 鍙充笂渚х偣鍑讳慨鏀规寜閽� -->
+ <el-dialog title="BOM淇敼" :visible.sync="bomRightUp" width="30%">
+ <el-form>
+ 淇敼
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="bomRightUp = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="bomRightUp = false">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <!-- 鍙充笂渚х偣鍑诲垹闄ゆ寜閽� -->
+ <el-dialog title="BOM鍒犻櫎" :visible.sync="bomRightDl" width="30%">
+ <el-form>
+ 鍒犻櫎
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="bomRightDl = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="bomRightDl = false">纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
@@ -91,8 +123,10 @@
<script>
import technology from "./standard-table/technology.vue"
import material from "./standard-table/material.vue"
+import bom from "./standard-table/bom.vue"
+import bomClickAdd from '@/components/view/standard-box/bomClickAdd'
export default {
- components: { technology,material },
+ components: { technology,material,bom,bomClickAdd },
data() {
return {
@@ -104,15 +138,25 @@
checkTreeNode: {},// 鐐瑰嚮閫変腑鏍戣妭鐐�
tableData: [],
bomAddModelVisible: false,// 鎺у埗bom鏂板妯℃�佹鏄惁鏄剧ず
- list: [],
+ bomLeftAdd: false,
+ bomRightUp: false,
+ bomRightDl: false,
+ formTypeOptions: null,
typeselect: 0,
returntree: {
id:28,
},
version: {},
+ leftAdd:{
+ type: null,
+ father: null,
+ standard: null,
+ name: null,
+ specifications: null
+ },
VER: {},
verdata: {},
- character: 0,
+ character: 0
}
},
// watch: {
@@ -124,11 +168,14 @@
// }
// },
mounted() {
+ this.tableType=0
this.selectMaterialTree()
- // this.selectAll()
this.selectVersion()
},
methods: {
+ startLeftAdd(){
+
+ },
selectDataList() {
this.list.forEach(a => {
a.code = '[1]'
@@ -158,18 +205,18 @@
},
TYPE(val) {//绫诲瀷.鏁版嵁
- console.log(val);
+ // console.log(val);
this.typeselect = val
// 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,
@@ -179,12 +226,15 @@
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() {
- console.log(this.$axios.get(this.$api.url.selectAll));
this.$axios.get(this.$api.url.selectAll, {
params: {
specificationsId: this.returntree.id,//tree鐨勭偣鍑诲弽棣�
@@ -192,14 +242,26 @@
version: this.character,//鐗堟湰
}
}).then(res => {
- console.log(res.data);
- this.tableData = res.data
+ let arr = res.data;
+ for(var i=0;i<arr.length;i++){
+ arr[i].id = "0" + i;
+ }
+ 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);
+ // console.log(val);
let cc = val.replace('v', '')
- console.log(cc);
+ // console.log(cc);
this.character = cc
this.selectAll()
// const { v, ...newObj } = val;
@@ -208,8 +270,8 @@
},
//浜旂骇鏍�
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,8 +281,34 @@
}
})
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) {
+ console.log(arr);
+ 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;
@@ -260,7 +348,33 @@
this.tableData = productList
break;
}
+ },
+ replaceProp(arr){
+ for (let index = 0; index < arr.length; index++) {
+ let element = arr[index];
+ element.label=element.name
+ element.value=element.name
+ // if()
+ }
}
+ },
+ watch:{
+ leftAdd: {
+ handler(newVal, oldVal) {
+ console.log("鏂扮殑",newVal);
+ console.log("鏃х殑",oldVal);
+ },
+ deep: true // 娣卞害鐩戝惉瀵硅薄鍐呴儴灞炴�х殑鍙樺寲锛屽彲閫夌殑
+ },
+ bomLeftAdd:{
+ handler(newval,oldVal){
+ if(newval){
+ let treeOptions = JSON.parse(JSON.stringify(this.list));
+ console.log(treeOptions);
+
+ }
+ }
+ }
}
}
</script>
@@ -269,6 +383,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