From b199764da85a974f80967f0b91e2228f8f8ffd62 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 27 May 2025 15:24:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?2025-05-27=20=E5=90=8C=E6=AD=A5=E6=97=B6?= =?UTF-8?q?=EF=BC=8CBom=E3=80=81Routing=E7=9A=84=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=90=8C=E6=AD=A5=E8=BF=87=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/part/bomManagement.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue index 959004b..40c9e03 100644 --- a/src/views/modules/part/bomManagement.vue +++ b/src/views/modules/part/bomManagement.vue @@ -4180,7 +4180,6 @@ export default { this.alternativeChange() } }) - }).catch(() => { }) }, @@ -4209,7 +4208,6 @@ export default { this.alternativeChange() } }) - }).catch(() => { }) }, From 89d78e0c4cb70e1a5262f63735d376258bee4205 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 27 May 2025 17:12:39 +0800 Subject: [PATCH 2/4] 2025-05-27 --- src/views/modules/part/partCatalogInformation.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/part/partCatalogInformation.vue b/src/views/modules/part/partCatalogInformation.vue index 71c182a..f802015 100644 --- a/src/views/modules/part/partCatalogInformation.vue +++ b/src/views/modules/part/partCatalogInformation.vue @@ -1427,8 +1427,8 @@ conditionCodeUsageDb: '', multilevelTrackingDb: '', allowAsNotConsumedDb: '', - lotTrackingCode: 'Not Lot Tracking', - lotQuantityRule: 'One Lot Per Production Order', + lotTrackingCode: 'Order Based', + lotQuantityRule: 'Many Lots Per Production Order', subLotRule: 'No Sub Lots Allowed', componentLotRule: 'Many Lots Allowed', createBy: this.$store.state.user.name, From ab27ffc7a3d5858f5cd07b62c9026007e796d6cd Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 28 May 2025 11:12:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?2025-05-28=20=E5=88=80=E5=85=B7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E9=A1=B5=E9=9D=A2=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E4=B8=8D=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demoComponents/orderProperties.vue | 4 +- src/views/modules/tooling/searchToolApply.vue | 36 ++++---- src/views/modules/tooling/toolingInfo.vue | 82 ++++++++++--------- 3 files changed, 64 insertions(+), 58 deletions(-) diff --git a/src/views/modules/demoComponents/orderProperties.vue b/src/views/modules/demoComponents/orderProperties.vue index 66d4c6a..299437e 100644 --- a/src/views/modules/demoComponents/orderProperties.vue +++ b/src/views/modules/demoComponents/orderProperties.vue @@ -8,9 +8,7 @@ {{ attributeDialog?'编辑':'保存' }}
diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue index 02e9081..9422608 100644 --- a/src/views/modules/tooling/searchToolApply.vue +++ b/src/views/modules/tooling/searchToolApply.vue @@ -49,6 +49,7 @@ + - + - + + - + --> - @@ -206,15 +203,14 @@ - - + + - + @@ -246,8 +241,12 @@ - + + 报价员 @@ -1678,6 +1677,9 @@ export default { if (this.activeName === 'approvalInformation') { this.getApprovalList() } + if (this.activeName == 'attribute') { // 基本信息 + + } }, searchToolApplyDetail() { diff --git a/src/views/modules/tooling/toolingInfo.vue b/src/views/modules/tooling/toolingInfo.vue index ce67030..8ae1504 100644 --- a/src/views/modules/tooling/toolingInfo.vue +++ b/src/views/modules/tooling/toolingInfo.vue @@ -420,59 +420,58 @@ export default { } }, changeSum(row){ - if(row.standardCost<0||row.standardCost==null||row.standardCost==''){ - row.standardCost=0 + if (row.standardCost < 0 || row.standardCost == null || row.standardCost == '') { + row.standardCost = 0 // this.$alert('成本不能为负数或者不填', '错误', { // confirmButtonText: '确定' // }) - } this.dataForm.applySumQty = 0 this.dataForm.totalCost = 0 for (const item of this.selectionDataList) { // 累加之前先确保值存在，并将 null 或 undefined 转换为0 - this.dataForm.applySumQty += Number(item.applyQty != null && item.applyQty !== '' ? item.applyQty : 0); - this.dataForm.totalCost += Number(item.applyQty != null && item.applyQty !== '' ? item.applyQty*item.standardCost : 0); + this.dataForm.applySumQty += Number(item.applyQty != null && item.applyQty !== '' ? item.applyQty : 0) + this.dataForm.totalCost += Number(item.applyQty != null && item.applyQty !== '' ? item.applyQty * item.standardCost : 0) } }, - saveData(){ - if(this.dataForm.applySumQty===0){ - this.$alert('未填写申请数量！', '错误', { + saveData () { + if (this.dataForm.applySumQty === 0) { + this.$alert('未填写申请总数！', '错误', { confirmButtonText: '确定' }) return false; } - if(this.dataForm.applyBy===''||this.dataForm.applyBy==null){ + if (this.dataForm.applyBy === '' || this.dataForm.applyBy == null) { this.$alert('未选择申请人！', '错误', { confirmButtonText: '确定' }) return false; } - if(this.dataForm.applyDate===''||this.dataForm.applyDate==null){ + if (this.dataForm.applyDate === '' || this.dataForm.applyDate == null) { this.$alert('未选择申请日期！', '错误', { confirmButtonText: '确定' }) return false; } - if(this.dataForm.department===''||this.dataForm.department==null){ + if (this.dataForm.department === '' || this.dataForm.department == null) { this.$alert('未选择部门！', '错误', { confirmButtonText: '确定' }) return false; } - if(this.dataForm.quoter===''||this.dataForm.quoter==null){ + if (this.dataForm.quoter === '' || this.dataForm.quoter == null) { this.$alert('未选择报价员！', '错误', { confirmButtonText: '确定' }) return false; } - if(this.dataForm.tp===''||this.dataForm.tp==null){ + if (this.dataForm.tp === '' || this.dataForm.tp == null) { this.$alert('未选择TP！', '错误', { confirmButtonText: '确定' }) return false; } - if(this.dataForm.purchaser===''||this.dataForm.purchaser==null){ + if (this.dataForm.purchaser === '' || this.dataForm.purchaser == null) { this.$alert('未选择采购专员！', '错误', { confirmButtonText: '确定' }) @@ -484,46 +483,51 @@ export default { type: 'warning' }).then(() => { for (let i = 0; i < this.selectionDataList.length; i++) { - if (this.selectionDataList[i].applyQty===''||this.selectionDataList[i].applyQty==null){ - this.selectionDataList[i].applyQty=0 + if (this.selectionDataList[i].applyQty === '' || this.selectionDataList[i].applyQty == null) { + this.selectionDataList[i].applyQty = 0 } } - this.dataForm.detailList=this.selectionDataList.filter(item => item.applyQty > 0).filter(item => item.standardCost >= 0) + this.dataForm.detailList = this.selectionDataList.filter(item => item.applyQty > 0).filter(item => item.standardCost >= 0) saveProjectToolApply(this.dataForm).then(({data}) => { if (data && data.code === 0) { - this.visible=false; - this.queryDataList(); + this.visible = false + this.queryDataList() this.$message.success('操作成功') // 跳转 - if(this.jumpFlag){ + if (this.jumpFlag) { let inData = { site: this.$store.state.user.site, applyNo: data.applyNo, username: this.$store.state.user.name - }; + } localStorage.setItem('ToolApplyData', JSON.stringify(inData)) this.$router.push('tooling-searchToolApply') } } else { - this.$message.warning(data.msg); + this.$message.warning(data.msg) } }) }) }, - applyModel() { - if(this.selectionDataList.length===0){ + + // 工具申请 + applyModel () { + if (this.selectionDataList.length === 0) { this.$alert('请选择项目！', '错误', {confirmButtonText: '确定'}) return false; } + this.selectionDataList.forEach(item => { + item.applyQty = '' + }) this.dataForm = { site: this.$store.state.user.site, applyNo: '', - applyBy:this.$store.state.user.name, - applyDate:new Date(), - applySumQty:0, - applyReason:'', - remark:'', - createBy:this.$store.state.user.name, + applyBy: this.$store.state.user.name, + applyDate: new Date(), + applySumQty: 0, + applyReason: '', + remark: '', + createBy: this.$store.state.user.name, department: '', quoter: '', quoterName: '', @@ -532,16 +536,18 @@ export default { purchaser: '', totalCost: '', purchaserName: '', - detailList:[], - }; - this.visible=true; - this.jumpFlag=true; + detailList: [], + } + this.visible = true + this.jumpFlag = true }, }, + created() { // 初始化Site this.queryParams.site = this.$store.state.user.site; }, + watch:{ queryLoading(newVal,oldVal){ if (newVal){ @@ -652,7 +658,7 @@ export default { - + @@ -700,7 +706,7 @@ export default { TP - + @@ -710,7 +716,7 @@ export default { - + 跳转至申请记录 @@ -740,7 +746,7 @@ export default { From 5c931738c3c410a91cc2ff2671ad48f49d1cf617 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 28 May 2025 14:01:21 +0800 Subject: [PATCH 4/4] =?UTF-8?q?2025-05-28=20=E8=B7=B3=E8=BD=AC=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E5=8F=82=E6=95=B0=E5=8D=A1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/changeManagement/changeRecord.vue | 2 +- .../sampleManagement/technicalSpecificationList.vue | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue index b8e1688..c56f6c7 100644 --- a/src/views/modules/changeManagement/changeRecord.vue +++ b/src/views/modules/changeManagement/changeRecord.vue @@ -4861,7 +4861,7 @@ if (this.$router.resolve(`/sampleManagement-technicalSpecificationList`).resolved.name === '404') { this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',}) } else { - this.$router.push({name:`sampleManagement-technicalSpecificationList`,params:{nowCodeNo:row.codeNo},}) + this.$router.push({name:`sampleManagement-technicalSpecificationList`,params:{nowCodeNo: row.oriCodeNo},}) } }, diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index 9d54ad4..6ca9310 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -1001,7 +1001,7 @@ this.dataListLoading = false }) } - }else if (this.$route.params.type === 'test'){ + } else if (this.$route.params.type === 'test') { this.searchData.buNo = this.$route.params.buNo this.searchData.testPartNo = this.$route.params.testPartNo this.search(); @@ -1009,17 +1009,17 @@ this.searchData.buNo = ''; this.searchData.testPartNo = ''; }, 200) - }else if (this.$route.params.codeNo){ + } else if (this.$route.params.codeNo) { this.searchData.oriCodeNo = this.$route.params.codeNo; this.search(); setTimeout(() => { this.searchData.oriCodeNo = ''; }, 200) - }else if (this.$route.params.nowCodeNo){ - this.searchData.codeNo = this.$route.params.nowCodeNo; + } else if (this.$route.params.nowCodeNo) { + this.searchData.oriCodeNo = this.$route.params.nowCodeNo; this.search(); setTimeout(() => { - this.searchData.codeNo = ''; + this.searchData.oriCodeNo = ''; }, 200) } },