From bd750ad34ed76f5ed0b846f063bdb707c4820962 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Mon, 2 Dec 2024 16:55:16 +0800 Subject: [PATCH] plm BMM --- .../technicalSpecificationList.js | 1 + .../com_tsd_basicInformation.vue | 78 +++++++++++++++++-- src/views/modules/sys/user.vue | 2 +- src/views/modules/tooling/searchToolApply.vue | 14 +++- src/views/modules/tooling/toolingInfo.vue | 11 ++- 5 files changed, 95 insertions(+), 11 deletions(-) diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js index e8244ce..7ec33d9 100644 --- a/src/api/sampleManagement/technicalSpecificationList.js +++ b/src/api/sampleManagement/technicalSpecificationList.js @@ -35,6 +35,7 @@ export const deleteBMTPInfoColor= data => createAPI(`/technicalSpecification/del export const searchBMTPInfoCut= data => createAPI(`/technicalSpecification/searchBMTPInfoCut`,'post',data) export const saveBMTPInfoCut= data => createAPI(`/technicalSpecification/saveBMTPInfoCut`,'post',data) export const deleteBMTPInfoCut= data => createAPI(`/technicalSpecification/deleteBMTPInfoCut`,'post',data) +export const searchBMUser= data => createAPI(`/technicalSpecification/searchBMUser`,'post',data) export const searchBMPrepressDetail= data => createAPI(`/technicalSpecification/searchBMPrepressDetail`,'post',data) diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue index aa8e309..796a697 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue @@ -176,10 +176,14 @@
- - DCC人员 - - + + + + + + DCC人员 + +
@@ -265,6 +269,23 @@ + + + +
+ 确定 + 取消 +
+ + + @@ -289,6 +310,7 @@ updateBMBasicInformation, searchPartLastQuotationNo,getBMStatusDesc,getOADetailForBM, submitChange, issueChange, // 下达 // 提交 + searchBMUser, } from "@/api/sampleManagement/technicalSpecificationList.js" import { getNodeAuthority, // 获取节点权限 @@ -314,7 +336,9 @@ quotationOfficerFlag:false, engineerFlag:false, technicianFlag:false, + dccFlag:false, operatorList:[], + dccList:[], quotationOfficerList:[], engineerList:[], technicianList:[], @@ -322,6 +346,7 @@ sp:'', nodeName:'', }, + dataForm:{ nodeName:'', process:'', @@ -364,6 +389,8 @@ dccOperaterName:'', engineerNo:'', technicianNo:'', + dcc:'', + dccList:'', }, dataRole: { partTypeDesc: [ @@ -546,6 +573,14 @@ this.quotationNo = data.rows[0].quotationNo } }) + let inData5 = { + site: this.dataForm.site, + codeNo: this.dataForm.codeNo, + type: 'dcc', + } + searchTechnicalSpecificationTeamStr(inData5).then(({data}) => { + this.dataForm.dccList = data.rows + }) } else { this.dataList = ''; this.$alert('刷新失败请重新打开技术参数卡', '失败', { @@ -597,6 +632,14 @@ this.quotationNo = data.rows[0].quotationNo } }) + let inData5 = { + site: this.dataForm.site, + codeNo: this.dataForm.codeNo, + type: 'dcc', + } + searchTechnicalSpecificationTeamStr(inData5).then(({data}) => { + this.dataForm.dccList = data.rows + }) } else { this.dataList = ''; } @@ -643,7 +686,20 @@ this.engineerList = JSON.parse(JSON.stringify(this.dataForm.engineerList)); this.engineerFlag=true }, - + dccChooseModal(){ + if(this.ifDisableFlag){ + return false + } + let inData={ + site:this.dataForm.site, + buNo:this.dataForm.buNo, + } + searchBMUser(inData).then(({data}) => { + this.operatorList=data.rows + }) + this.dccList = JSON.parse(JSON.stringify(this.dataForm.dccList)); + this.dccFlag=true + }, saveEngineerList(){ let engineerName=''; for (let i = 0; i < this.engineerList.length; i++) { @@ -682,6 +738,18 @@ this.dataForm.technicianList=JSON.parse(JSON.stringify(this.technicianList)); this.technicianFlag=false }, + savetDccList(){ + let dccName=''; + for (let i = 0; i < this.dccList.length; i++) { + let select= this.operatorList.filter(item => item.operatorId === this.dccList[i]) + if(select.length>0){ + dccName+=select[0].operatorName+';' + } + } + this.dataForm.dcc=dccName + this.dataForm.dccList=JSON.parse(JSON.stringify(this.dccList)); + this.dccFlag=false + }, saveData(){ this.dataForm.engineerList = []; this.dataForm.engineerList.push(this.dataForm.engineerNo); diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue index 7e865cf..569899d 100644 --- a/src/views/modules/sys/user.vue +++ b/src/views/modules/sys/user.vue @@ -427,7 +427,7 @@ width="600px" title="功能清单" :close-on-click-modal="false" - :visible.sync="functionFlag"> + :visible.sync ="functionFlag"> 用户： 名称： diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue index 7ba6581..f168824 100644 --- a/src/views/modules/tooling/searchToolApply.vue +++ b/src/views/modules/tooling/searchToolApply.vue @@ -208,7 +208,7 @@ - + @@ -354,7 +354,7 @@ - + @@ -1382,6 +1382,7 @@ mounted() { this.$nextTick(() => { this.height = window.innerHeight - 520; + this.fieldColumn() }) }, methods: { @@ -1845,7 +1846,7 @@ } this.modelFlag=true }, - changeSum() { + changeSum(row) { if(row.standardCost<0||row.standardCost==null||row.standardCost==''){ row.standardCost=0 // this.$alert('成本不能为负数或者不填', '错误', { @@ -2063,6 +2064,13 @@ } }) }, + fieldColumn(){ + if(!this.accessField('10601001')){ + this.columnList2=this.columnList2.filter(item => item.columnProp !== 'standardCost'); + this.columnList1=this.columnList1.filter(item => item.columnProp !== 'totalCost'); + } + + }, }, activated() { if (this.$route.params.type === 'tokenLogin') { diff --git a/src/views/modules/tooling/toolingInfo.vue b/src/views/modules/tooling/toolingInfo.vue index 07e1d1b..7a544c3 100644 --- a/src/views/modules/tooling/toolingInfo.vue +++ b/src/views/modules/tooling/toolingInfo.vue @@ -93,7 +93,7 @@ - + @@ -160,7 +160,7 @@ @@ -850,6 +850,13 @@ return s }, + fieldColumn(){ + if(!this.accessField('10601001')){ + this.columnList2=this.columnList2.filter(item => item.columnProp !== 'standardCost'); + + } + + }, }, }