Browse Source

2024.1.24 系统管理员不可修改删除自己 qcPartAttribute新增时查询条件加入所选bu

java8
yuejiayang 2 years ago
parent
commit
49b0cf5cdb
  1. 16
      src/views/modules/qc/FQCResultEntry.vue
  2. 4
      src/views/modules/qc/qcPartAttribute.vue
  3. 13
      src/views/modules/sys/role.vue

16
src/views/modules/qc/FQCResultEntry.vue

@ -1716,7 +1716,7 @@
functionId: 301015, functionId: 301015,
serialNumber: '301015Table3OrderNo', serialNumber: '301015Table3OrderNo',
tableId: "301015Table3", tableId: "301015Table3",
tableName: "派工单号表",
tableName: "任务新增-派工单",
fixed: '', fixed: '',
columnWidth: 80, columnWidth: 80,
columnProp: 'orderNo', columnProp: 'orderNo',
@ -1734,7 +1734,7 @@
functionId: 301015, functionId: 301015,
serialNumber: '301015Table3SeqNo', serialNumber: '301015Table3SeqNo',
tableId: "301015Table3", tableId: "301015Table3",
tableName: "派工单号表",
tableName: "任务新增-派工单",
fixed: '', fixed: '',
columnWidth: 80, columnWidth: 80,
columnProp: 'seqNo', columnProp: 'seqNo',
@ -1752,7 +1752,7 @@
functionId: 301015, functionId: 301015,
serialNumber: '301015Table3Sku', serialNumber: '301015Table3Sku',
tableId: "301015Table3", tableId: "301015Table3",
tableName: "派工单号表",
tableName: "任务新增-派工单",
fixed: '', fixed: '',
columnWidth: 80, columnWidth: 80,
columnProp: 'sku', columnProp: 'sku',
@ -1770,7 +1770,7 @@
functionId: 301015, functionId: 301015,
serialNumber: '301015Table3PartNo', serialNumber: '301015Table3PartNo',
tableId: "301015Table3", tableId: "301015Table3",
tableName: "派工单号表",
tableName: "任务新增-派工单",
fixed: '', fixed: '',
columnWidth: 80, columnWidth: 80,
columnProp: 'partNo', columnProp: 'partNo',
@ -1788,7 +1788,7 @@
functionId: 301015, functionId: 301015,
serialNumber: '301015Table3PartDesc', serialNumber: '301015Table3PartDesc',
tableId: "301015Table3", tableId: "301015Table3",
tableName: "派工单号表",
tableName: "任务新增-派工单",
fixed: '', fixed: '',
columnWidth: 80, columnWidth: 80,
columnProp: 'partDesc', columnProp: 'partDesc',
@ -1806,7 +1806,7 @@
functionId: 301015, functionId: 301015,
serialNumber: '301015Table3Lotsize', serialNumber: '301015Table3Lotsize',
tableId: "301015Table3", tableId: "301015Table3",
tableName: "派工单号表",
tableName: "任务新增-派工单",
fixed: '', fixed: '',
columnWidth: 80, columnWidth: 80,
columnProp: 'lotsize', columnProp: 'lotsize',
@ -1824,7 +1824,7 @@
functionId: 301015, functionId: 301015,
serialNumber: '301015Table3Qtyrequired', serialNumber: '301015Table3Qtyrequired',
tableId: "301015Table3", tableId: "301015Table3",
tableName: "派工单号表",
tableName: "任务新增-派工单",
fixed: '', fixed: '',
columnWidth: 80, columnWidth: 80,
columnProp: 'qtyrequired', columnProp: 'qtyrequired',
@ -1842,7 +1842,7 @@
functionId: 301015, functionId: 301015,
serialNumber: '301015Table3OperationDesc', serialNumber: '301015Table3OperationDesc',
tableId: "301015Table3", tableId: "301015Table3",
tableName: "派工单号表",
tableName: "任务新增-派工单",
fixed: '', fixed: '',
columnWidth: 80, columnWidth: 80,
columnProp: 'operationDesc', columnProp: 'operationDesc',

4
src/views/modules/qc/qcPartAttribute.vue

@ -1297,7 +1297,7 @@
userBuList: [], userBuList: [],
partInfoList: [], partInfoList: [],
partDetailData: { partDetailData: {
buNo: '',
bu: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
seqNo: '', seqNo: '',
@ -1341,7 +1341,7 @@
}, },
searchPartInfo () { searchPartInfo () {
this.partDetailData.buNo = this.modalData.bu
this.partDetailData.bu = this.modalData.bu
if (!this.partDetailData.partNo && !this.partDetailData.partDesc && !this.partDetailData.sku && !this.partDetailData.cinvSourceCode) { if (!this.partDetailData.partNo && !this.partDetailData.partDesc && !this.partDetailData.sku && !this.partDetailData.cinvSourceCode) {
this.partInfoList = [] this.partInfoList = []
this.partDisableFlag = true this.partDisableFlag = true

13
src/views/modules/sys/role.vue

@ -46,8 +46,12 @@
width="150" width="150"
:label="buttons.cz||'操作'"> :label="buttons.cz||'操作'">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="isAuth('sys:role:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.roleId)">{{buttons.edit||'修改'}}</a>
<a v-if="isAuth('sys:role:delete')" type="text" size="small" @click="deleteHandle(scope.row.roleId)">{{buttons.delete|| '删除'}}</a>
<a v-if="!adminUser && scope.row.roleName === '系统管理员'" type="text" size="small" style="pointer-events:none;color: #8a979e">{{ buttons.edit || '修改' }}</a>
<a v-if="!adminUser && scope.row.roleName !== '系统管理员'" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">{{ buttons.edit || '修改' }}</a>
<a v-if="adminUser" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">{{ buttons.edit || '修改' }}</a>
<a v-if="!adminUser && scope.row.roleName === '系统管理员'" type="text" size="small" style="pointer-events:none;color: #8a979e">{{ buttons.delete || '删除' }}</a>
<a v-if="!adminUser && scope.row.roleName !== '系统管理员'" type="text" size="small" @click="deleteHandle(scope.row.userId)">{{ buttons.delete || '删除' }}</a>
<a v-if="adminUser" type="text" size="small" @click="deleteHandle(scope.row.userId)">{{ buttons.delete || '删除' }}</a>
<!-- <a type="text" size="small" @click="showAuthCustomerReportModal(scope.row)">{{buttons.reportRole || '报表赋权'}}</a>--> <!-- <a type="text" size="small" @click="showAuthCustomerReportModal(scope.row)">{{buttons.reportRole || '报表赋权'}}</a>-->
</template> </template>
</el-table-column> </el-table-column>
@ -120,6 +124,11 @@ import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/user
this.favoriteIsOk() this.favoriteIsOk()
this.getDataList() this.getDataList()
}, },
computed: {
adminUser() {
return this.$store.state.user.id === 1
}
},
methods: { methods: {
// //
favoriteIsOk() { favoriteIsOk() {

Loading…
Cancel
Save