From a15fb376f2a52a36be5ce2f1eeaf252a509dfcb7 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 九月 2023 14:45:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/standard.vue | 587 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 430 insertions(+), 157 deletions(-)
diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue
index 56f6ba2..2018424 100644
--- a/src/components/view/standard.vue
+++ b/src/components/view/standard.vue
@@ -5,9 +5,8 @@
<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="showBomAddModel">鏂板</el-button>
+ @click="bomAddModelVisible = true">鏂板</el-button>
<el-button icon="el-icon-plus">鏂板鐗堟湰</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>
@@ -33,8 +32,6 @@
</div>
</el-tree>
</div>
-
-
<div class="right">
<div class="choose">
<span>绫诲瀷锛�</span>
@@ -46,180 +43,253 @@
<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: 24px;"
+ <el-input v-model="searchName" size="small" placeholder="璇疯緭鍏�" style="width: 224px;margin-right: 50px;"
clearable></el-input>
- <span>{{ tableType == 1 ? '鐗堟湰锛�' : '鐗堟湰锛�' }}</span>
- <el-select size="small" v-model="VER" @change="verevent" style="width: 280px;" placeholder="璇烽�夋嫨">
+ <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-option>
</el-select>
- <el-button style="margin-left:10px;" size="mini" @click="() => { searchName = ''; selectProductTableData() }"><span>閲� 缃�</span></el-button>
+ <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>
</div>
- <div v-if="this.typeselect == 0">
+ <div class="contentTable" v-if="this.typeselect == 0">
<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>
+ <bom :tableType="tableType" :tableData="tableData"></bom>
</div>
- <div v-if="this.typeselect == 3">
- <product :tableType="tableType" :tableData="tableData"></product>
- </div>
+ <div v-if="this.typeselect == 3">鐢熶骇宸ヨ壓</div>
</div>
</div>
<div class="bom-add-model">
- <el-dialog title="BOM鏂板" :visible.sync="bomAddModelVisible" width="35%">
+ <el-dialog title="BOM鏂板" :visible.sync="bomAddModelVisible" width="45%">
<!-- 宸ヨ壓璺嚎 -->
- <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="璇疯緭鍏ユ垨閫夋嫨宸ュ簭">
+ <div v-if="typeselect == 0">
+ <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="name" width="250">
- <el-input placeholder="璇疯緭鍏ュ伐鑹哄悕绉�" style="width:200px;"
- v-model="technologyForm.name"></el-input>
+ <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" width="250">
- <el-select placeholder="璇烽�夋嫨璁惧缁�"
- style="width:200px;"
+ <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" width="250">
- <el-input style="width:200px;" v-model.number="technologyForm.productionQuota" placeholder="璇疯緭鍏ョ敓浜у畾棰�" />
+ <el-form-item label="鐢熶骇瀹氶:" prop="productionQuota">
+ <el-input id="productionQuota" size="small" clearable v-model.number="technologyForm.productionQuota" placeholder="璇疯緭鍏ョ敓浜у畾棰�" />
</el-form-item>
</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>
<!-- 鎶�鏈寚鏍� -->
<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 :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="name" width="250">
+ <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="dg" width="250">
- <el-input style="width:200px;" v-model="targetForm.internal" placeholder="璇疯緭鍏ュ崟浣�"/>
+ <el-form-item label="鍐呮帶鍊�:" prop="internal">
+ <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 label="鏍囧噯鍊�:" prop="required">
+ <el-input style="width:200px;" v-model="targetForm.required" placeholder="璇疯緭鍏ユ爣鍑嗗��"/>
</el-form-item>
</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>
<!-- 鐗╂枡娓呭崟 -->
<div v-if="typeselect == 2">
- <el-form :model="materialForm" class="demo-form-inline" label-position="right"
- label-width="80px">
- <el-row>
+ <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="father" width="250">
- <el-input style="width:200px;" v-model="materialForm.pname" placeholder="璇疯緭鍏ュ崟浣�"/>
- </el-form-item>
+ <el-form-item label="宸ュ簭:" prop="mfather">
+ <el-select placeholder="璇烽�夋嫨宸ュ簭" @change="changeMName"
+ style="width:100%;" v-model="materialForm.mfather">
+ <el-option v-for="(item,index) in materialFormList" :key="index"
+ :label="item.name" :value="item.name" ></el-option>
+ </el-select>
+ </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-col :span="12">
+ <el-form-item label="宸ヨ壓鍚嶇О:" prop="mtechnologyId">
+ <el-select placeholder="璇烽�夋嫨宸ヨ壓鍚嶇О" style="width:100%;"
+ v-model="materialForm.mtechnologyId">
+ <el-option v-for="(item,index) in mIdList" :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="鏉愭枡淇℃伅"></el-form-item>
+ <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" style="text-align: right;">娣诲姞琛�</el-button>
+ <el-button size="mini" @click="addRowByMaterial">娣诲姞琛�</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 :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="渚涘簲鍟嗗悕绉�">
+ <template slot-scope="scope">
+ <el-input size="mini" v-model="scope.row.supplier"
+ placeholder="璇疯緭鍏�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="璐ㄩ噺杩芥函鍙�">
+ <template slot-scope="scope">
+ <el-input size="mini" v-model="scope.row.qualityTraceability"
+ placeholder="璇疯緭鍏�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍘熸潗鏂欏悕绉�">
+ <template slot-scope="scope">
+ <el-input size="mini" v-model="scope.row.name"
+ placeholder="璇疯緭鍏�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="瑙勬牸鍨嬪彿">
+ <template slot-scope="scope">
+ <el-input size="mini" v-model="scope.row.specifications"
+ placeholder="璇疯緭鍏�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍗曚綅">
+ <template slot-scope="scope">
+ <el-input size="mini" v-model="scope.row.unit"
+ placeholder="璇疯緭鍏�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏁伴噺">
+ <template slot-scope="scope">
+ <el-input size="mini" v-model="scope.row.num"
+ placeholder="璇疯緭鍏�"></el-input>
+ </template>
+ </el-table-column>
</el-table>
</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>
<!-- 鐢熶骇宸ヨ壓 -->
<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-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="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-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="dg" width="250">
+ <el-form-item label="璁惧:" prop="device">
<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>
+ 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="dg" width="250">
+ <el-form-item label="椤圭洰:" prop="productFather">
<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>
+ 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="unit" width="250">
- <el-input style="width:200px;" v-model="technologyForm.unit" placeholder="璇疯緭鍏ュ崟浣�"/>
+ <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="pq" width="250">
- <el-input style="width:200px;" v-model="technologyForm.pq" placeholder="璇疯緭鍏ユ寚鏍�" />
+ <el-form-item label="鍗曚綅:" prop="unit">
+ <el-input style="width:200px;" disabled v-model="productForm.unit"/>
</el-form-item>
</el-form>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="bomAddModelVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="confirmAdd('boomForm')">纭� 瀹�</el-button>
- </span>
+ <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>
</el-dialog>
<!-- 宸︿晶鐐瑰嚮+鎸夐挳 -->
<el-dialog title="BOM鏂板" :visible.sync="bomLeftAdd" width="29%">
@@ -245,16 +315,6 @@
<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>
@@ -272,40 +332,100 @@
<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 bom from "./standard-table/bom.vue"
import bomClickAdd from '@/components/view/standard-box/bomClickAdd'
export default {
- components: { technology,material,target,product,bomClickAdd },
+ components: { technology,material,bomClickAdd },
+
data() {
+ var checkPq = (rule,value,callback)=>{
+ if(value!='' && !Number.isInteger(value)){
+ return callback(new Error('璇疯緭鍏ユ暟瀛楀��'));
+ }
+ callback();
+ };
+ var checkVal = (rule,value,callback)=>{
+ let arr = [">","<","="];
+ if(value!='' && arr.indexOf(value.substring(0,1))==-1){
+ callback(new Error("寮�澶撮渶鍖呭惈 > 鎴� < 鎴� = "))
+ }
+ callback();
+ };
return {
//宸ュ簭鍒楄〃
+ technologyIdList:[],
fatherList:[],
- //璁惧缁勫垪琛�
deviceList:[],
technologyForm:{
- father:'',
- name:'',
+ tefather:'',
+ tename:'',
deviceGroup:'',
productionQuota:''
},
+ technologyRules:{
+ tefather:{required:true,message:'宸ュ簭涓嶈兘涓虹┖',trigger:'change'},
+ tename:{required:true,message:'宸ヨ壓鍚嶇О涓嶈兘涓虹┖',trigger:'blur'},
+ deviceGroup:{required:true,message:'璁惧缁勪笉鑳戒负绌�',trigger:'change'},
+ productionQuota:{validator:checkPq,trigger:'change'}
+ },
+ //鎶�鏈寚鏍�
+ targetFormList:[],
+ projectList:[],
targetForm:{
- pname:'',
+ pfather:'',
+ father: '',
+ technologyId:'',
+ name:'',
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'}
- ]
+ targetRules:{
+ pfather:{required:true,message:'宸ュ簭涓嶈兘涓虹┖',trigger:'change'},
+ technologyId:{required:true,message:'宸ヨ壓鍚嶇О涓嶈兘涓虹┖',trigger:'change'},
+ 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'}
},
+ //鐗╂枡娓呭崟
+ materialForm:{
+ mfather: '',
+ mtechnologyId:'',
+ tableList:[]
+ },
+ materialFormList:[],
+ mIdList:[],
+ materialRules:{
+ mfather:{required:true,message:'宸ュ簭涓嶈兘涓虹┖',trigger:'change'},
+ mtechnologyId:{required:true,message:'宸ヨ壓鍚嶇О涓嶈兘涓虹┖',trigger:'change'},
+ },
+ //鐢熶骇宸ヨ壓
+ productForm:{
+ profather:'',
+ protechnologyId:'',
+ productFather:'',
+ product:'',
+ unit:'',
+ device:''
+ },
+ //璁惧鍒楄〃
+ productDeviceList:[],
+ //宸ヨ壓鍚嶇О鍒楄〃
+ proIdList:[],
+ //椤圭洰鍒楄〃
+ productProjectList:[],
+ //鎸囨爣鍒楄〃
+ proProductList:[],
+ productRules:{
+ profather:{required:true,message:'宸ュ簭涓嶈兘涓虹┖',trigger:'change'},
+ protechnologyId:{required:true,message:'宸ヨ壓鍚嶇О涓嶈兘涓虹┖',trigger:'change'},
+ productFather:{required:true,message:'椤圭洰涓嶈兘涓虹┖',trigger:'change'},
+ product:{required:true,message:'鎸囨爣涓嶈兘涓虹┖',trigger:'change'},
+ device:{required:true,message:'璁惧涓嶈兘涓虹┖',trigger:'change'}
+ },
+ productFormList:[],
// BOM鏍戞暟鎹粨鏋�
list: [],
search: null,
@@ -330,7 +450,7 @@
name: null,
specifications: null
},
- VER: {},
+ version2: {},
verdata: {},
character: 0,
restaurants: [],
@@ -339,19 +459,10 @@
isLeftAdd: true
}
},
- // watch: {
- // search(val) {
- // this.$refs.tree.filter(val);
- // },
- // tableType(val){
- // this.selectProductTableData()
- // }
- // },
mounted() {
this.tableType=0
this.selectMaterialTree()
this.selectVersion()
- console.log(this.formTypeOptions);
},
methods: {
changeLeftAdd(){
@@ -461,33 +572,178 @@
this.$refs[formName].resetFields();
},
leftAddBom(){
-
+
},
+ //鍙充晶bom,纭鏂板
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({
+ let type = this.typeselect;
+ let obj = {}
+ if(type == 0){
+ obj = {
+ specificationsId: Number.parseInt(this.returntree.id),
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;
+ father: this.technologyForm.tefather,
+ name: this.technologyForm.tename,
+ productionQuota: Number.parseInt(this.technologyForm.productionQuota),
+ }
+ this.submitBomAdd(this.$api.url.addTechnology,obj);
+ }else if(type == 1){
+ this.submitBomAdd(this.$api.url.addProductByStandard,this.targetForm);
+ }else if(type == 2){
+ obj = {
+ mbomDto2List:this.materialForm.tableList,
+ technologyId:this.materialForm.mtechnologyId
+ }
+ this.submitBomAdd(this.$api.url.addMBomByStandard,obj);
+ }else if(type == 3){
+ let form = this.productForm;
+ obj = {
+ device: form.device,
+ product: form.product,
+ productFather: form.productFather,
+ technologyId: form.protechnologyId,
+ unit: form.unit
+ }
+ this.submitBomAdd(this.$api.url.addTechniqueByStandard,obj);
+ }else{
+ return
+ }
}
})
},
- //鑾峰彇宸ュ簭鍒楄〃
+ submitBomAdd(url,data){
+ this.$axios.post(
+ url,data,
+ {headers: { "Content-Type": "application/json" }}
+ ).then(res=>{
+ this.selectAll();
+ this.$message.success(res.message);
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
+ this.bomAddModelVisible = false;
+ },
+ clearBomAddModel(){
+ if(this.typeselect == 0){
+ this.$refs["technologyForm"].resetFields();
+ }else if(this.typeselect == 1){
+ this.$refs["targetForm"].resetFields();
+ }else if(this.typeselect == 2){
+ this.$refs["materialForm"].resetFields();
+ }else{
+ this.$refs["productForm"].resetFields();
+ }
+ },
+ changeTechnologyId(val){
+ this.$axios.get(this.$api.url.chooseFatherByStandard,{
+ params:{technologyId : val}
+ }).then(res=>{
+ this.projectList = res.data;
+ }).catch(error=>{
+ this.$message.error(error.message);
+ });
+ },
+ changeFather(val){
+ let arr = this.targetFormList.filter(item=>{
+ return item.name == val;
+ });
+ if(arr != undefined || arr.children != null){
+ this.technologyIdList = arr[0].children;
+ }
+ },
+ //鐗╂枡娓呭崟--娣诲姞琛�
+ addRowByMaterial(){
+ let obj = {
+ "name": "",
+ "num": null,
+ "qualityTraceability": "",
+ "specifications": "",
+ "supplier": "",
+ "unit": ""
+ }
+ this.materialForm.tableList.push(obj);
+ },
+ //鐗╂枡娓呭崟--鑾峰彇宸ュ簭锛屽伐鑹哄垪琛�
+ getMaterialFormList(){
+ this.$axios.get(this.$api.url.chooseTechByMBom,{
+ params:{specificationsId : this.returntree.id}
+ }).then(res=>{
+ this.materialFormList = res.data;
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
+ },
+ changeMName(val){
+ let arr = this.materialFormList.filter(item=>{
+ return item.name == val;
+ })
+ this.mIdList = arr[0].children;
+ },
+ //鎶�鏈寚鏍�--鑾峰彇宸ュ簭锛屽伐鑹哄垪琛�
+ getTargetFormList(){
+ this.$axios.get(this.$api.url.chooseTechByStandard,{
+ params:{specificationsId : this.returntree.id}
+ }).then(res=>{
+ this.targetFormList = res.data;
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
+ },
+ //1.鐢熶骇宸ヨ壓-->閫夋嫨宸ュ簭,宸ヨ壓
+ getProductFormList(){
+ this.$axios.get(this.$api.url.chooseTechByProduct,{
+ params:{specificationsId : this.returntree.id}
+ }).then(res=>{
+ this.productFormList = res.data;
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
+ },
+ //2.閫夋嫨宸ュ簭锛岃幏鍙栧伐鑹哄悕绉�
+ changeProduct(val){
+ let arr = this.productFormList.filter(item=>{
+ return item.name == val
+ });
+ this.proIdList = arr[0].children;
+ },
+ //3.鐢熶骇宸ヨ壓-->閫夋嫨璁惧
+ getProductDeviceList(val){
+ this.$axios.get(this.$api.url.chooseDevByProduct,{
+ params:{technologyId : val}
+ }).then(res=>{
+ this.productDeviceList = res.data;
+ this.getProjectFormList(val);
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
+ },
+ //4.鐢熶骇宸ヨ壓--鑾峰彇椤圭洰鍒楄〃
+ getProjectFormList(val){
+ this.$axios.get(this.$api.url.chooseProByProduct,{
+ params:{technologyId : val}
+ }).then(res=>{
+ this.productProjectList = res.data;
+ }).catch(error=>{
+ this.$message.error(error.message);
+ })
+ },
+ //5.閫夋嫨椤圭洰鍒楄〃,鑾峰彇鎸囨爣
+ changeProductFather(val){
+ let arr = this.productProjectList.filter(item=>{
+ return item.name == val;
+ })
+ this.proProductList = arr[0].children;
+ },
+ //閫夋嫨鎸囨爣鍒楄〃
+ changeProProduct(val){
+ let arr = this.proProductList.filter(item=>{
+ return item.name == val;
+ })
+ this.productForm.unit = arr[0].unit;
+ },
+ //宸ヨ壓璺嚎--鑾峰彇宸ュ簭鍒楄〃
getFatherList(){
this.$axios.get(this.$api.url.chooseFather,{
params:{specificationsId : this.returntree.id}
@@ -497,7 +753,7 @@
this.$message.error(error.message);
})
},
- //鑾峰彇璁惧缁勫垪琛�
+ //宸ヨ壓璺嚎--鑾峰彇璁惧缁勫垪琛�
getDeviceList(){
this.$axios.get(this.$api.url.chooseDevice).then(res=>{
this.deviceList = res.data;
@@ -508,6 +764,9 @@
showBomAddModel(){
this.getFatherList();
this.getDeviceList();
+ this.getTargetFormList();
+ this.getMaterialFormList();
+ this.getProductFormList();
this.bomAddModelVisible = true
},
startLeftAdd(){
@@ -577,6 +836,7 @@
TYPE(val) {//绫诲瀷.鏁版嵁
// console.log(val);
this.typeselect = val
+
// console.log(this.typeselect);
this.selectVersion()
},
@@ -603,7 +863,7 @@
return this.verdata[0]
})
this.character=v
- this.VER="v"+v
+ this.version2="v"+v
this.selectAll()
},
//鍙充晶鏁版嵁
@@ -786,6 +1046,11 @@
this.restaurants=this.loadFatherType()
}
}
+ },
+ bomAddModelVisible(newVal){
+ if(!newVal){
+ this.clearBomAddModel();
+ }
}
}
}
@@ -793,7 +1058,15 @@
<style scoped>
-.standard {}
+
+.standard .bom-add-model{
+ width: 100%;
+}
+
+.standard .bom-add-model form{
+ width: 90%;
+ margin-left: 5%;
+}
.standard .title .el-button {
height: 32px;
--
Gitblit v1.9.3