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 | 417 +++++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 318 insertions(+), 99 deletions(-) diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue index 0586a40..2a3269a 100644 --- a/src/components/view/standard.vue +++ b/src/components/view/standard.vue @@ -5,9 +5,9 @@ <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 @click="bomRightDl=true" 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> @@ -32,8 +32,6 @@ </div> </el-tree> </div> - - <div class="right"> <div class="choose"> <span>绫诲瀷锛�</span> @@ -45,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> @@ -58,16 +56,17 @@ </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"> - <target :tableType="tableType" :tableData="tableData"></target> + <target @childData="getChildData" :tableType="tableType" :tableData="tableData"></target> </div> <div v-if="this.typeselect == 2"> - <bom :tableType="tableType" :tableData="tableData"></bom> + <material @childData="getChildData" :tableType="tableType" :tableData="tableData"></material> </div> - <div v-if="this.typeselect == 3">鐢熶骇宸ヨ壓</div> - + <div v-if="this.typeselect == 3"> + <product @childData="getChildData" :tableType="tableType" :tableData="tableData"></product> + </div> </div> </div> @@ -155,45 +154,82 @@ <!-- 鐗╂枡娓呭崟 --> <div v-if="typeselect == 2"> <el-form :model="materialForm" label-position="right" - :rules="materialRules" ref="materialForm" label-width="80px"> - <el-row> + :rules="materialRules" ref="materialForm" label-width="90px"> + <el-row :gutter="100"> <el-col :span="12"> - <el-form-item label="瑙勬牸鍨嬪彿:" 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="浜у搧澶х被:" 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%;text-align: right;"> + <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> @@ -203,52 +239,49 @@ <!-- 鐢熶骇宸ヨ壓 --> <div v-if="typeselect == 3"> <el-form :model="productForm" :inline="true" label-position="right" - label-width="80px"> - <el-form-item label="宸ュ簭:" width="250"> - <el-select v-model="productForm.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> + :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="宸ヨ壓鍚嶇О:" width="250"> - <el-select placeholder="璇疯緭鍏ユ垨閫夋嫨宸ヨ壓鍚嶇О" - style="width:200px;" - v-model="productForm.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="璁惧:" width="250"> + <el-form-item label="璁惧:" prop="device"> <el-select placeholder="璇烽�夋嫨璁惧" style="width:200px;" - v-model="productForm.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="椤圭洰:" width="250"> + <el-form-item label="椤圭洰:" prop="productFather"> <el-select placeholder="璇烽�夋嫨椤圭洰" - style="width:200px;" - v-model="productForm.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="鍗曚綅:" width="250"> - <el-input style="width:200px;" v-model="productForm.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="鎸囨爣:" width="250"> - <el-input style="width:200px;" v-model="productForm.pq" placeholder="璇疯緭鍏ユ寚鏍�" /> + <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;"> @@ -300,10 +333,11 @@ <script> import technology from "./standard-table/technology.vue" import material from "./standard-table/material.vue" -// import bom from "./standard-table/bom.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,bomClickAdd }, + components: { technology,material,target,product,bomClickAdd }, data() { var checkPq = (rule,value,callback)=>{ @@ -320,14 +354,11 @@ callback(); }; return { - //鎶�鏈寚鏍�-鏂板-宸ュ簭锛屽伐鑹轰笅鎷夋鏁版嵁 - targetFormList:[], - technologyIdList:[], - //鎶�鏈寚鏍�-鏂板-椤圭洰涓嬫媺妗嗘暟鎹� - projectList:[], + //瀛愮粍浠朵紶鐨刬d鍒楄〃 + childIds:[], //宸ュ簭鍒楄〃 + technologyIdList:[], fatherList:[], - //璁惧缁勫垪琛� deviceList:[], technologyForm:{ tefather:'', @@ -335,6 +366,15 @@ 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: '', @@ -343,14 +383,6 @@ unit:'', internal:'', required: '' - }, - materialForm:{}, - productForm:{}, - technologyRules:{ - tefather:{required:true,message:'宸ュ簭涓嶈兘涓虹┖',trigger:'change'}, - tename:{required:true,message:'宸ヨ壓鍚嶇О涓嶈兘涓虹┖',trigger:'blur'}, - deviceGroup:{required:true,message:'璁惧缁勪笉鑳戒负绌�',trigger:'change'}, - productionQuota:{validator:checkPq,trigger:'change'} }, targetRules:{ pfather:{required:true,message:'宸ュ簭涓嶈兘涓虹┖',trigger:'change'}, @@ -361,16 +393,47 @@ 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: [], @@ -380,9 +443,7 @@ bomRightDl: false, formTypeOptions: null, typeselect: 0, - returntree: { - id:28, - }, + returntree: {id:28}, version: {}, leftAdd:{ type: [], @@ -391,7 +452,7 @@ name: null, specifications: null }, - VER: {}, + version2: {}, verdata: {}, character: 0, restaurants: [], @@ -515,6 +576,69 @@ 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){ @@ -531,8 +655,25 @@ 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 } - } }) }, @@ -576,7 +717,35 @@ 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} @@ -586,11 +755,59 @@ this.$message.error(error.message); }) }, - //鑾峰彇椤圭洰鍒楄〃 - getProjectFormList(){ - + //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} @@ -600,7 +817,7 @@ this.$message.error(error.message); }) }, - //鑾峰彇璁惧缁勫垪琛� + //宸ヨ壓璺嚎--鑾峰彇璁惧缁勫垪琛� getDeviceList(){ this.$axios.get(this.$api.url.chooseDevice).then(res=>{ this.deviceList = res.data; @@ -612,6 +829,8 @@ this.getFatherList(); this.getDeviceList(); this.getTargetFormList(); + this.getMaterialFormList(); + this.getProductFormList(); this.bomAddModelVisible = true }, startLeftAdd(){ @@ -708,7 +927,7 @@ return this.verdata[0] }) this.character=v - this.VER="v"+v + this.version2="v"+v this.selectAll() }, //鍙充晶鏁版嵁 -- Gitblit v1.9.3