From 4c5c20a7c03539104df74072b1b8a81b51c19ab8 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 14 九月 2023 10:42:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/components/view/standard.vue | 955 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 897 insertions(+), 58 deletions(-) diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue index 2d72360..2a3269a 100644 --- a/src/components/view/standard.vue +++ b/src/components/view/standard.vue @@ -5,30 +5,33 @@ <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> - <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> + @click="showBomAddModel">鏂板</el-button> + <el-button icon="el-icon-plus" @click="addVersionBtn">鏂板鐗堟湰</el-button> + <el-button @click="deleteDataBtn" 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> </div> </el-tree> </div> - - <div class="right"> <div class="choose"> <span>绫诲瀷锛�</span> @@ -40,10 +43,10 @@ <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 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> @@ -53,31 +56,274 @@ </div> <div class="contentTable" v-if="this.typeselect == 0"> - <technology :tableType="tableType" :tableData="tableData"></technology> + <technology @childData="getChildData" :tableType="tableType" :tableData="tableData"></technology> </div> - <div v-if="this.typeselect == 1">鎶�鏈寚鏍�</div> + <div v-if="this.typeselect == 1"> + <target @childData="getChildData" :tableType="tableType" :tableData="tableData"></target> + </div> <div v-if="this.typeselect == 2"> - <material :tableType="tableType" :tableData="tableData"></material> + <material @childData="getChildData" :tableType="tableType" :tableData="tableData"></material> </div> - <div v-if="this.typeselect == 3">鐢熶骇宸ヨ壓</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 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="30%"> - <el-form> - + <el-dialog title="BOM鏂板" :visible.sync="bomAddModelVisible" width="45%"> + <!-- 宸ヨ壓璺嚎 --> + <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="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-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" 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-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" 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"> + <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"> + <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="鏉愭枡淇℃伅" 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-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="渚涘簲鍟嗗悕绉�"> + <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="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-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> + </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="bomAddModelVisible = false">鍙� 娑�</el-button> - <el-button type="primary" @click="bomAddModelVisible = false">纭� 瀹�</el-button> + <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="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> @@ -87,43 +333,542 @@ <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() { + 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 { + //瀛愮粍浠朵紶鐨刬d鍒楄〃 + childIds:[], + //宸ュ簭鍒楄〃 + technologyIdList:[], + fatherList:[], + deviceList:[], + technologyForm:{ + 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:{ + pfather:'', + father: '', + technologyId:'', + name:'', + unit:'', + internal:'', + required: '' + }, + 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, - tableType: 1, // 琛ㄦ牸绫诲瀷 1锛氭妧鏈寚鏍囷紝0锛氬伐鑹鸿矾绾� + tableType: 0, // 琛ㄦ牸绫诲瀷 1锛氭妧鏈寚鏍囷紝0锛氬伐鑹鸿矾绾� searchName: "",// 鏌ヨ鏉′欢-鍚嶇О checkTreeNode: {},// 鐐瑰嚮閫変腑鏍戣妭鐐� tableData: [], bomAddModelVisible: false,// 鎺у埗bom鏂板妯℃�佹鏄惁鏄剧ず + bomLeftAdd: false, + bomRightUp: false, + bomRightDl: false, + formTypeOptions: null, typeselect: 0, - returntree: { - id:28, - }, + returntree: {id:28}, version: {}, - VER: {}, + leftAdd:{ + type: [], + father: null, + standard: null, + name: null, + specifications: null + }, + version2: {}, verdata: {}, character: 0, + restaurants: [], + bomName:[], + bomStandard:[], + isLeftAdd: true } }, - // watch: { - // search(val) { - // this.$refs.tree.filter(val); - // }, - // tableType(val){ - // this.selectProductTableData() - // } - // }, mounted() { + this.tableType=0 this.selectMaterialTree() - // this.selectAll() this.selectVersion() }, 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(){ + + }, + //鑾峰彇瀛愮粍浠舵暟鎹� + getChildData(data){ + this.childIds = data; + }, + //鍒犻櫎鎸夐挳 + deleteDataBtn(){ + let ids; + let url; + ids = this.childIds.filter(item=>{ + return item != undefined; + }); + if(ids.length < 1){ + this.$message.error("璇峰厛閫夋嫨鏁版嵁锛�"); + return; + } + switch(this.typeselect){ + case 0: + url = this.$api.url.delAllByTechnology; + break; + case 1: + url = this.$api.url.delAllByTarget; + break; + case 2: + url = this.$api.url.delAllByMBom; + break; + case 3: + url = this.$api.url.delAllByProduct; + break; + } + this.$confirm('纭鍒犻櫎宸查�変腑鐨勬暟鎹悧', '鍒犻櫎', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning' + }).then(() => { + this.$axios.post(url,{ + ids : ids.join(",") + }).then(res=>{ + this.selectAll(); + this.$message.success(res.message); + }).catch(error=>{ + this.$message.error(error.message); + }) + }).catch(() => {}); + }, + //鏂板鐗堟湰 + addVersionBtn(){ + this.$confirm('纭鏂板鐗堟湰鍚�', '鏂板鐗堟湰', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'info' + }).then(() => { + this.$axios.post(this.$api.url.addVersion,{ + specificationsId : this.returntree.id, + version : this.version2.substring(1,2), + }).then(res=>{ + this.selectVersion(); + this.$message.success(res.message); + }).catch(error=>{ + this.$message.error(error.message); + }) + }).catch(() => {}); + }, + //鍙充晶bom,纭鏂板 + confirmAdd(formName){ + this.$refs[formName].validate(valid=>{ + if(valid){ + let type = this.typeselect; + let obj = {} + if(type == 0){ + obj = { + specificationsId: Number.parseInt(this.returntree.id), + deviceGroup: this.technologyForm.deviceGroup, + 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} + }).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.getTargetFormList(); + this.getMaterialFormList(); + this.getProductFormList(); + 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]' @@ -153,18 +898,22 @@ }, 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, @@ -174,8 +923,12 @@ this.version = this.verdata.map(el => { return el = `v${el}` }) - console.log(this.verdata); + // console.log("鐗堟湰"); + return this.verdata[0] }) + this.character=v + this.version2="v"+v + this.selectAll() }, //鍙充晶鏁版嵁 selectAll() { @@ -187,16 +940,23 @@ } }).then(res => { let arr = res.data; - for(var i=0;i<arr.length;i++){ - arr[i].id = "0" + i; - } + 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; @@ -205,8 +965,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 = '鎴愬搧' @@ -282,16 +1042,94 @@ 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() + } + } + }, + bomAddModelVisible(newVal){ + if(!newVal){ + this.clearBomAddModel(); + } + } } } </script> <style scoped> -.standard {} -.standard .contentTable{ +.standard .bom-add-model{ + width: 100%; +} + +.standard .bom-add-model form{ + width: 90%; + margin-left: 5%; } .standard .title .el-button { @@ -320,6 +1158,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