From a51e8de5037524ef5e3eed8a3a3f207cb6aadb77 Mon Sep 17 00:00:00 2001 From: haoxuan <haoxuan> Date: 星期一, 15 四月 2024 18:01:11 +0800 Subject: [PATCH] 车间管理删除之后刷新的问题修改+生丝标准设置 界面设计按钮增加点击范围+去掉编码管理模块 --- src/views/productManage/silkRegisterForm/addPage.vue | 60 +++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 49 insertions(+), 11 deletions(-) diff --git a/src/views/productManage/silkRegisterForm/addPage.vue b/src/views/productManage/silkRegisterForm/addPage.vue index ed51e26..a3e1d37 100644 --- a/src/views/productManage/silkRegisterForm/addPage.vue +++ b/src/views/productManage/silkRegisterForm/addPage.vue @@ -66,6 +66,7 @@ v-model="form.market" placeholder="璇烽�夋嫨" class="select-width" + @change="getGroupNumber" > <el-option v-for="item in marketList" @@ -81,7 +82,7 @@ v-model="form.name" placeholder="璇烽�夋嫨" class="select-width" - @change="getGroupNumber" + @change="getGroupNumber('name')" > <el-option v-for="item in nameList" @@ -115,7 +116,7 @@ placeholder="璇峰厛閫夋嫨杞﹂棿" no-data-text="璇峰厛閫夋嫨杞﹂棿" class="select-width" - @change="getGroupNumber" + @change="getGroupNumber()" > <el-option v-for="item in workshopGroupList" @@ -426,11 +427,12 @@ </template> <script> -// getWorkshopManageList, +// getWorkshopManageList import { saveRegister, getDictList, getRegisterDetails, + getCarNumber } from "@/api/productManage/silkRegisterForm.js"; import { getCheckDetails, @@ -582,7 +584,7 @@ this.getDetailsData(); }, methods: { - getDetailsData(id) { + async getDetailsData(id) { if (this.activeName == "first") { this.form = { number: "", @@ -597,7 +599,7 @@ position: "", }; if (this.registerId) { - getRegisterDetails({ id: id ? id : this.registerId }).then( + await getRegisterDetails({ id: id ? id : this.registerId }).then( (response) => { if (response.code === 200) { let config = JSON.parse( @@ -613,7 +615,6 @@ item.productId=index+1 }) } - console.log(finenessList,'===finenessList') this.tableList.tableData = finenessList this.tableData = this.tableList.tableData; } @@ -761,7 +762,7 @@ } }); }, - getGroupNumber() { + async getGroupNumber(val) { if (this.form.name) { //缁勫埆 let number = ""; @@ -771,17 +772,41 @@ break; } } - getWorkshopManageGroup({ number: number }).then((res) => { + await getWorkshopManageGroup({ number: number }).then((res) => { if (res.code == 200) { this.workshopGroupList = []; let workshopGroupList = res.data || {}; + this.workshopGroupList=[] + if(val=='name'){ + this.form.workshopGroup='' + } if (Object.keys(workshopGroupList).length > 0) { for (let i in workshopGroupList) { this.workshopGroupList.push(workshopGroupList[i]); } } } - }); + }) + if(this.form.workshopGroup&&this.form.market){ + getCarNumber({ + workshopName:this.form.name, + marketName:this.form.market, + groupNumber:this.form.workshopGroup, + }).then((res) => { + if (res.code == 200) { + this.tableData=[] + let data = res.data?JSON.parse(JSON.stringify(res.data)) : []; + if(Object.keys(data).length>0){ + for(let i in data){ + this.tableData.push({position:data[i],productId:Number(i)+1}) + } + } + this.tableList.tableData = this.tableData + }else{ + this.tableData=[] + } + }); + } } else { this.workshopGroupList = []; } @@ -791,7 +816,6 @@ }, // 浜у搧鏂板 addProductClick() { - debugger this.productId++; this.tableData.push({ productId: this.productId, @@ -811,6 +835,7 @@ item[prop] = val; } }); + this.tableList.tableData= this.tableData }, tabsClick() { // if (tab.name === "first") { @@ -878,15 +903,26 @@ if (valid) { let form = JSON.parse(JSON.stringify(this.form)); // params.workshopGroup=Number(params.workshopGroup) - this.isAddloading = true; if (this.activeName == "first") { delete form.circleTwo; let finenessList = JSON.parse( JSON.stringify(this.tableList.tableData) ); + let isContinue=false + for (let i in finenessList) { + if(!finenessList[i].position||!finenessList[i].fineness||!finenessList[i].quantity||!finenessList[i].sum){ + isContinue=true + break; + } + } + if(isContinue){ + this.$message.error('璇峰~鍐欏畬鏁村啀淇濆瓨锛�') + return true; + } for (let i in finenessList) { delete finenessList[i].productId; } + this.isAddloading = true; let params = { finenessList: finenessList, ...form, @@ -895,6 +931,7 @@ if (this.inspectID) { params.ID = this.form.ID ? this.form.ID : Number(this.inspectID); } + saveRegister(params) .then((res) => { if (res.code == 200) { @@ -924,6 +961,7 @@ ? this.form.ID : Number(this.registerId); } + this.isAddloading = true; saveCheck(paramsTwo) .then((res) => { if (res.code == 200) { -- Gitblit v1.8.0