From 49a5757c36d73524c74bc27fcecf486368d80311 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 12 九月 2023 09:08:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/standard.vue | 609 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 568 insertions(+), 41 deletions(-)
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 0923393..56f6ba2 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -5,22 +5,28 @@
<el-col :span="12" style="line-height: 32px;">鏍囧噯BOM</el-col>
<el-col :span="12" style="text-align: right;">
<el-button type="primary" icon="el-icon-plus" style="background: #004EA2;"
- @click="bomAddModelVisible = true">鏂板</el-button>
+ @click="showBomAddModel">鏂板</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-tree :data="list" ref="tree" default-expand-all :props="{ children: 'children', label: 'name' }"
+ <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 style="width: ;" :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>
@@ -43,11 +49,11 @@
<el-input v-model="searchName" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right: 24px;"
clearable></el-input>
<span>{{ tableType == 1 ? '鐗堟湰锛�' : '鐗堟湰锛�' }}</span>
- <el-select v-model="VER" @change="verevent" style="width: 280px;" placeholder="璇烽�夋嫨">
+ <el-select size="small" v-model="VER" @change="verevent" style="width: 280px;" placeholder="璇烽�夋嫨">
<el-option v-for="item in version" :key="item" :label="item" :value="item">
</el-option>
</el-select>
- <el-button size="mini" @click="() => { searchName = ''; selectProductTableData() }"><span>閲� 缃�</span></el-button>
+ <el-button style="margin-left:10px;" size="mini" @click="() => { searchName = ''; selectProductTableData() }"><span>閲� 缃�</span></el-button>
<el-button size="mini" type="primary" style="background: #004EA2;" @click="selectProductTableData"><span>鏌�
璇�</span></el-button>
</div>
@@ -56,32 +62,207 @@
<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>
+ <material :tableType="tableType" :tableData="tableData"></material>
</div>
<div v-if="this.typeselect == 3">
- 鐢熶骇宸ヨ壓
+ <product :tableType="tableType" :tableData="tableData"></product>
</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>
</div>
<div class="bom-add-model">
- <el-dialog title="BOM鏂板" :visible.sync="bomAddModelVisible" width="30%">
- <el-form>
-
- </el-form>
+ <el-dialog title="BOM鏂板" :visible.sync="bomAddModelVisible" width="35%">
+ <!-- 宸ヨ壓璺嚎 -->
+ <div v-if="typeselect == 0">銆�
+ <el-form :model="technologyForm" :inline="true" class="demo-form-inline" label-position="right"
+ :rules="boomRules" ref="boomForm" label-width="90px">
+ <el-form-item label="宸ュ簭:" prop="father" width="250">
+ <el-select v-model="technologyForm.father"
+ style="width:200px;" 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-form-item label="宸ヨ壓鍚嶇О:" prop="name" width="250">
+ <el-input placeholder="璇疯緭鍏ュ伐鑹哄悕绉�" style="width:200px;"
+ v-model="technologyForm.name"></el-input>
+ </el-form-item>
+ <el-form-item label="璁惧缁�:" prop="deviceGroup" width="250">
+ <el-select placeholder="璇烽�夋嫨璁惧缁�"
+ style="width:200px;"
+ v-model="technologyForm.deviceGroup">
+ <el-option :value="item.father"
+ v-for="(item,index) in deviceList" :key="index" :label="item.father"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐢熶骇瀹氶:" prop="productionQuota" width="250">
+ <el-input style="width:200px;" v-model.number="technologyForm.productionQuota" placeholder="璇疯緭鍏ョ敓浜у畾棰�" />
+ </el-form-item>
+ </el-form>
+ </div>
+ <!-- 鎶�鏈寚鏍� -->
+ <div v-if="typeselect == 1">
+ <el-form :model="targetForm" :inline="true" class="demo-form-inline" label-position="right"
+ label-width="80px">
+ <el-form-item label="鎸囨爣鍚嶇О:" prop="father" width="250">
+ <el-input style="width:200px;" v-model="targetForm.pname" placeholder="璇疯緭鍏ュ崟浣�"/>
+ </el-form-item>
+ <el-form-item label="鍗曚綅:" prop="name" width="250">
+ <el-input style="width:200px;" v-model="targetForm.unit" placeholder="璇疯緭鍏ュ崟浣�"/>
+ </el-form-item>
+ <el-form-item label="鍐呮帶鍊�:" prop="dg" width="250">
+ <el-input style="width:200px;" v-model="targetForm.internal" placeholder="璇疯緭鍏ュ崟浣�"/>
+ </el-form-item>
+ <el-form-item label="鏍囧噯鍊�:" prop="unit" width="250">
+ <el-input style="width:200px;" v-model="targetForm.required" placeholder="璇疯緭鍏ュ崟浣�"/>
+ </el-form-item>
+ </el-form>
+ </div>
+ <!-- 鐗╂枡娓呭崟 -->
+ <div v-if="typeselect == 2">
+ <el-form :model="materialForm" class="demo-form-inline" label-position="right"
+ label-width="80px">
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="瑙勬牸鍨嬪彿:" prop="father" width="250">
+ <el-input style="width:200px;" v-model="materialForm.pname" placeholder="璇疯緭鍏ュ崟浣�"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" style="text-align: right;">
+ <el-form-item label="浜у搧澶х被:" prop="name" width="250">
+ <el-select placeholder="璇烽�夋嫨浜у搧澶х被"
+ style="width:240px;" v-model="materialForm.dg">
+ <el-option value="1">1</el-option>
+ <el-option value="2">2</el-option>
+ <el-option value="3">3</el-option>
+ <el-option value="4">4</el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鏉愭枡淇℃伅"></el-form-item>
+ </el-col>
+ <el-col :span="12" style="text-align: right;">
+ <el-button size="mini" style="text-align: right;">娣诲姞琛�</el-button>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-table >
+ <el-table-column label="鏉愭枡鍚嶇О"></el-table-column>
+ <el-table-column label="瑙勬牸鍨嬪彿"></el-table-column>
+ <el-table-column label="鍗曚綅"></el-table-column>
+ <el-table-column label="鏁伴噺"></el-table-column>
+ </el-table>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+ <!-- 鐢熶骇宸ヨ壓 -->
+ <div v-if="typeselect == 3">
+ <el-form :model="technologyForm" :inline="true" class="demo-form-inline" label-position="right"
+ label-width="80px">
+ <el-form-item label="宸ュ簭:" prop="father" width="250">
+ <el-select v-model="technologyForm.father"
+ style="width:200px;"
+ placeholder="璇疯緭鍏ユ垨閫夋嫨鐢熶骇瀹氶">
+ <el-option value="1">1</el-option>
+ <el-option value="2">2</el-option>
+ <el-option value="3">3</el-option>
+ <el-option value="4">4</el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="宸ヨ壓鍚嶇О:" prop="name" width="250">
+ <el-select placeholder="璇疯緭鍏ユ垨閫夋嫨宸ヨ壓鍚嶇О"
+ style="width:200px;"
+ v-model="technologyForm.name">
+ <el-option value="1">1</el-option>
+ <el-option value="2">2</el-option>
+ <el-option value="3">3</el-option>
+ <el-option value="4">4</el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璁惧:" prop="dg" width="250">
+ <el-select placeholder="璇烽�夋嫨璁惧"
+ style="width:200px;"
+ v-model="technologyForm.dg">
+ <el-option value="1">1</el-option>
+ <el-option value="2">2</el-option>
+ <el-option value="3">3</el-option>
+ <el-option value="4">4</el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="椤圭洰:" prop="dg" width="250">
+ <el-select placeholder="璇烽�夋嫨椤圭洰"
+ style="width:200px;"
+ v-model="technologyForm.dg">
+ <el-option value="1">1</el-option>
+ <el-option value="2">2</el-option>
+ <el-option value="3">3</el-option>
+ <el-option value="4">4</el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍗曚綅:" prop="unit" width="250">
+ <el-input style="width:200px;" v-model="technologyForm.unit" placeholder="璇疯緭鍏ュ崟浣�"/>
+ </el-form-item>
+ <el-form-item label="鎸囨爣:" prop="pq" width="250">
+ <el-input style="width:200px;" v-model="technologyForm.pq" placeholder="璇疯緭鍏ユ寚鏍�" />
+ </el-form-item>
+ </el-form>
+ </div>
<span slot="footer" class="dialog-footer">
<el-button @click="bomAddModelVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="bomAddModelVisible = false">纭� 瀹�</el-button>
+ <el-button type="primary" @click="confirmAdd('boomForm')">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <!-- 宸︿晶鐐瑰嚮+鎸夐挳 -->
+ <el-dialog title="BOM鏂板" :visible.sync="bomLeftAdd" width="29%">
+ <el-form ref="leftAdd" :model="leftAdd">
+ <el-form-item :rules="[{ required: true, message: '璇烽�夋嫨浜у搧绫诲瀷', trigger: 'blur' }]" label="浜у搧绫诲瀷" prop="type">
+ <el-cascader @change="changeLeftAdd" v-model="leftAdd.type" style="width: 86%;" :options="formTypeOptions" :props="{ checkStrictly: true }" clearable></el-cascader>
+ </el-form-item>
+ <el-form-item v-if="leftAdd.type.length<2" label="浜у搧澶х被" prop="father">
+ <el-autocomplete class="inline-input" style="width: 88%;" v-model="leftAdd.father" :fetch-suggestions="querySearch" placeholder="璇烽�夋嫨浜у搧澶х被" @select="handleSelect"></el-autocomplete>
+ </el-form-item>
+ <el-form-item v-if="leftAdd.type.length<3" label="浜у搧鍚嶇О" prop="name">
+ <el-autocomplete class="inline-input" style="width: 88%;" v-model="leftAdd.name" :fetch-suggestions="querySearchName" placeholder="璇烽�夋嫨浜у搧鍚嶇О" @select="handleSelect"></el-autocomplete>
+ </el-form-item>
+ <el-form-item v-if="leftAdd.type.length<4" label="浜у搧鏍囧噯" prop="standard">
+ <el-autocomplete class="inline-input" style="width: 88%;" v-model="leftAdd.standard" :fetch-suggestions="querySearchStandar" placeholder="璇烽�夋嫨浜у搧鏍囧噯" @select="handleSelect"></el-autocomplete>
+ </el-form-item>
+ <el-form-item label="浜у搧鍨嬪彿" prop="specifications">
+ <el-input v-model="leftAdd.specifications" style="width: 88%;" placeholder="璇疯緭鍏ヤ骇鍝佸瀷鍙�"></el-input>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="resetForm('leftAdd')">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm('leftAdd')">纭� 瀹�</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,11 +272,40 @@
<script>
import technology from "./standard-table/technology.vue"
import material from "./standard-table/material.vue"
+import target from "./standard-table/target.vue"
+import product from "./standard-table/product.vue"
+import bomClickAdd from '@/components/view/standard-box/bomClickAdd'
export default {
- components: { technology,material },
-
+ components: { technology,material,target,product,bomClickAdd },
data() {
return {
+ //宸ュ簭鍒楄〃
+ fatherList:[],
+ //璁惧缁勫垪琛�
+ deviceList:[],
+ technologyForm:{
+ father:'',
+ name:'',
+ deviceGroup:'',
+ productionQuota:''
+ },
+ targetForm:{
+ pname:'',
+ unit:'',
+ internal:'',
+ required: ''
+ },
+ formTypeOptions:[],
+ materialForm:{},
+ boomRules:{
+ father:{required:true,message:'宸ュ簭涓嶈兘涓虹┖',trigger:'change'},
+ name:{required:true,message:'宸ヨ壓鍚嶇О涓嶈兘涓虹┖',trigger:'blur'},
+ deviceGroup:{required:true,message:'璁惧缁勪笉鑳戒负绌�',trigger:'change'},
+ productionQuota:[
+ {required:true,message:'鐢熶骇瀹氶涓嶈兘涓虹┖',trigger:'blur'},
+ {type:'number',required:true,message:'鏁版嵁绫诲瀷蹇呴』鏄函鏁板瓧',trigger:'blur'}
+ ]
+ },
// BOM鏍戞暟鎹粨鏋�
list: [],
search: null,
@@ -104,15 +314,29 @@
checkTreeNode: {},// 鐐瑰嚮閫変腑鏍戣妭鐐�
tableData: [],
bomAddModelVisible: false,// 鎺у埗bom鏂板妯℃�佹鏄惁鏄剧ず
- list: [],
+ bomLeftAdd: false,
+ bomRightUp: false,
+ bomRightDl: false,
+ formTypeOptions: null,
typeselect: 0,
returntree: {
id:28,
},
version: {},
+ leftAdd:{
+ type: [],
+ father: null,
+ standard: null,
+ name: null,
+ specifications: null
+ },
VER: {},
verdata: {},
character: 0,
+ restaurants: [],
+ bomName:[],
+ bomStandard:[],
+ isLeftAdd: true
}
},
// watch: {
@@ -124,11 +348,204 @@
// }
// },
mounted() {
+ this.tableType=0
this.selectMaterialTree()
- // this.selectAll()
this.selectVersion()
+ console.log(this.formTypeOptions);
},
methods: {
+ changeLeftAdd(){
+ if(this.leftAdd.type.length===2){
+ this.leftAdd.father=null
+ this.leftAdd.father=this.leftAdd.type[1]
+ }
+ if(this.leftAdd.type.length===3){
+ this.leftAdd.name=null
+ this.leftAdd.father=this.leftAdd.type[1]
+ this.leftAdd.name=this.leftAdd.type[2]
+ }
+ if(this.leftAdd.type.length===4){
+ this.leftAdd.standard=null
+ this.leftAdd.father=this.leftAdd.type[1]
+ this.leftAdd.name=this.leftAdd.type[2]
+ this.leftAdd.standard=this.leftAdd.type[3]
+ }
+ },
+ submitForm(formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ let obj=JSON.parse(JSON.stringify(this.leftAdd))
+ console.log(obj);
+ let one=this.list.filter(item=>{
+ return item.name===obj.type[0]
+ })[0]
+ let two=one.children.filter(item=>{
+ return item.name===obj.father
+ })[0]
+ console.log("two",two);
+ //鎵ц涓�浜岀骇鏂板
+ if(two===undefined||two===null){
+ 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.selectMaterialTree()
+ })
+ }else{
+ let three=two.children.filter(item=>{
+ return item.name===obj.name
+ })[0]
+ console.log("three",three);
+ if(three===undefined||three===null){
+ 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.selectMaterialTree()
+ })
+ }else{
+ //鏂板鏍囧噯鍨嬪彿
+ let four=three.children.filter(item=>{
+ return item.name===obj.standard
+ })[0]
+ if(four===undefined||four===null){
+ let StandardDto={
+ "id": three.id,
+ "specifications": obj.specifications,
+ "standard": obj.standard
+ }
+ this.$axios.post(this.$api.url.leftAddThree,StandardDto,{
+ headers: { "Content-Type": "application/json" }
+ }).then(res=>{
+ this.$message({
+ message: res.message,
+ type: 'success'
+ });
+ this.selectMaterialTree()
+ })
+ }else{
+ let specificationsDto={
+ "id": four.id,
+ "specifications": obj.specifications
+ }
+ this.$axios.post(this.$api.url.leftAddFour,specificationsDto,{
+ headers: { "Content-Type": "application/json" }
+ }).then(res=>{
+ this.$message({
+ message: res.message,
+ type: 'success'
+ });
+ this.selectMaterialTree()
+ this.selectVersion()
+ })
+ }
+ }
+ }
+ this.resetForm('leftAdd')
+ } else {
+ console.log('error submit!!');
+ return false;
+ }
+ });
+ },
+ resetForm(formName) {
+ this.bomLeftAdd=false
+ this.$refs[formName].resetFields();
+ },
+ leftAddBom(){
+
+ },
+ confirmAdd(formName){
+ this.$refs[formName].validate(valid=>{
+ if(valid){
+ console.log(this.technologyForm);
+ this.$axios.post(this.$api.url.addTechnology,
+ {
+ "specificationsId": this.returntree.id,
+ "technologyDto": JSON.stringify({
+ deviceGroup: this.technologyForm.deviceGroup,
+ father: this.technologyForm.father,
+ name: this.technologyForm.name,
+ productionQuota: this.technologyForm.productionQuota,
+ })
+ },{
+ headers: { "Content-Type": "application/json" }
+ }).then(res=>{
+ this.$message.success(res.message);
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
+ this.bomAddModelVisible = false;
+ }
+ })
+ },
+ //鑾峰彇宸ュ簭鍒楄〃
+ getFatherList(){
+ this.$axios.get(this.$api.url.chooseFather,{
+ params:{specificationsId : this.returntree.id}
+ }).then(res=>{
+ this.fatherList = res.data;
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
+ },
+ //鑾峰彇璁惧缁勫垪琛�
+ getDeviceList(){
+ this.$axios.get(this.$api.url.chooseDevice).then(res=>{
+ this.deviceList = res.data;
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
+ },
+ showBomAddModel(){
+ this.getFatherList();
+ this.getDeviceList();
+ this.bomAddModelVisible = true
+ },
+ 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);
+ };
+ },
selectDataList() {
this.list.forEach(a => {
a.code = '[1]'
@@ -158,18 +575,21 @@
},
TYPE(val) {//绫诲瀷.鏁版嵁
- console.log(val);
+ // console.log(val);
this.typeselect = val
-
// console.log(this.typeselect);
this.selectVersion()
},
handleNodeClick(val) {//鏍戠殑鍊�
- console.log(val);
- this.returntree = val
+ if(val.code==='[5]'&&val.children===undefined){
+ console.log(val);
+ this.returntree = val
+ this.typeselect=0
+ this.selectVersion()
+ }
},
- 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 +599,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 +615,24 @@
version: this.character,//鐗堟湰
}
}).then(res => {
- console.log(res.data);
- this.tableData = res.data
+ let arr = res.data;
+ this.formatData(arr)
+ 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 +641,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 +652,33 @@
}
})
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) {
+ 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 +718,75 @@
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(element.children!=undefined){
+ if(element.code==='[4]'){
+ delete element['children']
+ continue
+ }
+ this.replaceProp(element.children)
+ }
+ }
}
+ },
+ watch:{
+ leftAdd: {
+ handler(newVal, oldVal) {
+ if(this.isLeftAdd){
+ let tree=JSON.parse(JSON.stringify(this.list))
+ 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);
+ let two=one.children.filter(item=>{
+ return item.name===newVal.father
+ })[0]
+ if(two!=undefined){
+ this.bomName=[]
+ father=JSON.parse(JSON.stringify(two))
+ two.children.forEach(item=>{
+ let obj={label: item.name,value: item.name}
+ this.bomName.push(obj)
+ })
+ }
+ }
+ if(newVal.name!=null&&newVal!=''&&newVal.father!=null&&newVal.father!=''&&newVal.type.length>0){
+ let three=null
+ if(father!=undefined&&father!=null){
+ three=father.children.filter(item=>{
+ return item.name===newVal.name
+ })[0]
+ }
+ if(three!=undefined&&three!=null){
+ this.bomStandard=[]
+ three.children.forEach(item=>{
+ let obj={label: item.name,value: item.name}
+ this.bomStandard.push(obj)
+ })
+ }
+ }
+ }
+ },
+ deep: true // 娣卞害鐩戝惉瀵硅薄鍐呴儴灞炴�х殑鍙樺寲锛屽彲閫夌殑
+ },
+ bomLeftAdd:{
+ handler(newval,oldVal){
+ if(newval){
+ let treeOptions = JSON.parse(JSON.stringify(this.list));
+ this.replaceProp(treeOptions)
+ this.formTypeOptions=treeOptions
+ this.restaurants=this.loadFatherType()
+ }
+ }
+ }
}
}
</script>
@@ -295,6 +821,7 @@
.thing .left {
width: 295px;
height: calc(100% - 32px);
+ overflow-y: auto;
border-right: 3px solid rgb(245, 247, 251);
padding: 16px;
}
--
Gitblit v1.9.3