From 0818becbf021341ce369d4f92b2ade3a2648a953 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 九月 2023 13:45:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/standard.vue | 142 +++++++++++++++++++++++-----------------------
1 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index de29f7f..f3355c9 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -13,7 +13,7 @@
</div>
<div class="thing">
<div class="left">
- <el-row :gutter="5" style="position: fixed;top: 148px;z-index: 1;">
+ <el-row :gutter="5" >
<el-col :span="21">
<el-input v-model="search" suffix-icon="el-icon-search" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�" size="small" clearable></el-input>
</el-col>
@@ -44,21 +44,24 @@
<el-option :value="2" label="鐗╂枡娓呭崟"></el-option>
<el-option :value="3" label="鐢熶骇宸ヨ壓"></el-option>
</el-select>
- <span>{{ tableType == 1 ? '椤圭洰锛�' : '宸ヨ壓鍚嶇О锛�' }}</span>
- <el-input v-model="searchName" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right: 50px;"
- clearable></el-input>
<span>鐗堟湰锛�</span>
- <el-select v-model="version2" @change="verevent" size="small" style="width: 280px;margin-right: 10px;" placeholder="璇烽�夋嫨">
- <el-option v-for="item in version" :key="item" :label="item" :value="item">
+ <el-select v-model="versionVal" @change="verevent" size="small" style="width: 280px;margin-right: 52px;" placeholder="璇烽�夋嫨">
+ <el-option v-for="(item,index) in versionData" :key="index" :label="item.label" :value="item.value">
</el-option>
</el-select>
- <el-button size="mini" @click="() => { searchName = ''; selectProductTableData() }"><span>閲� 缃�</span></el-button>
- <el-button size="mini" type="primary" style="background: #004EA2;" @click="selectProductTableData"><span>鏌�
- 璇�</span></el-button>
+ <span>{{ tableType == 1 ? '椤圭洰锛�' : '宸ヨ壓鍚嶇О锛�' }}</span>
+ <el-input v-model="searchName" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right:10px"
+ clearable></el-input>
+ <el-button size="mini" @click="() => { searchName = ''; selectAll() }">
+ <span>閲� 缃�</span>
+ </el-button>
+ <el-button size="mini" type="primary" style="background: #004EA2;" @click="selectAll">
+ <span>鏌� 璇�</span>
+ </el-button>
</div>
<div class="contentTable" v-if="this.typeselect == 0">
- <technology @childData="getChildData" :tableType="tableType" :tableData="tableData"></technology>
+ <technology @childData="getChildData" @updateDevice="updateDevice" :tableType="tableType" :tableData="tableData"></technology>
</div>
<div class="contentTable" v-if="this.typeselect == 1">
<target @childData="getChildData" :tableType="tableType" :tableData="tableData"></target>
@@ -393,6 +396,7 @@
return {
//瀛愮粍浠朵紶鐨刬d鍒楄〃
childIds:[],
+ isUpdateDevice:false,
//宸ュ簭鍒楄〃
fatherList:[],
deviceList:[],
@@ -484,7 +488,6 @@
formTypeOptions: null,
typeselect: 0,
returntree: {id:28},
- version: {},
leftAdd:{
type: [],
father: null,
@@ -492,9 +495,8 @@
name: null,
specifications: null
},
- version2: {},
- verdata: {},
- character: 0,
+ versionData: [],
+ versionVal: null,
restaurants: [],
bomName:[],
bomStandard:[],
@@ -507,6 +509,9 @@
this.selectVersion()
},
methods: {
+ updateDevice(val){
+ this.isUpdateDevice = val;
+ },
changeLeftAdd(){
if(this.leftAdd.type.length===2){
this.leftAdd.father=null
@@ -715,7 +720,7 @@
}).then(() => {
this.$axios.post(this.$api.url.addVersion,{
specificationsId : this.returntree.id,
- version : this.version2.substring(1,2),
+ version : this.versionVal,
}).then(res=>{
this.selectVersion();
this.$message.success(res.message);
@@ -732,6 +737,7 @@
let obj = {}
if(type == 0){
obj = {
+ version : this.versionVal,
specificationsId: Number.parseInt(this.returntree.id),
deviceGroup: this.technologyForm.deviceGroup,
father: this.technologyForm.tefather,
@@ -740,11 +746,14 @@
}
this.submitBomAdd(this.$api.url.addTechnology,obj);
}else if(type == 1){
- this.submitBomAdd(this.$api.url.addProductByStandard,this.targetForm);
+ obj = this.targetForm;
+ obj.version = this.versionVal;
+ this.submitBomAdd(this.$api.url.addProductByStandard,obj);
}else if(type == 2){
obj = {
mbomDto2List:this.materialForm.tableList,
- technologyId:this.materialForm.mtechnologyId
+ technologyId:this.materialForm.mtechnologyId,
+ version : this.versionVal
}
this.submitBomAdd(this.$api.url.addMBomByStandard,obj);
}else if(type == 3){
@@ -754,12 +763,17 @@
product: form.product,
productFather: form.productFather,
technologyId: form.protechnologyId,
- unit: form.unit
+ unit: form.unit,
+ version : this.versionVal
}
this.submitBomAdd(this.$api.url.addTechniqueByStandard,obj);
}else{
return
}
+ this.technologyVisible = false;
+ this.targetVisible = false;
+ this.materialVisible = false;
+ this.productVisible = false;
}
})
},
@@ -773,11 +787,8 @@
}).catch(error=>{
this.$message.error(error.message);
})
- this.technologyVisible = false;
- this.targetVisible = false;
- this.materialVisible = false;
- this.productVisible = false;
},
+ //娓呯┖鏂板bom琛ㄥ崟
clearBomAddModel(){
if(this.typeselect == 0){
this.deviceList=[];
@@ -788,6 +799,7 @@
this.$refs["targetForm"].resetFields();
}else if(this.typeselect == 2){
this.mIdList = [];
+ this.materialForm.tableList = [];
this.$refs["materialForm"].resetFields();
}else{
this.productDeviceList=[];
@@ -829,7 +841,10 @@
//鐗╂枡娓呭崟--鑾峰彇宸ュ簭锛屽伐鑹哄垪琛�
getMaterialFormList(){
this.$axios.get(this.$api.url.chooseTechByMBom,{
- params:{specificationsId : this.returntree.id}
+ params:{
+ specificationsId : this.returntree.id,
+ version : this.versionVal
+ }
}).then(res=>{
this.materialFormList = res.data;
}).catch(error=>{
@@ -845,7 +860,10 @@
//鎶�鏈寚鏍�--鑾峰彇宸ュ簭锛屽伐鑹哄垪琛�
getTargetFormList(){
this.$axios.get(this.$api.url.chooseTechByStandard,{
- params:{specificationsId : this.returntree.id}
+ params:{
+ specificationsId : this.returntree.id,
+ version : this.versionVal
+ }
}).then(res=>{
this.targetFormList = res.data;
}).catch(error=>{
@@ -855,7 +873,10 @@
//1.鐢熶骇宸ヨ壓-->閫夋嫨宸ュ簭,宸ヨ壓
getProductFormList(){
this.$axios.get(this.$api.url.chooseTechByProduct,{
- params:{specificationsId : this.returntree.id}
+ params:{
+ specificationsId : this.returntree.id,
+ version : this.versionVal
+ }
}).then(res=>{
this.productFormList = res.data;
}).catch(error=>{
@@ -907,7 +928,10 @@
//宸ヨ壓璺嚎--鑾峰彇宸ュ簭鍒楄〃
getFatherList(){
this.$axios.get(this.$api.url.chooseFather,{
- params:{specificationsId : this.returntree.id}
+ params:{
+ specificationsId : this.returntree.id,
+ version: this.versionVal
+ }
}).then(res=>{
this.fatherList = res.data;
}).catch(error=>{
@@ -1003,10 +1027,8 @@
},
TYPE(val) {//绫诲瀷.鏁版嵁
- // console.log(val);
this.typeselect = val
-
- // console.log(this.typeselect);
+ this.searchName = '';
this.selectVersion()
},
handleNodeClick(val) {//鏍戠殑鍊�
@@ -1016,23 +1038,24 @@
}
},
async selectVersion() {//鐗堟湰
- let v=await this.$axios.get(this.$api.url.selectVersion, {
+ this.versionData = [];
+ await this.$axios.get(this.$api.url.selectVersion, {
params: {
specificationsId: this.returntree.id,
type: this.typeselect,
}
}).then(res => {
- this.verdata = res.data
- this.version = this.verdata.map(el => {
- return el = `v${el}`
- })
- // console.log("鐗堟湰");
- return this.verdata[0]
+ //鍒濆鍖栫増鏈�夋嫨鍒楄〃
+ if(res.data != null){
+ res.data.forEach(item=>{
+ this.versionData.push({
+ label:"v"+item,
+ value:item
+ })
+ this.versionVal = res.data[0];
+ })
+ }
})
- this.character=v
- if(this.character != undefined){
- this.version2="v"+v
- }
this.selectAll()
},
//鍙充晶鏁版嵁
@@ -1041,34 +1064,27 @@
params: {
specificationsId: this.returntree.id,//tree鐨勭偣鍑诲弽棣�
type: this.typeselect,//绫诲瀷
- version: this.character,//鐗堟湰
+ version: this.versionVal,//鐗堟湰
+ message: this.searchName//鎼滅储鏉′欢
}
}).then(res => {
let arr = res.data;
this.formatData(arr)
this.tableData = arr;
- console.log("arr--",arr);
})
},
formatData(data){
let arr = data;
for(var i=0;i<arr.length;i++){
arr[i].rowId = Math.random();
- arr[i].indents = 1;
if(arr[i].children != undefined){
this.formatData(arr[i].children);
}
}
},
verevent(val) {
- // console.log(val);
- let cc = val.replace('v', '')
- // console.log(cc);
- this.character = cc
+ this.versionVal = val
this.selectAll()
- // const { v, ...newObj } = val;
- // delete newObj.v
- // console.log(newObj);
},
//浜旂骇鏍�
selectMaterialTree() {
@@ -1104,7 +1120,6 @@
})
}
}
- console.log(this.list);
this.selectDataList()
// 榛樿绗竴涓簲绾ц妭鐐规悳绱紝鏂板閰嶇疆椤�
const treeOptions = JSON.parse(JSON.stringify(this.list));
@@ -1153,26 +1168,6 @@
nodeClose(data, node, el) {
$($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
},
- async selectProductTableData() {
- switch (this.tableType) {
- case 0:
- const { data: technologyList } = await this.$axios.get(this.$api.url.selectTechnologyByMaterial, { params: { specificationId: this.checkTreeNode.id, technologyName: this.searchName } })
- this.tableData = technologyList
- break;
- case 1:
- const { data: productList } = await this.$axios.get(this.$api.url.selectProductByMaterial, { params: { specifications: this.checkTreeNode.id, project: this.searchName } })
- productList.forEach((item, index) => {
- item.name = item.father
- item.index = index + 1
- item.id = item.father
- if (item.children.length === 1) {
- productList[index] = { ...item.children[0], index: index + 1, name: item.father }
- }
- })
- this.tableData = productList
- break;
- }
- },
// 閫掑綊鏇存敼娣诲姞绾ц仈鎵�闇�灞炴��
replaceProp(arr){
for (let index = 0; index < arr.length; index++) {
@@ -1190,6 +1185,11 @@
}
},
watch:{
+ isUpdateDevice(val){
+ if(val){
+ this.selectAll();
+ }
+ },
search(val) {
this.$refs.tree.filter(val);
},
--
Gitblit v1.9.3