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/mbom.vue | 109 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 79 insertions(+), 30 deletions(-)
diff --git a/src/components/view/mbom.vue b/src/components/view/mbom.vue
index 985a9fd..fbfa699 100644
--- a/src/components/view/mbom.vue
+++ b/src/components/view/mbom.vue
@@ -32,7 +32,7 @@
<el-form-item label="宸ュ簭">
<template>
<el-select v-model="search.work"
- placeholder="璇烽�夋嫨绫诲瀷"
+ placeholder="璇烽�夋嫨"
allow-create
filterable
@change="workevent"
@@ -77,7 +77,7 @@
label="渚涘簲鍟嗗悕绉�"
width="180">
<template slot-scope="scope">
- <el-input v-model="scope.row.input" placeholder="" ></el-input>
+ <el-input v-model="scope.row.supplier" placeholder="" ></el-input>
</template>
</el-table-column>
<el-table-column
@@ -85,7 +85,7 @@
label="璐ㄩ噺杩芥函鍙�"
width="180">
<template slot-scope="scope">
- <el-input v-model="scope.row.input" placeholder="" ></el-input>
+ <el-input v-model="scope.row.qualityTraceability" placeholder="" ></el-input>
</template>
</el-table-column>
<el-table-column
@@ -99,7 +99,7 @@
prop="address"
label="瑙勬牸鍨嬪彿">
<template slot-scope="scope">
- <el-input v-model="scope.row.input" placeholder="" ></el-input>
+ <el-input v-model="scope.row.specifications" placeholder="" ></el-input>
</template>
</el-table-column>
<el-table-column
@@ -137,15 +137,15 @@
<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"
+ <el-tree :data="list" ref="tree" highlight-current
:props="{children: 'children',label: 'name'}"
node-key="id" default-expand-all @node-click="handleNodeClick" >
<div class="custom-tree-node" slot-scope="{ node, data }">
- <span><i :class="`node_i ${data.code != '[3]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
+ <span><i :class="`node_i ${data.code != '[2]'?'el-icon-folder-opened':'el-icon-tickets'}`"></i>
{{data.code}} {{ data.name }}</span>
- <el-button type="text" size="mini" @click.stop="remove(node, data)">
+ <!-- <el-button type="text" size="mini" @click.stop="remove(node, data)">
<i class="el-icon-delete"></i>
- </el-button>
+ </el-button> -->
</div>
</el-tree>
</div>
@@ -181,27 +181,29 @@
export default {
data() {
return {
- search:{},
+ search:{
+ type: 0,
+ technology: null
+ },
list:[],
process:{},
// handleClose:[],
checkTreeNode:{
- name:'鍓ョ紗'
+ id:2,
},
tableData:[],
- tableapi:[],
- search:{
- type:'',
- work:'',
- craft:'',
-
- },
+ tableapi:[{
+ supplier:'',
+ qualityTraceability:'',
+ name:'',
+ specifications:'',
+ unit:'',
+ }],
addsearch:{},
upData:{},
form:{},
dialogVisible:false,
typeselect:0,
- tableData: [],
input:'',
craftapi:[],
}
@@ -211,6 +213,22 @@
this.selectAllMbom()
},
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]'
+ })
+ }
+ })
+ }
+ })
+ this.upIndex++
+ },
workevent(val){
console.log(val);
let idx = this.process.findIndex(el => el.name === val)
@@ -229,14 +247,37 @@
}
})
},
- //鍒犻櫎
- material() {
- this.$axios.post(this.$api.url.material,{
- id:this.upData.id
- }, {
+ addMbom(data) {
+ this.$axios.post(this.$api.url.addMbom,data
+ // {
+ // name:this.tableapi.name,
+ // qualityTraceability:this.tableapi.qualityTraceability,
+ // specifications:this.tableapi.specifications,
+ // supplier:this.tableapi.supplier,
+ // techTemId:this.craftapi.id,
+ // unit:this.tableapi.unit,
+ // }
+ , {
headers: {
"Content-Type": "application/json"
}
+ }).then(res =>{
+ console.log(res);
+ this.$message.success('娣诲姞瀹屾垚')
+ this.selectAllMbom()
+ this.tableapi = [{}]
+ })
+ },
+ //鍒犻櫎
+ material(index) {
+ console.log(this.upData.id);
+ this.$axios.post(this.$api.url.material,{
+ id:this.upData.id
+ }).then(res =>{
+ this.$message.success(res.message)
+ this.tableData.splice(index,1)
+
+ // console.log(res);
})
},
TYpe(val) {
@@ -250,6 +291,7 @@
}).then(res => {
this.list = res.data;
console.log(this.list);
+ this.selectDataList()
}, {
headers: {
"Content-Type": "application/json"
@@ -262,6 +304,7 @@
params:{id:this.checkTreeNode.id}
}).then(res => {
this.tableData = res.data;
+ console.log(this.tableData);
}, {
headers: {
"Content-Type": "application/json"
@@ -285,17 +328,22 @@
this.chooseTechFath()
},
Addrow() {
- if (this.tableData == undefined) {
- this.tableData = new Array();
+ if (this.tableapi == undefined) {
+ this.tableapi = new Array();
}
let obj = [];
- this.tableData.push(obj);
+ this.tableapi.push(obj);
},
skipshow(){
console.log('666');
- const data = this.tableData.at(-1)
- console.log(data);
+ let data = this.tableapi.at(-1)
+ // this.addMbom()
+ data.techTemId = this.search.craft
+ // console.log(this.search.craft);
+ // console.log(data);
+
+ this.addMbom(data)
this.dialogVisible = false
},
@@ -315,9 +363,10 @@
},
deleteRow(index, rows) {
console.log(rows);
- this.tableData.splice(index,1)
+ // this.tableData.splice(index,1)
this.upData.id = rows.id
- this.material()
+ console.log(this.upData);
+ this.material(index)
},
}
--
Gitblit v1.9.3