diff --git a/src/api/base/site.js b/src/api/base/site.js index ef4b076..dc02670 100644 --- a/src/api/base/site.js +++ b/src/api/base/site.js @@ -77,3 +77,11 @@ export const searchWorkCenterBMType= data => createAPI(`/properties/searchWorkCe export const updateWorkCenterBMType= data => createAPI(`/properties/updateWorkCenterBMType`,'post',data) export const getPlmRouteItemType= data => createAPI(`/properties/getPlmRouteItemType`,'post',data) export const getUserAccessSite= data => createAPI(`/base/getUserAccessSite`,'post',data) + + +export const saveAccessRoleListForRole= data => createAPI(`/base/saveAccessRoleListForRole`,'post',data) + +export const searchUserListForRole= data => createAPI(`/base/searchUserListForRole`,'post',data) + + +export const getRoleList= data => createAPI(`/base/getRoleList`,'post',data) diff --git a/src/assets/scss/rq.scss b/src/assets/scss/rq.scss index 4b5312c..8666c32 100644 --- a/src/assets/scss/rq.scss +++ b/src/assets/scss/rq.scss @@ -89,7 +89,7 @@ //} .highlight { border-color: #08c2bc; - background-color: #96ea93; + background-color: #E0F7FA; } .auto .el-upload{ width: 100%; diff --git a/src/views/modules/base/benchmark/workCenterBM.vue b/src/views/modules/base/benchmark/workCenterBM.vue index fd9f583..abae9a7 100644 --- a/src/views/modules/base/benchmark/workCenterBM.vue +++ b/src/views/modules/base/benchmark/workCenterBM.vue @@ -2,21 +2,35 @@
- 刷新 - - {{ '导出' }} - + + + + + + + + + + + + + + 刷新 + + {{ '导出' }} + + - + @@ -100,7 +114,10 @@ height:300, dataList: [], searchData: { - site:this.$store.state.user.site + site:this.$store.state.user.site, + workCenterNo:'', + workCenterDesc:'', + itemType:'', }, exportList:[], visible:false, @@ -167,7 +184,7 @@ columnProp: "typeDesc", headerAlign: "center", align: "left", - columnLabel: "BenchMark模板", + columnLabel: "Benchmark模块", columnHidden: false, columnImage: false, columnSortable: false, @@ -234,6 +251,13 @@ this.dataList = []; } }); + + this.dataForm={ + site: this.$store.state.user.site, + } + getPlmRouteItemType(this.dataForm).then(({data})=>{ + this.itemList=data.rows + }) }, updateModel(row){ this.dataForm={ diff --git a/src/views/modules/base/propertiesItem/bmPropertiesModel.vue b/src/views/modules/base/propertiesItem/bmPropertiesModel.vue index 74afb22..5771f02 100644 --- a/src/views/modules/base/propertiesItem/bmPropertiesModel.vue +++ b/src/views/modules/base/propertiesItem/bmPropertiesModel.vue @@ -11,6 +11,13 @@ :key="index"> + + + + + + + @@ -155,7 +162,7 @@ - + @@ -264,6 +271,7 @@ site: this.$store.state.user.site, codeNo: '', codeDesc: '', + codeType: '', buNo:'', active:'Y', functionType:'', @@ -361,6 +369,24 @@ fixed: '', columnWidth: 100 }, + { + userId: this.$store.state.user.name, + functionId: 100003001, + serialNumber: '100003001TableCodeType', + tableId: "100003001Table", + tableName: "BM模板表", + columnProp: 'codeType', + headerAlign: "center", + align: "center", + columnLabel: '模块类型', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 60 + }, { userId: this.$store.state.user.name, functionId: 100003001, @@ -554,6 +580,7 @@ }, editData:{ site:'', + codeType:'', buNo:'', codeNo:'', codeDesc:'', @@ -833,6 +860,7 @@ site:row.site, buNo:row.buNo, codeDesc:row.codeDesc, + codeType:row.codeType, codeNo:row.codeNo, editFlag:row.editFlag, active:row.active, diff --git a/src/views/modules/base/roleInfo.vue b/src/views/modules/base/roleInfo.vue new file mode 100644 index 0000000..4c1004f --- /dev/null +++ b/src/views/modules/base/roleInfo.vue @@ -0,0 +1,454 @@ + + + + + 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 a45a027..b043f50 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 @@ -34,7 +34,7 @@ - + - + @@ -198,7 +198,7 @@ columnProp: "testPartNo", headerAlign: "center", align: "left", - columnLabel: "项目料号", + columnLabel: "物料编码", columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/project/projectInfo/com_project_puotation.vue b/src/views/modules/project/projectInfo/com_project_puotation.vue index 178d116..90aac59 100644 --- a/src/views/modules/project/projectInfo/com_project_puotation.vue +++ b/src/views/modules/project/projectInfo/com_project_puotation.vue @@ -151,7 +151,7 @@ columnProp: 'testPartNo', headerAlign: 'center', align: 'center', - columnLabel: '项目料号', + columnLabel: '物料编码', columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/project/projectInfo/com_project_sample.vue b/src/views/modules/project/projectInfo/com_project_sample.vue index a3d0696..2330fa4 100644 --- a/src/views/modules/project/projectInfo/com_project_sample.vue +++ b/src/views/modules/project/projectInfo/com_project_sample.vue @@ -150,7 +150,7 @@ columnProp: 'testPartNo', headerAlign: 'center', align: 'center', - columnLabel: '项目料号', + columnLabel: '物料编码', columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/project/projectInfo/com_project_technicalSpecification.vue b/src/views/modules/project/projectInfo/com_project_technicalSpecification.vue index 8d0e8f3..b28ccda 100644 --- a/src/views/modules/project/projectInfo/com_project_technicalSpecification.vue +++ b/src/views/modules/project/projectInfo/com_project_technicalSpecification.vue @@ -129,7 +129,7 @@ columnProp: "testPartNo", headerAlign: "center", align: "left", - columnLabel: "项目料号", + columnLabel: "物料编码", columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/project/projectInfo/com_project_test.vue b/src/views/modules/project/projectInfo/com_project_test.vue index 1ff92fb..fa674ff 100644 --- a/src/views/modules/project/projectInfo/com_project_test.vue +++ b/src/views/modules/project/projectInfo/com_project_test.vue @@ -132,7 +132,7 @@ export default { columnProp: 'testPartNo', headerAlign: 'center', align: 'center', - columnLabel: '项目料号', + columnLabel: '物料编码', columnHidden: false, columnImage: false, columnSortable: false, diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue index 433620c..6addaa2 100644 --- a/src/views/modules/sys/user.vue +++ b/src/views/modules/sys/user.vue @@ -32,7 +32,7 @@ {{ buttons.roleAuthorization || '角色授权' }} + > {{ buttons.roleAuthorization || '岗位授权' }} @@ -480,18 +480,18 @@
- + + }" :data="roleList" :titles="['未授权岗位', '已授权岗位']">
确定 @@ -750,7 +750,7 @@ export default { specialCompetencies: '特殊权限', factoryAuthorization: '工厂授权', buAuthorization: 'BU授权', - roleAuthorization: '角色授权', + roleAuthorization: '岗位授权', projectAuthorization: '项目授权', createTime: '创建时间', username: '用户账号',