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/standard.vue | 394 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 242 insertions(+), 152 deletions(-)
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index b6a6201..95908b5 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -13,53 +13,64 @@
</div>
<div class="thing">
<div class="left">
- <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>
- <el-col :span="2">
- <el-button size="small" 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.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 class="left_search">
+ <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>
+ <el-col :span="2">
+ <el-button size="mini" icon="el-icon-plus" @click="bomLeftAdd=true"></el-button>
+ </el-col>
+ </el-row>
+ </div>
+ <div class="left_tree">
+ <el-row>
+ <el-col :span="24">
+ <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.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>
+ </el-col>
+ </el-row>
+ </div>
</div>
<div class="right">
<div class="choose">
<span>绫诲瀷锛�</span>
<el-select v-model="tableType" size="small" placeholder="璇烽�夋嫨" @change="TYPE"
- style="width: 224px;margin-right: 52px;">
+ style="width: 13vw;margin-right: 15px;">
<el-option :value="0" label="宸ヨ壓璺嚎"></el-option>
<el-option :value="1" label="鎶�鏈寚鏍�"></el-option>
<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: 13vw;margin-right: 15px;" 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: 13vw;margin-right:15px"
+ 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" @updateDevice="updateDevice" :tableType="tableType" :tableData="tableData"></technology>
</div>
<div class="contentTable" v-if="this.typeselect == 1">
- <target @childData="getChildData" :tableType="tableType" :tableData="tableData"></target>
+ <target @childData="getChildData" :tableType="tableType" :tableData="tableData"></target>
</div>
<div class="contentTable" v-if="this.typeselect == 2">
<material @childData="getChildData" :tableType="tableType" :tableData="tableData"></material>
@@ -77,34 +88,34 @@
ref="technologyForm" :rules="technologyRules" label-width="90px">
<el-row>
<el-col :span="12">
- <el-form-item label="宸ュ簭:" prop="tefather">
- <el-select size="small"
- filterable allow-create default-first-option
+ <el-form-item label="宸ュ簭:" prop="tefather" style="display: flex;">
+ <el-select size="small"
+ filterable allow-create default-first-option style="width: 100%;"
v-model="technologyForm.tefather" placeholder="璇疯緭鍏ユ垨閫夋嫨宸ュ簭">
<el-option :value="item.father" :label="item.father" v-for="(item,index) in fatherList" :key="index"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="宸ヨ壓鍚嶇О:" prop="tename">
- <el-input size="small" placeholder="璇疯緭鍏ュ伐鑹哄悕绉�"
+ <el-form-item label="宸ヨ壓鍚嶇О:" prop="tename" style="display: flex;">
+ <el-input style="width: 100%;" size="small" placeholder="璇疯緭鍏ュ伐鑹哄悕绉�"
clearable v-model="technologyForm.tename"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="璁惧缁�:" prop="deviceGroup">
- <el-select placeholder="璇烽�夋嫨璁惧缁�" size="small"
+ <el-form-item label="璁惧缁�:" prop="deviceGroup" style="display: flex;">
+ <el-select placeholder="璇烽�夋嫨璁惧缁�" size="small" style="width: 100%;"
v-model="technologyForm.deviceGroup">
- <el-option :value="item.father"
+ <el-option :value="item.father"
v-for="(item,index) in deviceList" :key="index" :label="item.father"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐢熶骇瀹氶:" prop="productionQuota">
- <el-input size="small" clearable v-model.number="technologyForm.productionQuota" placeholder="璇疯緭鍏ョ敓浜у畾棰�" />
+ <el-form-item label="鐢熶骇瀹氶:" prop="productionQuota" style="display: flex;">
+ <el-input style="width: 100%;" size="small" clearable v-model.number="technologyForm.productionQuota" placeholder="璇疯緭鍏ョ敓浜у畾棰�" />
</el-form-item>
</el-col>
</el-row>
@@ -121,7 +132,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="宸ュ簭:" prop="pfather">
- <el-select v-model="targetForm.pfather"
+ <el-select v-model="targetForm.pfather"
@change="changeFather" size="small" placeholder="璇烽�夋嫨宸ュ簭">
<el-option :value="item.name" :label="item.name" v-for="(item,index) in targetFormList" :key="index"></el-option>
</el-select>
@@ -140,7 +151,7 @@
<el-col :span="12">
<el-form-item label="椤圭洰:" prop="father">
<el-select v-model="targetForm.father"
- filterable allow-create default-first-option
+ filterable allow-create default-first-option
size="small" placeholder="璇疯緭鍏ユ垨閫夋嫨椤圭洰">
<el-option :value="item.father" :label="item.father" v-for="(item,index) in projectList" :key="index"></el-option>
</el-select>
@@ -148,7 +159,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鎸囨爣鍚嶇О:" prop="name">
- <el-input size="small" v-model="targetForm.name" placeholder="璇疯緭鍏ユ寚鏍囧悕绉�"/>
+ <el-input size="small" v-model="targetForm.name" placeholder="璇疯緭鍏ユ寚鏍囧悕绉�"/>
</el-form-item>
</el-col>
</el-row>
@@ -189,16 +200,16 @@
style="width:100%;" v-model="materialForm.mfather" size="small">
<el-option v-for="(item,index) in materialFormList" :key="index"
:label="item.name" :value="item.name" ></el-option>
- </el-select>
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="宸ヨ壓鍚嶇О:" prop="mtechnologyId">
- <el-select placeholder="璇烽�夋嫨宸ヨ壓鍚嶇О" style="width:100%;"
+ <el-select placeholder="璇烽�夋嫨宸ヨ壓鍚嶇О" style="width:100%;"
v-model="materialForm.mtechnologyId" size="small">
- <el-option v-for="(item,index) in mIdList" :key="index"
+ <el-option v-for="(item,index) in mIdList" :key="index"
:value="item.id" :label="item.name"></el-option>
- </el-select>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -215,12 +226,12 @@
<el-table :data="materialForm.tableList" border max-height="470"
:cell-style="{height:'20px',textAlign:'left'}"
:header-cell-style="{height:'20px'}">
- <el-table-column label="渚涘簲鍟嗗悕绉�">
+ <!-- <el-table-column label="渚涘簲鍟嗗悕绉�">
<template slot-scope="scope">
<el-input size="mini" v-model="scope.row.supplier"
placeholder="璇疯緭鍏�"></el-input>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="璐ㄩ噺杩芥函鍙�">
<template slot-scope="scope">
<el-input size="mini" v-model="scope.row.qualityTraceability"
@@ -251,6 +262,11 @@
placeholder="璇疯緭鍏�"></el-input>
</template>
</el-table-column>
+ <el-table-column label="鎿嶄綔" width="60">
+ <template slot-scope="scope">
+ <el-button type="text" @click="removeMTableRow(scope.$index)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
</el-table>
</el-col>
</el-row>
@@ -267,7 +283,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="宸ュ簭:" prop="profather">
- <el-select v-model="productForm.profather"
+ <el-select v-model="productForm.profather"
@change="changeProduct" placeholder="璇烽�夋嫨宸ュ簭" size="small">
<el-option v-for="(item,index) in productFormList" :key="index"
:value="item.name" :label="item.name"></el-option>
@@ -426,8 +442,8 @@
father:{required:true,message:'椤圭洰涓嶈兘涓虹┖',trigger:'change'},
name:{required:true,message:'鎸囨爣鍚嶇О涓嶈兘涓虹┖',trigger:'blur'},
unit:{required:true,message:'鍗曚綅涓嶈兘涓虹┖',trigger:'change'},
- internal:{validator:checkVal,trigger:'change'},
- required:{validator:checkVal,trigger:'change'}
+ internal:{required:true,message:'鍐呮帶鍊间笉鑳戒负绌�',trigger:'change'},
+ required:{required:true,message:'鏍囧噯鍊间笉鑳戒负绌�',trigger:'change'}
},
//鐗╂枡娓呭崟
materialForm:{
@@ -483,7 +499,6 @@
formTypeOptions: null,
typeselect: 0,
returntree: {id:28},
- version: {},
leftAdd:{
type: [],
father: null,
@@ -491,9 +506,8 @@
name: null,
specifications: null
},
- version2: {},
- verdata: {},
- character: 0,
+ versionData: [],
+ versionVal: null,
restaurants: [],
bomName:[],
bomStandard:[],
@@ -530,7 +544,26 @@
this.$refs[formName].validate((valid) => {
if (valid) {
let obj=JSON.parse(JSON.stringify(this.leftAdd))
- console.log(obj);
+ if(obj.type.length===1){
+ obj.type=this.getType(obj.type[0])
+ this.$axios.post(this.$api.url.leftAddOneTwo,obj,{
+ headers: { "Content-Type": "application/json" }
+ }).then(res=>{
+ this.$message({
+ message: res.message,
+ type: 'success'
+ });
+ this.leftAdd.type=[]
+ this.leftAdd.father=null
+ this.leftAdd.standard=null
+ this.leftAdd.name=null
+ this.leftAdd.specifications=null
+ this.selectMaterialTree()
+ this.bomLeftAdd=false
+ this.selectVersion()
+ })
+ return
+ }
let one=this.list.filter(item=>{
return item.name===obj.type[0]
})[0]
@@ -548,7 +581,14 @@
message: res.message,
type: 'success'
});
- this.selectMaterialTree()
+ this.leftAdd.type=[]
+ this.leftAdd.father=null
+ this.leftAdd.standard=null
+ this.leftAdd.name=null
+ this.leftAdd.specifications=null
+ this.selectMaterialTree()
+ this.bomLeftAdd=false
+ this.selectVersion()
})
}else{
let three=two.children.filter(item=>{
@@ -564,7 +604,14 @@
message: res.message,
type: 'success'
});
- this.selectMaterialTree()
+ this.leftAdd.type=[]
+ this.leftAdd.father=null
+ this.leftAdd.standard=null
+ this.leftAdd.name=null
+ this.leftAdd.specifications=null
+ this.selectMaterialTree()
+ this.bomLeftAdd=false
+ this.selectVersion()
})
}else{
//鏂板鏍囧噯鍨嬪彿
@@ -584,7 +631,14 @@
message: res.message,
type: 'success'
});
- this.selectMaterialTree()
+ this.leftAdd.type=[]
+ this.leftAdd.father=null
+ this.leftAdd.standard=null
+ this.leftAdd.name=null
+ this.leftAdd.specifications=null
+ this.selectMaterialTree()
+ this.bomLeftAdd=false
+ this.selectVersion()
})
}else{
let specificationsDto={
@@ -598,7 +652,13 @@
message: res.message,
type: 'success'
});
+ this.leftAdd.type=[]
+ this.leftAdd.father=null
+ this.leftAdd.standard=null
+ this.leftAdd.name=null
+ this.leftAdd.specifications=null
this.selectMaterialTree()
+ this.bomLeftAdd=false
this.selectVersion()
})
}
@@ -616,11 +676,15 @@
this.$refs[formName].resetFields();
},
leftAddBom(){
-
+
},
//鑾峰彇瀛愮粍浠舵暟鎹�
getChildData(data){
this.childIds = data;
+ },
+ //鐗╂枡娓呭崟-鏂板bom-琛ㄦ牸鍒犻櫎琛�
+ removeMTableRow(index){
+ this.materialForm.tableList.splice(index,1);
},
//鍒犻櫎鎸夐挳
deleteDataBtn(){
@@ -671,14 +735,12 @@
}).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);
- }).catch(error=>{
- this.$message.error(error.message);
})
- }).catch(() => {});
+ })
},
//鍙充晶bom,纭鏂板
confirmAdd(formName){
@@ -688,19 +750,23 @@
let obj = {}
if(type == 0){
obj = {
+ version : this.versionVal,
specificationsId: Number.parseInt(this.returntree.id),
deviceGroup: this.technologyForm.deviceGroup,
father: this.technologyForm.tefather,
name: this.technologyForm.tename,
- productionQuota: Number.parseInt(this.technologyForm.productionQuota),
+ productionQuota: this.technologyForm.productionQuota,
}
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){
@@ -710,12 +776,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;
}
})
},
@@ -727,12 +798,7 @@
this.selectAll();
this.$message.success(res.message);
}).catch(error=>{
- this.$message.error(error.message);
})
- this.technologyVisible = false;
- this.targetVisible = false;
- this.materialVisible = false;
- this.productVisible = false;
},
//娓呯┖鏂板bom琛ㄥ崟
clearBomAddModel(){
@@ -779,7 +845,7 @@
"num": null,
"qualityTraceability": "",
"specifications": "",
- "supplier": "",
+ // "supplier": "",
"unit": ""
}
this.materialForm.tableList.push(obj);
@@ -787,7 +853,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=>{
@@ -803,7 +872,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=>{
@@ -813,7 +885,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=>{
@@ -865,7 +940,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=>{
@@ -897,41 +975,41 @@
}
},
startLeftAdd(){
-
+
},
getType(typeName){
return typeName==="鎴愬搧"?1:2
},
handleSelect(item) {
console.log(item);
- },
- querySearch(queryString, cb) {
- var restaurants = this.restaurants;
- var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
- // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
- cb(results);
- },
- querySearchName(queryString, cb) {
- var restaurants = this.bomName;
- var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
- // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
- cb(results);
- },
- querySearchStandar(queryString, cb) {
- var restaurants = this.bomStandard;
- var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
- // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
- cb(results);
- },
- loadFatherType(){
- return [{label:"姗¤兌杩炴帴鍣�",value: "姗¤兌杩炴帴鍣�"},{label:"閲戝睘杩炴帴鍣�",value: "閲戝睘杩炴帴鍣�"},
- {label:"婀挎彃鎷旂數杩炴帴鍣�",value: "婀挎彃鎷旂數杩炴帴鍣�"},{label:"鍒嗘敮缁勪欢",value: "鍒嗘敮缁勪欢"}]
- },
- createFilter(queryString) {
- return (restaurant) => {
- return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
- };
- },
+ },
+ querySearch(queryString, cb) {
+ var restaurants = this.restaurants;
+ var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+ // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
+ cb(results);
+ },
+ querySearchName(queryString, cb) {
+ var restaurants = this.bomName;
+ var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+ // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
+ cb(results);
+ },
+ querySearchStandar(queryString, cb) {
+ var restaurants = this.bomStandard;
+ var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+ // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
+ cb(results);
+ },
+ loadFatherType(){
+ return [{label:"姗¤兌杩炴帴鍣�",value: "姗¤兌杩炴帴鍣�"},{label:"閲戝睘杩炴帴鍣�",value: "閲戝睘杩炴帴鍣�"},
+ {label:"婀挎彃鎷旂數杩炴帴鍣�",value: "婀挎彃鎷旂數杩炴帴鍣�"},{label:"鍒嗘敮缁勪欢",value: "鍒嗘敮缁勪欢"}]
+ },
+ createFilter(queryString) {
+ return (restaurant) => {
+ return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+ };
+ },
selectDataList() {
this.list.forEach(a => {
a.code = '[1]'
@@ -956,15 +1034,13 @@
})
}
})
- },
+ },
handleSelectionChange() {
},
TYPE(val) {//绫诲瀷.鏁版嵁
- // console.log(val);
this.typeselect = val
-
- // console.log(this.typeselect);
+ this.searchName = '';
this.selectVersion()
},
handleNodeClick(val) {//鏍戠殑鍊�
@@ -974,24 +1050,25 @@
}
},
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.selectAll()
})
- this.character=v
- if(this.character != undefined){
- this.version2="v"+v
- }
- this.selectAll()
},
//鍙充晶鏁版嵁
selectAll() {
@@ -999,7 +1076,8 @@
params: {
specificationsId: this.returntree.id,//tree鐨勭偣鍑诲弽棣�
type: this.typeselect,//绫诲瀷
- version: this.character,//鐗堟湰
+ version: this.versionVal,//鐗堟湰
+ message: this.searchName//鎼滅储鏉′欢
}
}).then(res => {
let arr = res.data;
@@ -1011,21 +1089,14 @@
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() {
@@ -1039,6 +1110,28 @@
arr[idx].name = '鍗婃垚鍝�'
}
})
+ if(res.data.length<1){
+ let obj={
+ name: '鎴愬搧',
+ }
+ let obj2={
+ name: '鍗婃垚鍝�',
+ }
+ this.list.push(obj)
+ this.list.push(obj2)
+ }
+ if(res.data.length===1){
+ if(res.data[0].name==='鎴愬搧'){
+ this.list.push({
+ name: '鍗婃垚鍝�',
+ })
+ }
+ if(res.data[0].name==='鍗婃垚鍝�'){
+ this.list.push({
+ name: '鎴愬搧',
+ })
+ }
+ }
this.selectDataList()
// 榛樿绗竴涓簲绾ц妭鐐规悳绱紝鏂板閰嶇疆椤�
const treeOptions = JSON.parse(JSON.stringify(this.list));
@@ -1087,26 +1180,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++) {
@@ -1136,12 +1209,16 @@
handler(newVal, oldVal) {
if(this.isLeftAdd){
let tree=JSON.parse(JSON.stringify(this.list))
+ console.log(tree);
let father=null;
if(newVal.father!=null&&newVal.father!=''&&newVal.type.length>0){
let one=tree.filter(item=>{
return item.name===newVal.type[0]
})[0]
console.log(one);
+ if(one.children===undefined){
+ return
+ }
let two=one.children.filter(item=>{
return item.name===newVal.father
})[0]
@@ -1235,16 +1312,29 @@
height: calc(100% - 48px);
background-color: #fff;
display: flex;
+
}
.thing .left {
width: 295px;
height: calc(100% - 32px);
- overflow-y: auto;
border-right: 3px solid rgb(245, 247, 251);
padding: 16px;
}
+.thing .left .left_search{
+ width:95%;
+ height: 32px;
+ line-height: 32px;
+ margin-bottom: 5px;
+}
+
+.thing .left .left_tree{
+ width: 100%;
+ height: calc(100% - 32px);
+ overflow-y: scroll;
+}
+
.thing .left .custom-tree-node span {
font-size: 14px;
}
--
Gitblit v1.9.3