From 2a3babb6e0c883a7306660fe5e5f21570a3bee8d Mon Sep 17 00:00:00 2001 From: ruanqi Date: Mon, 3 Jun 2024 18:02:53 +0800 Subject: [PATCH] plm BM --- .../technicalSpecificationList.js | 1 + .../processManagement/processBindingInfo.vue | 4 +- .../com_bm_bom.vue | 8 +- .../com_bm_customerInformation.vue | 13 ++- .../com_bm_routing.vue | 27 +++-- .../com_tsd_basicInformation.vue | 104 +++++++++++++++++- .../technicalSpecificationDetail.vue | 3 +- src/views/modules/sys/dict-data-select.vue | 8 ++ 8 files changed, 144 insertions(+), 24 deletions(-) diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js index bde77e2..d04ec68 100644 --- a/src/api/sampleManagement/technicalSpecificationList.js +++ b/src/api/sampleManagement/technicalSpecificationList.js @@ -113,3 +113,4 @@ export const deleteBMprintIndigoColor= data => createAPI(`/technicalSpecificatio * @returns {*} */ export const issueChange= data => createAPI(`/technicalSpecification/issueChange`,'post',data) +export const submitChange= data => createAPI(`/technicalSpecification/submitChange`,'post',data) diff --git a/src/views/modules/processManagement/processBindingInfo.vue b/src/views/modules/processManagement/processBindingInfo.vue index cf7e63d..2c45801 100644 --- a/src/views/modules/processManagement/processBindingInfo.vue +++ b/src/views/modules/processManagement/processBindingInfo.vue @@ -1188,9 +1188,9 @@ } } else if (row.menuId === '103002') { // BM this.queryTableParam = { - tableType: 'plm_technical_specification_sheet', + tableType: 'plm_stepRole_base_bm', passTable: [], - addTable: [] + addTable: ['plm_technical_specification_sheet'] } } else { return diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue index 650c159..cc70bf0 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue @@ -417,8 +417,12 @@ }, searchTable(){ searchBMBom(this.searchData).then(({data}) => { - this.bomList = data.rows; - this.bomData = data.row; + if(data&& data.code===0){ + this.bomList = data.rows; + this.bomData = data.row; + } else { + this.$message.error(data.msg) + } }); }, searchDetailTable(){ diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue index f7b223c..614476d 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue @@ -2,6 +2,9 @@
刷新数据 + 保存 + 同意 + 驳回 @@ -154,9 +157,9 @@ - - 保存 - + + +
@@ -181,6 +184,10 @@ buNo:'', }, ifDisableFlag:false, + baseForm:{ + status:'', + isReject:'', + }, dataForm:{ materialType:'', site: '', diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue index a978ae7..5ef3e4a 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue @@ -2,7 +2,7 @@
- + 热转移打印人员 @@ -909,22 +909,25 @@ }, searchTable(){ tsdBasicInformationSearch(this.searchData).then(({data}) => { - if(data.row){ + if(data&& data.code===0){ this.sheetData=data.row }else { - + this.$message.error(data.msg) } }); if(this.searchData.buNo==='RDC'){ searchBMRoutingDetail(this.searchData).then(({data}) => { - if(data.rows.length>0){ - this.dataForm=data.rows[0] + if(data&& data.code===0){ + if(data.rows.length>0){ + this.dataForm=data.rows[0] + }else { + this.dataForm.site=this.searchData.site + this.dataForm.codeNo=this.searchData.codeNo + } }else { - this.dataForm.site=this.searchData.site - this.dataForm.codeNo=this.searchData.codeNo + this.$message.error(data.msg) } - }); let inData = { site: this.searchData.site, @@ -953,8 +956,12 @@ }else { searchBMRoute(this.searchData).then(({data}) => { - this.tableData = data.rows; - this.routeData = data.row; + if(data&& data.code===0){ + this.tableData = data.rows; + this.routeData = data.row; + }else { + this.$message.error(data.msg) + } }); } }, diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue index 2ef9f86..c7b038a 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue @@ -2,6 +2,9 @@
刷新数据 + 保存 + 同意 + 驳回 @@ -61,7 +64,7 @@
- +
@@ -163,9 +166,6 @@ - - 保存 - { @@ -370,7 +377,6 @@ } //刷新表格 this.searchTable(); - }, refresh(){ if(this.searchData.codeNo===''||this.searchData.codeNo===null){ @@ -382,7 +388,11 @@ tsdBasicInformationSearch(this.searchData).then(({data}) => { //区分请求成功和失败的状况 if (data && data.code == 0) { + this.getNodeAuthority(data.row) this.dataForm = data.row + console.log(!this.ifDisableFlag) + console.log(this.dataForm.status === 'spz') + console.log(this.dataForm.status === 'spz'&&!this.ifDisableFlag) this.$alert('刷新成功', '成功', { confirmButtonText: '确定' }) @@ -432,6 +442,7 @@ //区分请求成功和失败的状况 if (data && data.code == 0) { this.dataForm = data.row + this.getNodeAuthority(data.row) let inData = { site: this.dataForm.site, codeNo: this.dataForm.codeNo, @@ -591,7 +602,88 @@ window.open('#/quotation-sellForQuotation'); } - } + }, + // 获取流程的配置权限 + getNodeAuthority (row) { + let tempData = { + site: row.site, + stepId: row.stepId, + menuId: '103002' + } + debugger + getNodeAuthority(tempData).then(({data}) => { + if (data && data.code === 0) { + let plmStepRoleBaseBm = data.rows.plm_stepRole_base_bm + let arr = plmStepRoleBaseBm.filter(a => a.fieldId === 'basicInformation') + if (arr.length > 0) { + if(arr[0].updateFlag==='N'){ + this.ifDisableFlag=true + }else { + this.ifDisableFlag=false + } + }else { + this.ifDisableFlag=true + } + } + }) + }, + + // 同意提交 + agreeSubmit () { + this.$confirm(`是否确认提交?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let tempData = { + site: this.searchData.site, + userName: this.$store.state.user.name, + codeNo: this.searchData.codeNo, + menuId: '103002', + nodeConclusion: 'Y' + } + this.submitData(tempData) + }) + }, + + // 驳回提交 + rejectSubmit () { + this.$confirm(`是否确认驳回?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let tempData = { + site: this.searchData.site, + userName: this.$store.state.user.name, + codeNo: this.searchData.codeNo, + menuId: '103002', + nodeConclusion: 'N' + } + this.submitData(tempData) + }) + }, + submitData (tempData) { + + updateBMBasicInformation(this.dataForm).then(({data}) => { + if (data && data.code === 0) { + submitChange(tempData).then(({data}) => { + if (data && data.code === 0) { + this.$message({message: '操作成功', type: 'success'}) + this.submitModalFlag = false + this.modalFlag = false + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + } else { + this.$message.error(data.msg) + } + }) + + }, }, } diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue index e85c7a2..4daa2f7 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue @@ -2,7 +2,7 @@
- + @@ -118,6 +118,7 @@ buNo:'', username:this.$store.state.user.name, type:'', + ifDisableFlag:false, }, pageRole:'', activeName:'baseInfo', diff --git a/src/views/modules/sys/dict-data-select.vue b/src/views/modules/sys/dict-data-select.vue index 09a8825..f099f48 100644 --- a/src/views/modules/sys/dict-data-select.vue +++ b/src/views/modules/sys/dict-data-select.vue @@ -40,6 +40,10 @@ export default { disabledOptionsValue:{ type:Array, default:()=>[], + }, + site:{ + type:String, + default:undefined, } }, data () { @@ -68,6 +72,10 @@ export default { dictType:this.dictType, dictTypeList: this.dictTypeList } + if (this.site){ + params.site = this.site + } + try { // 等待返回值 let {data} = await selectDictDataList(params);