diff --git a/src/views/modules/part/abcClassInformation.vue b/src/views/modules/part/abcClassInformation.vue index 164e3a7..e95c002 100644 --- a/src/views/modules/part/abcClassInformation.vue +++ b/src/views/modules/part/abcClassInformation.vue @@ -61,7 +61,7 @@ width="160" label="操作"> @@ -94,6 +94,12 @@ + + + + + + 保存 @@ -166,7 +172,8 @@ export default { site: this.$store.state.user.site, abcClass: '', abcClassDesc: '', - active: '' + active: '', + showInQueryFlag: '' }, // ======== 数据列表 ======== dataList: [], @@ -214,6 +221,20 @@ export default { fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + columnProp: 'showInQueryFlag', + headerAlign: "center", + align: "center", + columnLabel: '是否显示', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, { userId: this.$store.state.user.name, columnProp: 'createDate', @@ -293,6 +314,13 @@ export default { trigger: 'change' } ], + showInQueryFlag:[ + { + required: true, + message: ' ', + trigger: 'change' + } + ] }, // ======== 模态框开关控制 ======== modalFlag: false, @@ -373,6 +401,7 @@ export default { abcClass: '', abcClassDesc: '', active: 'Y', + showInQueryFlag: 'Y' } this.modalDisableFlag = false this.modalFlag = true @@ -389,6 +418,7 @@ export default { abcClass: row.abcClass, abcClassDesc: row.abcClassDesc, active: row.active, + showInQueryFlag: row.showInQueryFlag, updateBy: this.$store.state.user.name, } this.modalDisableFlag = true diff --git a/src/views/modules/part/assetClassInformation.vue b/src/views/modules/part/assetClassInformation.vue index a52498c..e0ca21a 100644 --- a/src/views/modules/part/assetClassInformation.vue +++ b/src/views/modules/part/assetClassInformation.vue @@ -61,7 +61,7 @@ width="160" label="操作"> @@ -94,6 +94,12 @@ + + + + + + 保存 @@ -166,7 +172,8 @@ export default { site: this.$store.state.user.site, assetClass: '', assetClassDesc: '', - active: '' + active: '', + showInQueryFlag: '' }, // ======== 数据列表 ======== dataList: [], @@ -214,6 +221,20 @@ export default { fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + columnProp: 'showInQueryFlag', + headerAlign: "center", + align: "center", + columnLabel: '是否显示', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, { userId: this.$store.state.user.name, columnProp: 'createDate', @@ -293,6 +314,13 @@ export default { trigger: 'change' } ], + showInQueryFlag:[ + { + required: true, + message: ' ', + trigger: 'change' + } + ], }, // ======== 模态框开关控制 ======== modalFlag: false, @@ -373,6 +401,7 @@ export default { assetClass: '', assetClassDesc: '', active: 'Y', + showInQueryFlag: 'Y' } this.modalDisableFlag = false this.modalFlag = true @@ -389,6 +418,7 @@ export default { assetClass: row.assetClass, assetClassDesc: row.assetClassDesc, active: row.active, + showInQueryFlag: row.showInQueryFlag, updateBy: this.$store.state.user.name, } this.modalDisableFlag = true diff --git a/src/views/modules/part/countryInformation.vue b/src/views/modules/part/countryInformation.vue index 95f23af..c10bb9b 100644 --- a/src/views/modules/part/countryInformation.vue +++ b/src/views/modules/part/countryInformation.vue @@ -61,7 +61,7 @@ width="160" label="操作"> @@ -94,6 +94,12 @@ + + + + + + 保存 @@ -166,7 +172,8 @@ export default { site: this.$store.state.user.site, countryOfOrigin: '', countryOfOriginDesc: '', - active: '' + active: '', + showInQueryFlag: '' }, // ======== 数据列表 ======== dataList: [], @@ -214,6 +221,20 @@ export default { fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + columnProp: 'showInQueryFlag', + headerAlign: "center", + align: "center", + columnLabel: '是否显示', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, { userId: this.$store.state.user.name, columnProp: 'createDate', @@ -373,6 +394,7 @@ export default { countryOfOrigin: '', countryOfOriginDesc: '', active: 'Y', + showInQueryFlag: 'Y', } this.modalDisableFlag = false this.modalFlag = true @@ -389,6 +411,7 @@ export default { countryOfOrigin: row.countryOfOrigin, countryOfOriginDesc: row.countryOfOriginDesc, active: row.active, + showInQueryFlag: row.showInQueryFlag, updateBy: this.$store.state.user.name, } this.modalDisableFlag = true diff --git a/src/views/modules/part/customsStatInformation.vue b/src/views/modules/part/customsStatInformation.vue index 58eb99e..5441f84 100644 --- a/src/views/modules/part/customsStatInformation.vue +++ b/src/views/modules/part/customsStatInformation.vue @@ -64,7 +64,7 @@ width="160" label="操作"> @@ -89,8 +89,9 @@ - - + + 计量单位 + @@ -100,6 +101,12 @@ + + + + + + 保存 @@ -179,8 +186,10 @@ export default { site: this.$store.state.user.site, customsStatNo: '', customsStatDesc: '', + umId: '', umDesc: '', - active: '' + active: '', + showInQueryFlag: '', }, // ======== 数据列表 ======== dataList: [], @@ -242,6 +251,20 @@ export default { fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + columnProp: 'showInQueryFlag', + headerAlign: "center", + align: "center", + columnLabel: '是否显示', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, { userId: this.$store.state.user.name, columnProp: 'createDate', @@ -328,6 +351,13 @@ export default { trigger: 'change' } ], + showInQueryFlag:[ + { + required: true, + message: ' ', + trigger: 'change' + } + ], }, // ======== 模态框开关控制 ======== modalFlag: false, @@ -409,6 +439,7 @@ export default { customsStatDesc: '', umDesc: '', active: 'Y', + showInQueryFlag: 'Y' } this.modalDisableFlag = false this.modalFlag = true @@ -426,6 +457,7 @@ export default { customsStatDesc: row.customsStatDesc, umDesc: row.umDesc, active: row.active, + showInQueryFlag: row.showInQueryFlag, updateBy: this.$store.state.user.name, } this.modalDisableFlag = true @@ -513,6 +545,20 @@ export default { }).catch(() => { }) }, + + getBaseList (val, type) { + this.tempCodeNo = this.modalData.codeNo + this.$nextTick(() => { + let strVal = '' + strVal = this.modalData.umId + this.$refs.baseList.init(val, strVal) + }) + }, + + getBaseData(val){ + this.modalData.umId = val.um_id + this.modalData.umDesc = val.um_name + } } } diff --git a/src/views/modules/part/partCostGroupInformation.vue b/src/views/modules/part/partCostGroupInformation.vue index 67e2f02..0cebcf9 100644 --- a/src/views/modules/part/partCostGroupInformation.vue +++ b/src/views/modules/part/partCostGroupInformation.vue @@ -61,7 +61,7 @@ width="160" label="操作"> @@ -94,6 +94,12 @@ + + + + + + 保存 @@ -166,7 +172,8 @@ export default { site: this.$store.state.user.site, partCostGroupId: '', partCostGroupDesc: '', - active: '' + active: '', + showInQueryFlag: '', }, // ======== 数据列表 ======== dataList: [], @@ -214,6 +221,20 @@ export default { fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + columnProp: 'showInQueryFlag', + headerAlign: "center", + align: "center", + columnLabel: '是否显示', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, { userId: this.$store.state.user.name, columnProp: 'createDate', @@ -293,6 +314,13 @@ export default { trigger: 'change' } ], + showInQueryFlag:[ + { + required: true, + message: ' ', + trigger: 'change' + } + ], }, // ======== 模态框开关控制 ======== modalFlag: false, @@ -373,6 +401,7 @@ export default { partCostGroupId: '', partCostGroupDesc: '', active: 'Y', + showInQueryFlag: 'Y' } this.modalDisableFlag = false this.modalFlag = true @@ -389,6 +418,7 @@ export default { partCostGroupId: row.partCostGroupId, partCostGroupDesc: row.partCostGroupDesc, active: row.active, + showInQueryFlag: row.showInQueryFlag, updateBy: this.$store.state.user.name, } this.modalDisableFlag = true diff --git a/src/views/modules/part/partStatusInformation.vue b/src/views/modules/part/partStatusInformation.vue index d2eba80..c878d4c 100644 --- a/src/views/modules/part/partStatusInformation.vue +++ b/src/views/modules/part/partStatusInformation.vue @@ -61,7 +61,7 @@ width="160" label="操作"> @@ -94,6 +94,12 @@ + + + + + + 保存 @@ -166,7 +172,8 @@ export default { site: this.$store.state.user.site, partStatus: '', partStatusDesc: '', - active: '' + active: '', + showInQueryFlag: '' }, // ======== 数据列表 ======== dataList: [], @@ -214,6 +221,20 @@ export default { fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + columnProp: 'showInQueryFlag', + headerAlign: "center", + align: "center", + columnLabel: '是否显示', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, { userId: this.$store.state.user.name, columnProp: 'createDate', @@ -293,6 +314,13 @@ export default { trigger: 'change' } ], + showInQueryFlag:[ + { + required: true, + message: ' ', + trigger: 'change' + } + ], }, // ======== 模态框开关控制 ======== modalFlag: false, @@ -373,6 +401,7 @@ export default { partStatus: '', partStatusDesc: '', active: 'Y', + showInQueryFlag: 'Y', } this.modalDisableFlag = false this.modalFlag = true @@ -389,6 +418,7 @@ export default { partStatus: row.partStatus, partStatusDesc: row.partStatusDesc, active: row.active, + showInQueryFlag: row.showInQueryFlag, updateBy: this.$store.state.user.name, } this.modalDisableFlag = true diff --git a/src/views/modules/part/planningMethodInformation.vue b/src/views/modules/part/planningMethodInformation.vue index 1c8ca35..4a99a64 100644 --- a/src/views/modules/part/planningMethodInformation.vue +++ b/src/views/modules/part/planningMethodInformation.vue @@ -61,7 +61,7 @@ width="160" label="操作"> @@ -94,6 +94,12 @@ + + + + + + 保存 @@ -166,7 +172,8 @@ export default { site: this.$store.state.user.site, planningMethod: '', planningMethodDesc: '', - active: '' + active: '', + showInQueryFlag: '' }, // ======== 数据列表 ======== dataList: [], @@ -214,6 +221,20 @@ export default { fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + columnProp: 'showInQueryFlag', + headerAlign: "center", + align: "center", + columnLabel: '是否显示', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, { userId: this.$store.state.user.name, columnProp: 'createDate', @@ -293,6 +314,13 @@ export default { trigger: 'change' } ], + showInQueryFlag:[ + { + required: true, + message: ' ', + trigger: 'change' + } + ], }, // ======== 模态框开关控制 ======== modalFlag: false, @@ -373,6 +401,7 @@ export default { planningMethod: '', planningMethodDesc: '', active: 'Y', + showInQueryFlag: 'Y' } this.modalDisableFlag = false this.modalFlag = true @@ -389,6 +418,7 @@ export default { planningMethod: row.planningMethod, planningMethodDesc: row.planningMethodDesc, active: row.active, + showInQueryFlag: row.showInQueryFlag, updateBy: this.$store.state.user.name, } this.modalDisableFlag = true diff --git a/src/views/modules/part/regionInformation.vue b/src/views/modules/part/regionInformation.vue index 99eccf8..a36b89c 100644 --- a/src/views/modules/part/regionInformation.vue +++ b/src/views/modules/part/regionInformation.vue @@ -61,7 +61,7 @@ width="160" label="操作"> @@ -94,6 +94,12 @@ + + + + + + 保存 @@ -166,7 +172,8 @@ export default { site: this.$store.state.user.site, regionOfOrigin: '', regionOfOriginDesc: '', - active: '' + active: '', + showInQueryFlag: '' }, // ======== 数据列表 ======== dataList: [], @@ -214,6 +221,20 @@ export default { fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + columnProp: 'showInQueryFlag', + headerAlign: "center", + align: "center", + columnLabel: '是否显示', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, { userId: this.$store.state.user.name, columnProp: 'createDate', @@ -293,6 +314,13 @@ export default { trigger: 'change' } ], + showInQueryFlag:[ + { + required: true, + message: ' ', + trigger: 'change' + } + ], }, // ======== 模态框开关控制 ======== modalFlag: false, @@ -373,6 +401,7 @@ export default { regionOfOrigin: '', regionOfOriginDesc: '', active: 'Y', + showInQueryFlag: 'Y', } this.modalDisableFlag = false this.modalFlag = true @@ -389,6 +418,7 @@ export default { regionOfOrigin: row.regionOfOrigin, regionOfOriginDesc: row.regionOfOriginDesc, active: row.active, + showInQueryFlag: row.showInQueryFlag, updateBy: this.$store.state.user.name, } this.modalDisableFlag = true diff --git a/src/views/modules/part/safetyCodeInformation.vue b/src/views/modules/part/safetyCodeInformation.vue index 1639a85..83f13e4 100644 --- a/src/views/modules/part/safetyCodeInformation.vue +++ b/src/views/modules/part/safetyCodeInformation.vue @@ -61,7 +61,7 @@ width="160" label="操作"> @@ -94,6 +94,12 @@ + + + + + + 保存 @@ -166,7 +172,8 @@ export default { site: this.$store.state.user.site, hazardCode: '', hazardDesc: '', - active: '' + active: '', + showInQueryFlag: '' }, // ======== 数据列表 ======== dataList: [], @@ -214,6 +221,20 @@ export default { fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + columnProp: 'showInQueryFlag', + headerAlign: "center", + align: "center", + columnLabel: '是否显示', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, { userId: this.$store.state.user.name, columnProp: 'createDate', @@ -293,6 +314,13 @@ export default { trigger: 'change' } ], + showInQueryFlag:[ + { + required: true, + message: ' ', + trigger: 'change' + } + ], }, // ======== 模态框开关控制 ======== modalFlag: false, @@ -373,6 +401,7 @@ export default { hazardCode: '', hazardDesc: '', active: 'Y', + showInQueryFlag: 'Y' } this.modalDisableFlag = false this.modalFlag = true @@ -389,6 +418,7 @@ export default { hazardCode: row.hazardCode, hazardDesc: row.hazardDesc, active: row.active, + showInQueryFlag: row.showInQueryFlag, updateBy: this.$store.state.user.name, } this.modalDisableFlag = true diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue index 757979f..eb80134 100644 --- a/src/views/modules/project/projectInfo/projectInfo.vue +++ b/src/views/modules/project/projectInfo/projectInfo.vue @@ -416,7 +416,14 @@ import {isAuth} from "../../../../utils"; import FilterSearch from "../../../common/filterSearch.vue"; import {siteList} from "../../../../api/base/site"; - import {projectInfoSearchByAnyField} from "../../../../api/project/project"; + import {getProjectInfoPartList, projectInfoSearchByAnyField} from "../../../../api/project/project"; + import {queryOss} from "../../../../api/oss/oss"; + import {quotationInformationSearch} from "../../../../api/quotation/quotationInformation"; + import {queryQuoteGroupDetailByInquiry} from "../../../../api/quote/quoteGroupDetail"; + import {proofingInformationSearch} from "../../../../api/proofing/proofingInformation"; + import {testInformationList} from "../../../../api/test/testInformation"; + import {searchProjectToolApplyDetail} from "../../../../api/tool/toolApply"; + import {technicalSpecificationListSearch} from "../../../../api/sampleManagement/technicalSpecificationList"; /*組件*/ export default { components: { @@ -1976,6 +1983,221 @@ cancelButtonText: '取消', type: 'warning' }).then(() => { + + // 校验附件信息 + let ossParams = { + orderRef1: row.site, + orderRef2: row.projectId + } + let ossDeleteFlag = false + queryOss(ossParams).then(({data})=>{ + if (data && data.code === 0){ + if (data.rows.length===0){ + ossDeleteFlag = true + } + }else { + this.$message.warning(data.msg); + } + }).catch((error)=>{ + this.$message.error(error); + }) + if (ossDeleteFlag===false){ + this.$alert('请先删除项目的附件信息！', '提示', { + confirmButtonText: '确定' + }) + return + } + + // 校验项目物料 + let partParams = { + site: row.site, + projectId: row.projectId, + searchType: 'Y', + username: this.$store.state.user.name, + customerId: row.customerId + } + let partDeleteFlag = false + getProjectInfoPartList(partParams).then(({data}) => { + if (data && data.code === 0) { + if (data.page.list.length===0){ + partDeleteFlag = true + } else { + this.$message.warning(data.msg); + } + } + }) + if (partDeleteFlag===false){ + this.$alert('请先删除项目的物料信息！', '提示', { + confirmButtonText: '确定' + }) + return + } + + // 校验询价信息 + let quotationParams = { + site: row.site, + projectId: row.projectId, + createBy: this.$store.state.user.name, + menuId: '102001' + } + let quotationDeleteFlag = false + quotationInformationSearch(quotationParams).then(({data}) => { + //区分请求成功和失败的状况 + if (data && data.code === 0) { + if(data.page.list.length===0){ + quotationDeleteFlag = true + } + } else { + this.$message.warning(data.msg); + } + }); + if (quotationDeleteFlag===false){ + this.$alert('请先删除项目的询价信息！', '提示', { + confirmButtonText: '确定' + }) + return + } + + // 校验项目报价信息 + let quoteParams = { + site: row.site, + projectNo: row.projectId + } + let quoteDeleteFlag = false + queryQuoteGroupDetailByInquiry(quoteParams).then(({data})=>{ + if (data && data.code === 0){ + if (data.rows.length===0){ + quoteDeleteFlag = true + } + }else { + this.$message.warning(data.msg) + } + }) + if (quoteDeleteFlag===false){ + this.$alert('请先删除项目的报价信息！', '提示', { + confirmButtonText: '确定' + }) + return + } + + // 校验项目打样信息 + let proofingParams = { + site: row.site, + projectId: row.projectId, + createBy: this.$store.state.user.name, + menuId: '103001' + } + let proofingDeleteFlag = false + proofingInformationSearch(proofingParams).then(({data}) => { + if (data && data.code === 0) { + if (data.page.list.length===0){ + proofingDeleteFlag = true + } + } else { + this.$message.warning(data.msg) + } + }) + if (proofingDeleteFlag===false){ + this.$alert('请先删除项目的打样信息！', '提示', { + confirmButtonText: '确定' + }) + return; + } + + // 校验项目测试记录 + let testParams = { + site: row.site, + projectId: row.projectId, + createBy: this.$store.state.user.name, + menuId: '107001' + } + let testDeleteFlag = false + testInformationList(testParams).then(({data}) => { + if (data && data.code === 0) { + if (data.rows.length===0){ + testDeleteFlag = true + } + } else { + this.$message.warning(data.msg) + } + }); + if (testDeleteFlag===false){ + this.$alert('请先删除项目的测试记录！', '提示', { + confirmButtonText: '确定' + }) + return + } + + // 检验刀模申请 + let toolParams = { + orderRef1: row.projectId, + site: row.site, + username: this.$store.state.user.name + } + let toolDeleteFlag = false + searchProjectToolApplyDetail(toolParams).then(({data}) => { + //区分请求成功和失败的状况 + if (data && data.code === 0) { + if (data.rows.length===0){ + toolDeleteFlag = true + } + } else { + this.$message.warning(data.msg) + } + }) + if (toolDeleteFlag===false){ + this.$alert('请先删除项目的刀模申请！', '提示', { + confirmButtonText: '确定' + }) + return + } + + // 校验技术参数卡 + let technicalSpecificationParams = { + site: row.site, + userName: this.$store.state.user.name, + projectId: row.projectId, + } + let technicalSpecificationDeleteFlag = false + technicalSpecificationListSearch(technicalSpecificationParams).then(({data}) => { + if (data && data.code === 0) { + if (data.page.list.length===0){ + technicalSpecificationDeleteFlag = true + } + } else { + this.$message.warning(data.msg) + } + }); + if (technicalSpecificationDeleteFlag===false){ + this.$alert('请先删除项目的技术参数卡！', '提示', { + confirmButtonText: '确定' + }) + return + } + + // 校验项目变更记录 + let changeParams = { + site: row.site, + projectId: row.projectId, + menuId: '108002' + } + let changeDeleteFlag = false + getChangeRecordByPartNo(changeParams).then(({data}) => { + if (data && data.code === 0) { + if (data.rows.length===0){ + changeDeleteFlag = true + } + } else { + this.$message.warning(data.msg) + } + }) + if(changeDeleteFlag===false){ + this.$alert('请先删除项目的变更记录！', '提示', { + confirmButtonText: '确定' + }) + return + } + deleteProjectInfo(row).then(({data}) => { if (data && data.code === 0) { this.$message.success( '操作成功')