From 0499c5ea96c30fbd58a01b21a1c9faa79f67c273 Mon Sep 17 00:00:00 2001 From: zouyu <2723363702@qq.com> Date: 星期三, 13 九月 2023 14:31:07 +0800 Subject: [PATCH] modified: src/assets/api/controller.js modified: src/components/view/standard-table/material.vue modified: src/components/view/standard-table/product.vue modified: src/components/view/standard-table/target.vue modified: src/components/view/standard-table/technology.vue modified: src/components/view/standard.vue --- src/components/view/standard.vue | 313 +++++++++++++++++++++++++++++++++----------- src/components/view/standard-table/target.vue | 4 src/components/view/standard-table/technology.vue | 4 src/assets/api/controller.js | 7 + src/components/view/standard-table/material.vue | 19 ++ src/components/view/standard-table/product.vue | 15 + 6 files changed, 275 insertions(+), 87 deletions(-) diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js index a198663..f5e32db 100644 --- a/src/assets/api/controller.js +++ b/src/assets/api/controller.js @@ -17,6 +17,13 @@ chooseTechByStandard:"/product/chooseTech",//鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�-->閫夋嫨宸ュ簭,宸ヨ壓 chooseFatherByStandard:"/product/chooseFather",//鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍�-->閫夋嫨椤圭洰鐖剁被 addProductByStandard:"/product/add",//鍙充笂瑙掓柊澧�-->鎶�鏈寚鏍� + addMBomByStandard:"/mbom/add",//鍙充笂瑙掓柊澧�-->鐗╂枡娓呭崟 + chooseTechByMBom:"/mbom/chooseTech",//鍙充笂瑙掓柊澧�-->鐗╂枡娓呭崟-->閫夋嫨宸ュ簭,宸ヨ壓 + mBomWrite:"/mbom/write",//鐗╂枡娓呭崟-->鏁伴噺,绉诲紑淇濆瓨 + chooseTechByProduct:"/technique/chooseTech",//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓-->閫夋嫨宸ュ簭,宸ヨ壓 + addTechniqueByStandard:"/technique/add",//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓 + chooseProByProduct:"/technique/choosePro",//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓-->閫夋嫨椤圭洰(鐖跺瓙),鍗曚綅 + chooseDevByProduct:"/technique/chooseDev",//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓-->閫夋嫨璁惧 // 鎶�鏈鐞�-鎶�鏈枃浠� selectAllOrder: "/orders/selectAllOrder", //鏌ヨ鎵�鏈夎鍗曞垪琛� diff --git a/src/components/view/standard-table/material.vue b/src/components/view/standard-table/material.vue index 66e3416..32384da 100644 --- a/src/components/view/standard-table/material.vue +++ b/src/components/view/standard-table/material.vue @@ -40,6 +40,11 @@ <el-table-column prop="unit" label="鍗曚綅"> </el-table-column> <el-table-column prop="num" label="鏁伴噺"> + <template slot-scope="scope"> + <el-input v-model="scope.row.num" + v-if="scope.row.mname != null" + @blur="updateVal(scope.row)"></el-input> + </template> </el-table-column> </el-table> </div> @@ -58,6 +63,16 @@ created() {}, mounted() {}, methods: { + updateVal(row){ + this.$axios.post(this.$api.url.mBomWrite,{ + id : row.id, + num : row.num + }).then(res=>{ + this.$message.success(res.message); + }).catch(error=>{ + this.$message.error(error.message); + }) + }, // 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆 // 鍏ㄩ��/鍙栨秷閫夋搷浣� selectAll(val) { @@ -146,8 +161,8 @@ .standard .el-table__body { height: 100%; } - .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){ + /* .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){ padding-left: 23px !important; - } + } */ </style> \ No newline at end of file diff --git a/src/components/view/standard-table/product.vue b/src/components/view/standard-table/product.vue index 95a0782..6141739 100644 --- a/src/components/view/standard-table/product.vue +++ b/src/components/view/standard-table/product.vue @@ -35,9 +35,9 @@ /* .standard .el-table__body { height: 100%; } */ - .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){ + /* .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){ padding-left: 23px !important; - } + } */ </style> <template> <div class="standard"> @@ -69,12 +69,18 @@ </el-table-column> <el-table-column prop="productFather" label="椤圭洰"> <template slot-scope="scope"> - <el-tag type="info" v-if="scope.row.productFather != null">03</el-tag> + <el-tag type="info" v-if="scope.row.productFather != null">04</el-tag> <span>{{scope.row.productFather}}</span> </template> </el-table-column> + <el-table-column prop="productFather" hidden></el-table-column> <el-table-column prop="unit" label="鍗曚綅"></el-table-column> <el-table-column prop="product" label="鎸囨爣"></el-table-column> + <el-table-column label="鎿嶄綔"> + <template slot-scope="scope"> + <el-button type="text" @click="updateProduct(scope.row)">缂栬緫</el-button> + </template> + </el-table-column> </el-table> </div> </template> @@ -89,6 +95,9 @@ }, props:['tableData','tableType'], methods:{ + updateProduct(row){ + console.log(row); + }, // 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆 // 鍏ㄩ��/鍙栨秷閫夋搷浣� selectAll(val) { diff --git a/src/components/view/standard-table/target.vue b/src/components/view/standard-table/target.vue index 46cc2d9..cb8ad69 100644 --- a/src/components/view/standard-table/target.vue +++ b/src/components/view/standard-table/target.vue @@ -169,8 +169,8 @@ /* .standard .el-table__body { height: 100%; } */ - .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){ + /* .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){ padding-left: 23px !important; - } + } */ </style> \ No newline at end of file diff --git a/src/components/view/standard-table/technology.vue b/src/components/view/standard-table/technology.vue index 2c2792e..a550804 100644 --- a/src/components/view/standard-table/technology.vue +++ b/src/components/view/standard-table/technology.vue @@ -189,7 +189,7 @@ /* .standard .el-table__body { height: 100%; } */ - .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){ + /* .standard .el-table .el-table__row:not([class*="el-table__row--level-"]) td:nth-child(3){ padding-left: 23px !important; - } + } */ </style> diff --git a/src/components/view/standard.vue b/src/components/view/standard.vue index 87691dc..c757612 100644 --- a/src/components/view/standard.vue +++ b/src/components/view/standard.vue @@ -157,45 +157,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> @@ -205,52 +242,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;"> @@ -322,14 +356,9 @@ callback(); }; return { - //鎶�鏈寚鏍�-鏂板-宸ュ簭锛屽伐鑹轰笅鎷夋鏁版嵁 - targetFormList:[], - technologyIdList:[], - //鎶�鏈寚鏍�-鏂板-椤圭洰涓嬫媺妗嗘暟鎹� - projectList:[], //宸ュ簭鍒楄〃 + technologyIdList:[], fatherList:[], - //璁惧缁勫垪琛� deviceList:[], technologyForm:{ tefather:'', @@ -337,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: '', @@ -345,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'}, @@ -363,12 +393,43 @@ 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, @@ -517,6 +578,7 @@ leftAddBom(){ }, + //鍙充晶bom,纭鏂板 confirmAdd(formName){ this.$refs[formName].validate(valid=>{ if(valid){ @@ -533,8 +595,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 } - } }) }, @@ -578,7 +657,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} @@ -588,11 +695,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} @@ -602,7 +757,7 @@ this.$message.error(error.message); }) }, - //鑾峰彇璁惧缁勫垪琛� + //宸ヨ壓璺嚎--鑾峰彇璁惧缁勫垪琛� getDeviceList(){ this.$axios.get(this.$api.url.chooseDevice).then(res=>{ this.deviceList = res.data; @@ -614,6 +769,8 @@ this.getFatherList(); this.getDeviceList(); this.getTargetFormList(); + this.getMaterialFormList(); + this.getProductFormList(); this.bomAddModelVisible = true }, startLeftAdd(){ -- Gitblit v1.9.3