From 7b07e33a1c719f9831fa3c5d81522b9f2da45bc4 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 14 九月 2023 16:17:58 +0800
Subject: [PATCH] modified: src/components/view/standard.vue
---
src/components/view/standard.vue | 515 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 331 insertions(+), 184 deletions(-)
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 2a3269a..de29f7f 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -13,15 +13,16 @@
</div>
<div class="thing">
<div class="left">
- <el-row>
+ <el-row :gutter="5" style="position: fixed;top: 148px;z-index: 1;">
<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-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' }"
+ <el-row style="margin-top: 16px;">
+ <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>
@@ -31,6 +32,7 @@
</el-button>
</div>
</el-tree>
+ </el-row>
</div>
<div class="right">
<div class="choose">
@@ -58,108 +60,135 @@
<div class="contentTable" v-if="this.typeselect == 0">
<technology @childData="getChildData" :tableType="tableType" :tableData="tableData"></technology>
</div>
- <div v-if="this.typeselect == 1">
+ <div class="contentTable" v-if="this.typeselect == 1">
<target @childData="getChildData" :tableType="tableType" :tableData="tableData"></target>
</div>
- <div v-if="this.typeselect == 2">
+ <div class="contentTable" v-if="this.typeselect == 2">
<material @childData="getChildData" :tableType="tableType" :tableData="tableData"></material>
</div>
- <div v-if="this.typeselect == 3">
+ <div class="contentTable" v-if="this.typeselect == 3">
<product @childData="getChildData" :tableType="tableType" :tableData="tableData"></product>
</div>
</div>
</div>
-
<div class="bom-add-model">
- <el-dialog title="BOM鏂板" :visible.sync="bomAddModelVisible" width="45%">
- <!-- 宸ヨ壓璺嚎 -->
- <div v-if="typeselect == 0">
+ <!-- 宸ヨ壓璺嚎 -->
+ <el-dialog title="BOM鏂板" :visible.sync="technologyVisible" width="45%">
<el-form :model="technologyForm" :inline="true" label-position="right"
ref="technologyForm" :rules="technologyRules" label-width="90px">
- <el-form-item label="宸ュ簭:" prop="tefather">
- <el-select id="tefather" size="small"
- filterable allow-create default-first-option
- 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-form-item label="宸ヨ壓鍚嶇О:" prop="tename">
- <el-input id="tename" size="small" placeholder="璇疯緭鍏ュ伐鑹哄悕绉�"
- clearable v-model="technologyForm.tename"></el-input>
- </el-form-item>
- <el-form-item label="璁惧缁�:" prop="deviceGroup">
- <el-select id="deviceGroup" placeholder="璇烽�夋嫨璁惧缁�" size="small"
- 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">
- <el-input id="productionQuota" size="small" clearable v-model.number="technologyForm.productionQuota" placeholder="璇疯緭鍏ョ敓浜у畾棰�" />
- </el-form-item>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="宸ュ簭:" prop="tefather">
+ <el-select size="small"
+ filterable allow-create default-first-option
+ 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="璇疯緭鍏ュ伐鑹哄悕绉�"
+ 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"
+ 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-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>
+ </el-col>
+ </el-row>
</el-form>
- <div style="width:100%;text-align: right;">
- <span slot="footer" class="dialog-footer" >
- <el-button type="primary" @click="confirmAdd('technologyForm')">纭� 瀹�</el-button>
- <el-button @click="bomAddModelVisible = false">鍙� 娑�</el-button>
- </span>
- </div>
- </div>
+ <span slot="footer" class="dialog-footer" >
+ <el-button type="primary" @click="confirmAdd('technologyForm')">纭� 瀹�</el-button>
+ <el-button @click="technologyVisible = false">鍙� 娑�</el-button>
+ </span>
+ </el-dialog>
<!-- 鎶�鏈寚鏍� -->
- <div v-if="typeselect == 1">
+ <el-dialog title="BOM鏂板" :visible.sync="targetVisible" width="45%">
<el-form :model="targetForm" :inline="true" label-position="right"
:rules="targetRules" ref="targetForm" label-width="90px">
- <el-form-item label="宸ュ簭:" prop="pfather">
- <el-select v-model="targetForm.pfather"
- @change="changeFather"
- style="width:200px;" placeholder="璇烽�夋嫨宸ュ簭">
- <el-option :value="item.name" :label="item.name" v-for="(item,index) in targetFormList" :key="index"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="宸ヨ壓鍚嶇О:" prop="technologyId">
- <el-select v-model="targetForm.technologyId"
- @change="changeTechnologyId"
- style="width:200px;" placeholder="璇烽�夋嫨宸ヨ壓鍚嶇О">
- <el-option :value="item.id" :label="item.name" v-for="(item,index) in technologyIdList" :key="index"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="椤圭洰:" prop="father">
- <el-select v-model="targetForm.father"
- filterable allow-create default-first-option
- style="width:200px;" placeholder="璇疯緭鍏ユ垨閫夋嫨椤圭洰">
- <el-option :value="item.father" :label="item.father" v-for="(item,index) in projectList" :key="index"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鎸囨爣鍚嶇О:" prop="name">
- <el-input style="width:200px;" v-model="targetForm.name" placeholder="璇疯緭鍏ユ寚鏍囧悕绉�"/>
- </el-form-item>
- <el-form-item label="鍗曚綅:" prop="unit">
- <el-input style="width:200px;" v-model="targetForm.unit" placeholder="璇疯緭鍏ュ崟浣�"/>
- </el-form-item>
- <el-form-item label="鍐呮帶鍊�:" prop="internal">
- <el-input style="width:200px;" v-model="targetForm.internal" placeholder="璇疯緭鍏ュ唴鎺у��"/>
- </el-form-item>
- <el-form-item label="鏍囧噯鍊�:" prop="required">
- <el-input style="width:200px;" v-model="targetForm.required" placeholder="璇疯緭鍏ユ爣鍑嗗��"/>
- </el-form-item>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="宸ュ簭:" prop="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>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="宸ヨ壓鍚嶇О:" prop="technologyId">
+ <el-select v-model="targetForm.technologyId"
+ @change="changeTechnologyId" size="small" placeholder="璇烽�夋嫨宸ヨ壓鍚嶇О">
+ <el-option :value="item.id" :label="item.name" v-for="(item,index) in technologyIdList" :key="index"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="椤圭洰:" prop="father">
+ <el-select v-model="targetForm.father"
+ 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>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎸囨爣鍚嶇О:" prop="name">
+ <el-input size="small" v-model="targetForm.name" placeholder="璇疯緭鍏ユ寚鏍囧悕绉�"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鍗曚綅:" prop="unit">
+ <el-input size="small" v-model="targetForm.unit" placeholder="璇疯緭鍏ュ崟浣�"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍐呮帶鍊�:" prop="internal">
+ <el-input size="small" v-model="targetForm.internal" placeholder="璇疯緭鍏ュ唴鎺у��"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鏍囧噯鍊�:" prop="required">
+ <el-input size="small" v-model="targetForm.required" placeholder="璇疯緭鍏ユ爣鍑嗗��"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12"></el-col>
+ </el-row>
</el-form>
- <div style="width:100%;text-align: right;">
- <span slot="footer" class="dialog-footer" >
- <el-button type="primary" @click="confirmAdd('targetForm')">纭� 瀹�</el-button>
- <el-button @click="bomAddModelVisible = false">鍙� 娑�</el-button>
- </span>
- </div>
- </div>
+ <span slot="footer" class="dialog-footer" >
+ <el-button type="primary" @click="confirmAdd('targetForm')">纭� 瀹�</el-button>
+ <el-button @click="targetVisible = false">鍙� 娑�</el-button>
+ </span>
+ </el-dialog>
<!-- 鐗╂枡娓呭崟 -->
- <div v-if="typeselect == 2">
+ <el-dialog title="BOM鏂板" :visible.sync="materialVisible" width="45%">
<el-form :model="materialForm" label-position="right"
:rules="materialRules" ref="materialForm" label-width="90px">
<el-row :gutter="100">
<el-col :span="12">
<el-form-item label="宸ュ簭:" prop="mfather">
<el-select placeholder="璇烽�夋嫨宸ュ簭" @change="changeMName"
- style="width:100%;" v-model="materialForm.mfather">
+ 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>
@@ -168,7 +197,7 @@
<el-col :span="12">
<el-form-item label="宸ヨ壓鍚嶇О:" prop="mtechnologyId">
<el-select placeholder="璇烽�夋嫨宸ヨ壓鍚嶇О" style="width:100%;"
- v-model="materialForm.mtechnologyId">
+ v-model="materialForm.mtechnologyId" size="small">
<el-option v-for="(item,index) in mIdList" :key="index"
:value="item.id" :label="item.name"></el-option>
</el-select>
@@ -180,13 +209,12 @@
<el-form-item label="鏉愭枡淇℃伅" style="font-weight: bold;"></el-form-item>
</el-col>
<el-col :span="12" style="text-align: right;">
- <el-button size="mini" @click="addRowByMaterial">娣诲姞琛�</el-button>
+ <el-button size="small" @click="addRowByMaterial">娣诲姞琛�</el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-table :data="materialForm.tableList" border max-height="470"
- style="width:100%;text-align: left;margin: 0;padding: 0;"
:cell-style="{height:'20px',textAlign:'left'}"
:header-cell-style="{height:'20px'}">
<el-table-column label="渚涘簲鍟嗗悕绉�">
@@ -229,69 +257,78 @@
</el-col>
</el-row>
</el-form>
- <div style="width:100%;margin-top: 20px;margin-left:75%">
- <span slot="footer" class="dialog-footer" >
- <el-button type="primary" @click="confirmAdd('materialForm')">纭� 瀹�</el-button>
- <el-button @click="bomAddModelVisible = false">鍙� 娑�</el-button>
- </span>
- </div>
- </div>
+ <span slot="footer" class="dialog-footer" >
+ <el-button type="primary" @click="confirmAdd('materialForm')">纭� 瀹�</el-button>
+ <el-button @click="materialVisible = false">鍙� 娑�</el-button>
+ </span>
+ </el-dialog>
<!-- 鐢熶骇宸ヨ壓 -->
- <div v-if="typeselect == 3">
+ <el-dialog title="BOM鏂板" :visible.sync="productVisible" width="45%">
<el-form :model="productForm" :inline="true" label-position="right"
:rules="productRules" ref="productForm" label-width="90px">
- <el-form-item label="宸ュ簭:" prop="profather">
- <el-select v-model="productForm.profather"
- style="width:200px;" @change="changeProduct"
- placeholder="璇烽�夋嫨宸ュ簭">
- <el-option v-for="(item,index) in productFormList" :key="index"
- :value="item.name" :label="item.name"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="宸ヨ壓鍚嶇О:" prop="protechnologyId">
- <el-select placeholder="璇烽�夋嫨宸ヨ壓鍚嶇О"
- style="width:200px;" @change="getProductDeviceList"
- v-model="productForm.protechnologyId">
- <el-option v-for="(item,index) in proIdList" :key="index"
- :value="item.id" :label="item.name"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璁惧:" prop="device">
- <el-select placeholder="璇烽�夋嫨璁惧"
- style="width:200px;"
- v-model="productForm.device">
- <el-option v-for="(item,index) in productDeviceList" :key="index"
- :value="item.device" :label="item.device"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="椤圭洰:" prop="productFather">
- <el-select placeholder="璇烽�夋嫨椤圭洰"
- style="width:200px;" @change="changeProductFather"
- v-model="productForm.productFather">
- <el-option v-for="(item,index) in productProjectList" :key="index"
- :value="item.name" :label="item.name"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鎸囨爣:" prop="product">
- <el-select placeholder="璇烽�夋嫨鎸囨爣"
- style="width:200px;" @change="changeProProduct"
- v-model="productForm.product">
- <el-option v-for="(item,index) in proProductList" :key="index"
- :value="item.name" :label="item.name"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍗曚綅:" prop="unit">
- <el-input style="width:200px;" disabled v-model="productForm.unit"/>
- </el-form-item>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="宸ュ簭:" prop="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>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="宸ヨ壓鍚嶇О:" prop="protechnologyId">
+ <el-select placeholder="璇烽�夋嫨宸ヨ壓鍚嶇О" @change="getProductDeviceList"
+ v-model="productForm.protechnologyId" size="small">
+ <el-option v-for="(item,index) in proIdList" :key="index"
+ :value="item.id" :label="item.name"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="璁惧:" prop="device">
+ <el-select placeholder="璇烽�夋嫨璁惧" size="small"
+ v-model="productForm.device">
+ <el-option v-for="(item,index) in productDeviceList" :key="index"
+ :value="item.device" :label="item.device"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="椤圭洰:" prop="productFather">
+ <el-select placeholder="璇烽�夋嫨椤圭洰" size="small" @change="changeProductFather"
+ v-model="productForm.productFather">
+ <el-option v-for="(item,index) in productProjectList" :key="index"
+ :value="item.name" :label="item.name"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鎸囨爣:" prop="product">
+ <el-select placeholder="璇烽�夋嫨鎸囨爣" size="small" @change="changeProProduct"
+ v-model="productForm.product">
+ <el-option v-for="(item,index) in proProductList" :key="index"
+ :value="item.name" :label="item.name"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍗曚綅:" prop="unit">
+ <el-input style="width:100%" size="small" disabled v-model="productForm.unit"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
- <div style="width:100%;text-align: right;">
- <span slot="footer" class="dialog-footer" >
- <el-button type="primary" @click="confirmAdd('productForm')">纭� 瀹�</el-button>
- <el-button @click="bomAddModelVisible = false">鍙� 娑�</el-button>
- </span>
- </div>
- </div>
+ <span slot="footer" class="dialog-footer" >
+ <el-button type="primary" @click="confirmAdd('productForm')">纭� 瀹�</el-button>
+ <el-button @click="productVisible = false">鍙� 娑�</el-button>
+ </span>
</el-dialog>
+
<!-- 宸︿晶鐐瑰嚮+鎸夐挳 -->
<el-dialog title="BOM鏂板" :visible.sync="bomLeftAdd" width="29%">
<el-form ref="leftAdd" :model="leftAdd">
@@ -357,7 +394,6 @@
//瀛愮粍浠朵紶鐨刬d鍒楄〃
childIds:[],
//宸ュ簭鍒楄〃
- technologyIdList:[],
fatherList:[],
deviceList:[],
technologyForm:{
@@ -374,6 +410,7 @@
},
//鎶�鏈寚鏍�
targetFormList:[],
+ technologyIdList:[],
projectList:[],
targetForm:{
pfather:'',
@@ -437,7 +474,10 @@
searchName: "",// 鏌ヨ鏉′欢-鍚嶇О
checkTreeNode: {},// 鐐瑰嚮閫変腑鏍戣妭鐐�
tableData: [],
- bomAddModelVisible: false,// 鎺у埗bom鏂板妯℃�佹鏄惁鏄剧ず
+ technologyVisible: false,// 鎺у埗宸ヨ壓璺嚎鏂板妯℃�佹鏄惁鏄剧ず
+ targetVisible: false,// 鎺у埗鎶�鏈寚鏍囨柊澧炴ā鎬佹鏄惁鏄剧ず
+ materialVisible: false,// 鎺у埗鐗╂枡娓呭崟鏂板妯℃�佹鏄惁鏄剧ず
+ productVisible: false,// 鎺у埗鐢熶骇宸ヨ壓鏂板妯℃�佹鏄惁鏄剧ず
bomLeftAdd: false,
bomRightUp: false,
bomRightDl: false,
@@ -488,7 +528,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]
@@ -506,7 +565,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=>{
@@ -522,7 +588,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{
//鏂板鏍囧噯鍨嬪彿
@@ -542,7 +615,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={
@@ -556,7 +636,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()
})
}
@@ -687,16 +773,27 @@
}).catch(error=>{
this.$message.error(error.message);
})
- this.bomAddModelVisible = false;
+ this.technologyVisible = false;
+ this.targetVisible = false;
+ this.materialVisible = false;
+ this.productVisible = false;
},
clearBomAddModel(){
if(this.typeselect == 0){
+ this.deviceList=[];
this.$refs["technologyForm"].resetFields();
}else if(this.typeselect == 1){
+ this.technologyIdList = [];
+ this.projectList = [];
this.$refs["targetForm"].resetFields();
}else if(this.typeselect == 2){
+ this.mIdList = [];
this.$refs["materialForm"].resetFields();
}else{
+ this.productDeviceList=[];
+ this.proIdList=[];
+ this.productProjectList=[];
+ this.proProductList=[];
this.$refs["productForm"].resetFields();
}
},
@@ -826,12 +923,20 @@
})
},
showBomAddModel(){
- this.getFatherList();
- this.getDeviceList();
- this.getTargetFormList();
- this.getMaterialFormList();
- this.getProductFormList();
- this.bomAddModelVisible = true
+ if(this.typeselect == 0){
+ this.getFatherList();
+ this.getDeviceList();
+ this.technologyVisible = true
+ }else if(this.typeselect == 1){
+ this.getTargetFormList();
+ this.targetVisible = true
+ }else if(this.typeselect == 2){
+ this.getMaterialFormList();
+ this.materialVisible = true
+ }else{
+ this.getProductFormList();
+ this.productVisible = true
+ }
},
startLeftAdd(){
@@ -906,9 +1011,7 @@
},
handleNodeClick(val) {//鏍戠殑鍊�
if(val.code==='[5]'&&val.children===undefined){
- console.log(val);
this.returntree = val
- this.typeselect=0
this.selectVersion()
}
},
@@ -927,7 +1030,9 @@
return this.verdata[0]
})
this.character=v
- this.version2="v"+v
+ if(this.character != undefined){
+ this.version2="v"+v
+ }
this.selectAll()
},
//鍙充晶鏁版嵁
@@ -942,12 +1047,14 @@
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);
}
@@ -975,6 +1082,29 @@
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: '鎴愬搧',
+ })
+ }
+ }
+ console.log(this.list);
this.selectDataList()
// 榛樿绗竴涓簲绾ц妭鐐规悳绱紝鏂板閰嶇疆椤�
const treeOptions = JSON.parse(JSON.stringify(this.list));
@@ -1005,10 +1135,10 @@
},
filterNode(value, data) {
if (!value) return true;
- return data.label.indexOf(value) !== -1;
+ return data.name.indexOf(value) !== -1;
},
remove(node, data) {
- this.$confirm("鏄惁鍒犻櫎", "璀﹀憡", {
+ this.$confirm("鏄惁鍒犻櫎", "鎻愮ず", {
type: "warning"
}).then(res => {
const parent = node.parent;
@@ -1060,16 +1190,23 @@
}
},
watch:{
+ search(val) {
+ this.$refs.tree.filter(val);
+ },
leftAdd: {
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]
@@ -1100,37 +1237,42 @@
}
},
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()
+ },
+ bomLeftAdd:{
+ handler(newval,oldVal){
+ if(newval){
+ let treeOptions = JSON.parse(JSON.stringify(this.list));
+ this.replaceProp(treeOptions)
+ this.formTypeOptions=treeOptions
+ this.restaurants=this.loadFatherType()
+ }
+ }
+ },
+ technologyVisible(newVal){
+ if(!newVal){
+ this.clearBomAddModel();
+ }
+ },
+ targetVisible(newVal){
+ if(!newVal){
+ this.clearBomAddModel();
+ }
+ },
+ materialVisible(newVal){
+ if(!newVal){
+ this.clearBomAddModel();
+ }
+ },
+ productVisible(newVal){
+ if(!newVal){
+ this.clearBomAddModel();
}
}
- },
- bomAddModelVisible(newVal){
- if(!newVal){
- this.clearBomAddModel();
- }
- }
}
}
</script>
-
<style scoped>
-
-.standard .bom-add-model{
- width: 100%;
-}
-
-.standard .bom-add-model form{
- width: 90%;
- margin-left: 5%;
-}
.standard .title .el-button {
height: 32px;
@@ -1139,6 +1281,11 @@
padding: 0 12px;
}
+ .contentTable{
+ width:98%;
+ margin-left:1%;
+}
+
.standard .title {
margin-bottom: 10px;
padding: 0 20px;
--
Gitblit v1.9.3