From 53060438df3d4defc73ac1e361a38ae0f532499e Mon Sep 17 00:00:00 2001 From: ruanqi Date: Fri, 8 Nov 2024 17:40:09 +0800 Subject: [PATCH] plm BMM --- .../com_projectInfo-add-or-update.vue | 105 +++++++++++++++--- .../project/projectInfo/projectInfo.vue | 12 +- .../project/projectPart/searchProjectPart.vue | 10 +- .../com_technical-add-or-update.vue | 17 ++- src/views/modules/sys/user.vue | 20 +++- 5 files changed, 134 insertions(+), 30 deletions(-) diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue index 34bb44c..2e5116c 100644 --- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue +++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue @@ -72,7 +72,13 @@ - + + + + + + + @@ -312,6 +318,7 @@ projectManagerList:[], projectOwnerList:[], userRoleList:[], + productSet:'', }, userRoleForm:{ username:'', @@ -530,16 +537,18 @@ id: 0, site:this.$store.state.user.site, projectLevel:1, + customerProjectNo:'', projectId:'', projectTypeDb:'', projectType:'', customerName:'', + finalCustomerName:'', customerId:'', + finalCustomerId:'', projectName:'', projectDesc:'', needDate:'', priority:'', - customerProjectNo:'', projectSource:'', priorityDesc:'', projectSourceDesc:'', @@ -550,12 +559,10 @@ userRoleName:'', projectManagerList:[], projectOwnerList:[], - buNo:'', - buDesc:'', - finalCustomerId:'', - finalCustomerName:'', + userRoleList:[], + productSet:'', } - this.searchUserRollAll(); + // this.searchUserRollAll(); } if (requestCustomer){ @@ -572,6 +579,36 @@ } searchUserRoll(inData3).then(({data}) => { this.userRoleList=data.rows; + + for (let j = 0; j item.username === this.userRoleList[j].username) + if(checkData.length>0){ + this.userRoleList[j].deleteCheck=checkData[0].deleteCheck + this.userRoleList[j].deleteFlag=checkData[0].deleteFlag + this.userRoleList[j].downCheck=checkData[0].downCheck + this.userRoleList[j].downFlag=checkData[0].downFlag + this.userRoleList[j].searchCheck=checkData[0].searchCheck + this.userRoleList[j].searchFlag=checkData[0].searchFlag + this.userRoleList[j].updateCheck=checkData[0].updateCheck + this.userRoleList[j].checkAll=checkData[0].checkAll + }else { + this.userRoleList[j].deleteCheck=false + this.userRoleList[j].deleteFlag='N' + this.userRoleList[j].downCheck=false + this.userRoleList[j].downFlag='N' + this.userRoleList[j].searchCheck=false + this.userRoleList[j].searchFlag='N' + this.userRoleList[j].updateCheck=false + this.userRoleList[j].checkAll=false + } + + } + for (let i = 0; i item.operatorId === this.projectManagerList[i]) if(select.length>0){ projectManagerName+=select[0].operatorName+';' + this.addRollForUsername(select[0].operatorId,select[0].operatorName); } } this.dataForm.projectManagerName=projectManagerName @@ -625,22 +663,61 @@ let select= this.operatorList.filter(item => item.operatorId === this.projectOwnerList[i]) if(select.length>0){ projectOwnerName+=select[0].operatorName+';' + this.addRollForUsername(select[0].operatorId,select[0].operatorName); } } this.dataForm.projectOwnerName=projectOwnerName this.dataForm.projectOwnerList=JSON.parse(JSON.stringify(this.projectOwnerList)); this.ownerFlag=false + + + }, + addRollForUsername(username,userDisplay){ + console.log(username) + console.log(userDisplay) + console.log(this.dataForm.userRoleList.length) + debugger + if(this.dataForm.userRoleList.length>0) { + let checkList = this.dataForm.userRoleList.filter(item => item.username === username) + if (checkList.length === 0) { + this.dataForm.userRoleList.push({ + checkAll: true, + deleteCheck: true, + deleteFlag: 'Y', + downCheck: true, + downFlag: 'Y', + searchCheck: true, + searchFlag: 'Y', + updateCheck: true, + updateFlag: 'Y', + userDisplay: userDisplay, + username: username, + }) + this.dataForm.userRoleName += userDisplay + ';' + } + }else { + console.log(username) + console.log(userDisplay) + this.dataForm.userRoleList=[{ + checkAll: true, + deleteCheck: true, + deleteFlag: 'Y', + downCheck: true, + downFlag: 'Y', + searchCheck: true, + searchFlag: 'Y', + updateCheck: true, + updateFlag: 'Y', + userDisplay: userDisplay, + username: username, + }] + this.dataForm.userRoleName = userDisplay + ';' + } }, userRollModal(){ // this.userRoleList=JSON.parse(JSON.stringify(this.dataForm.userRoleList)); - this.searchUserRoll() - for (let i = 0; i -
+
@@ -131,11 +131,16 @@
-
- +
+
+
+ + + +
@@ -976,6 +981,7 @@ userRoleName:'', customerProjectNo:'', finalCustomerName:'', + productSet:'', }, customerData:{ site: '', diff --git a/src/views/modules/project/projectPart/searchProjectPart.vue b/src/views/modules/project/projectPart/searchProjectPart.vue index 7b72389..726e5d1 100644 --- a/src/views/modules/project/projectPart/searchProjectPart.vue +++ b/src/views/modules/project/projectPart/searchProjectPart.vue @@ -121,7 +121,7 @@
-
+
@@ -131,11 +131,16 @@
-
+
+
+ + + +
@@ -564,6 +569,7 @@ userRoleName:'', buDesc:'', buNo:'', + productSet:'', }, customerData: { site: '', diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue index fdc7300..8a1ab3d 100644 --- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue +++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue @@ -13,14 +13,14 @@ 保存后跳转至详情 - - + + - 正式料号 + IFS料号 @@ -261,7 +261,7 @@ - + @@ -270,7 +270,10 @@ - + + + + {{'查询'}} @@ -286,7 +289,7 @@ align="left" min-width="120" style="font-size: 20px" - label="正式料号"> + label="IFS料号"> - + + + + + + + {{ buttons.search || '查询' }} @@ -138,7 +144,7 @@ layout="total, sizes, prev, pager, next, jumper"> - + 用户： 名称： @@ -421,7 +427,7 @@ width="600px" title="功能清单" :close-on-click-modal="false" - :visible.sync="functionFlag"> + v-if="functionFlag"> 用户： 名称： @@ -675,6 +681,8 @@ export default { return { searchData:{ userName:'', + domainControlAccount:'', + userDisplay:'', }, saveCheckAll:'N', accessSiteVisible: false, @@ -1184,7 +1192,7 @@ export default { }, // 选中行 handleCurrentChange(val) { - this.selectUser = val + this.selectUser =JSON.parse(JSON.stringify(val)) this.showButton = false }, saveUserRoleFlag() { @@ -1271,7 +1279,9 @@ export default { params: this.$http.adornParams({ 'page': this.pageIndex, 'limit': this.pageSize, - 'username': this.searchData.userName + 'username': this.searchData.userName, + 'userDisplay': this.searchData.userDisplay, + 'domainControlAccount': this.searchData.domainControlAccount, }) }).then(({data}) => { if (data && data.code === 0) {