From c0bc2331e9abb2ae003c8dc0ab4524d6101493a1 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 25 九月 2023 09:12:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/mbom.vue | 124 ++++++++++++++++++-----------------------
1 files changed, 55 insertions(+), 69 deletions(-)
diff --git a/src/components/view/mbom.vue b/src/components/view/mbom.vue
index b608179..88c3344 100644
--- a/src/components/view/mbom.vue
+++ b/src/components/view/mbom.vue
@@ -18,10 +18,7 @@
<el-form-item label="绫诲瀷:">
<el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨"
style="width: 224px;margin-right: 30px;">
- <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
- <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
- <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
- <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
+ <el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -52,11 +49,6 @@
<template>
<el-table border :data="tableapi" height="calc(80vh - 250px)" style="width: 100%">
<el-table-column type="index" label="搴忓彿" width="70">
- </el-table-column>
- <el-table-column prop="date" label="渚涘簲鍟嗗悕绉�" width="180">
- <template slot-scope="scope">
- <el-input v-model="scope.row.supplier" placeholder=""></el-input>
- </template>
</el-table-column>
<el-table-column prop="" label="璐ㄩ噺杩芥函鍙�" width="180">
<template slot-scope="scope">
@@ -91,31 +83,19 @@
<span>绫诲瀷锛�</span>
<el-select v-model="search.type" size="small" @change="TYpe" placeholder="璇烽�夋嫨"
style="width: 224px;margin-right: 30px;">
- <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
- <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
- <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
- <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
+ <el-option v-for="(a, ai) in bigType" :key="ai" :value="a"></el-option>
</el-select>
- <!-- <span>鍘熸潗鏂欏悕绉帮細</span>
- <el-select v-model="search.name" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
- <el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
- </el-select>
- <el-button size="mini"><span>閲� 缃�</span></el-button>
- <el-button size="mini" type="primary" style="background: #004EA2;"><span>鏌ヨ</span></el-button> -->
</div>
<div class="thing">
<div class="left">
<el-input v-model="search.technology" @input="query" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�"
size="small" clearable></el-input>
- <el-tree :data="list" ref="tree" style="overflow-y: auto;" highlight-current
+ <el-tree :data="list" ref="tree" style="overflow-y: auto;padding-top: 8px;" highlight-current
:props="{children: 'children',label: 'name'}" node-key="name" default-expand-all
@node-click="handleNodeClick">
<div class="custom-tree-node" slot-scope="{ node, data }">
<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)">
- <i class="el-icon-delete"></i>
- </el-button> -->
</div>
</el-tree>
</div>
@@ -132,19 +112,12 @@
</el-table-column>
<el-table-column label="鎿嶄綔" width="130">
<template slot-scope="scope">
- <!-- <span class="table_do" @click="upContent(scope.row)">缂栬緫 </span> -->
<span class="table_do" @click="deleteRow(scope.$index, scope.row)">鍒犻櫎</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
- <!-- <el-dialog title="缂栬緫璁板綍鍐呭" :visible.sync="upDia" width="500px">
- <div class="body">
-
- </div>
-
- </el-dialog> -->
</div>
</template>
<script>
@@ -159,7 +132,7 @@
process: {},
// handleClose:[],
checkTreeNode: {
- id: 2,
+ id: '',
},
tableData: [],
tableapi: [{
@@ -173,16 +146,25 @@
upData: {},
form: {},
dialogVisible: false,
- typeselect: 0,
+ typeselect: '',
input: '',
craftapi: [],
+ bigType: []
}
},
mounted() {
- this.selectAllleft()
- this.selectAllMbom()
+ this.chooseType()
},
methods: {
+ chooseType() {
+ this.$axios.get(this.$api.url.chooseType).then(res => {
+ this.bigType = res.data
+ this.typeselect = res.data[0]
+ this.search.type = res.data[0]
+ this.selectAllleft()
+ this.selectAllMbom()
+ })
+ },
selectDataList() {
this.list.forEach(a => {
a.code = '[1]'
@@ -219,22 +201,17 @@
}
})
},
- 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);
+ addMbom(data, cc) {
+ this.$axios.post(this.$api.url.addMbom, {
+ mbomModelDto2List: data,
+ techTemId: cc,
+
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ }).then(res => {
+ // console.log(res);
this.$message.success('娣诲姞瀹屾垚')
this.selectAllMbom()
this.tableapi = [{}]
@@ -268,11 +245,30 @@
}
}).then(res => {
this.list = res.data;
- console.log(this.list);
this.selectDataList()
this.$nextTick(() => {
this.$refs.tree.setCurrentKey(this.list[0].children[0].name) // 榛樿閫変腑鑺傜偣绗竴涓�
})
+ let one = this.list.filter(item => {
+ return item.children.length > 0
+ })[0]
+ let name = one.children[0].id
+ this.checkTreeNode.id = name
+ this.selectAllMbomStart(name)
+ this.selectDataList();
+ }, {
+ headers: {
+ "Content-Type": "application/json"
+ }
+ })
+ },
+ selectAllMbomStart(name) {
+ this.$axios.get(this.$api.url.selectAllMbom, {
+ params: {
+ id: name
+ }
+ }).then(res => {
+ this.tableData = res.data;
}, {
headers: {
"Content-Type": "application/json"
@@ -287,7 +283,6 @@
}
}).then(res => {
this.tableData = res.data;
- console.log(this.tableData);
}, {
headers: {
"Content-Type": "application/json"
@@ -296,7 +291,6 @@
},
handleNodeClick(data) {
this.checkTreeNode = data
- console.log(this.checkTreeNode.id);
this.selectAllMbom()
},
handleClose(done) {
@@ -306,28 +300,24 @@
})
.catch(_ => {});
},
+ //鏂板
event() {
this.dialogVisible = true
this.chooseTechFath()
},
+ //娣诲姞琛�
Addrow() {
if (this.tableapi == undefined) {
this.tableapi = new Array();
}
- let obj = [];
-
+ let obj = {};
this.tableapi.push(obj);
},
skipshow() {
- console.log('666');
- let data = this.tableapi.at(-1)
- // this.addMbom()
- data.techTemId = this.search.craft
- // console.log(this.search.craft);
- // console.log(data);
-
- this.addMbom(data)
-
+ // let data = this.tableapi.at(-1)
+ // console.log(this.tableapi);
+ let cc = this.search.craft
+ this.addMbom(this.tableapi, cc)
this.dialogVisible = false
},
//delAllMbom 鎵归噺鍒犻櫎
@@ -351,7 +341,6 @@
return el.id
})
this.delete = cc.join(',')
- console.log(this.delete);
this.delAllMbom()
this.$message.success('鍒犻櫎瀹屾垚')
},
@@ -359,10 +348,7 @@
this.selects = val;
},
deleteRow(index, rows) {
- console.log(rows);
- // this.tableData.splice(index,1)
this.upData.id = rows.id
- console.log(this.upData);
this.material(index)
},
@@ -485,4 +471,4 @@
height: 30px;
border-radius: 2px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3