diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index cedbc31..38667d8 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -1716,7 +1716,7 @@ functionId: 301015, serialNumber: '301015Table3OrderNo', tableId: "301015Table3", - tableName: "派工单号表", + tableName: "任务新增-派工单", fixed: '', columnWidth: 80, columnProp: 'orderNo', @@ -1734,7 +1734,7 @@ functionId: 301015, serialNumber: '301015Table3SeqNo', tableId: "301015Table3", - tableName: "派工单号表", + tableName: "任务新增-派工单", fixed: '', columnWidth: 80, columnProp: 'seqNo', @@ -1752,7 +1752,7 @@ functionId: 301015, serialNumber: '301015Table3Sku', tableId: "301015Table3", - tableName: "派工单号表", + tableName: "任务新增-派工单", fixed: '', columnWidth: 80, columnProp: 'sku', @@ -1770,7 +1770,7 @@ functionId: 301015, serialNumber: '301015Table3PartNo', tableId: "301015Table3", - tableName: "派工单号表", + tableName: "任务新增-派工单", fixed: '', columnWidth: 80, columnProp: 'partNo', @@ -1788,7 +1788,7 @@ functionId: 301015, serialNumber: '301015Table3PartDesc', tableId: "301015Table3", - tableName: "派工单号表", + tableName: "任务新增-派工单", fixed: '', columnWidth: 80, columnProp: 'partDesc', @@ -1806,7 +1806,7 @@ functionId: 301015, serialNumber: '301015Table3Lotsize', tableId: "301015Table3", - tableName: "派工单号表", + tableName: "任务新增-派工单", fixed: '', columnWidth: 80, columnProp: 'lotsize', @@ -1824,7 +1824,7 @@ functionId: 301015, serialNumber: '301015Table3Qtyrequired', tableId: "301015Table3", - tableName: "派工单号表", + tableName: "任务新增-派工单", fixed: '', columnWidth: 80, columnProp: 'qtyrequired', @@ -1842,7 +1842,7 @@ functionId: 301015, serialNumber: '301015Table3OperationDesc', tableId: "301015Table3", - tableName: "派工单号表", + tableName: "任务新增-派工单", fixed: '', columnWidth: 80, columnProp: 'operationDesc', diff --git a/src/views/modules/qc/qcPartAttribute.vue b/src/views/modules/qc/qcPartAttribute.vue index fa0e767..c5c9133 100644 --- a/src/views/modules/qc/qcPartAttribute.vue +++ b/src/views/modules/qc/qcPartAttribute.vue @@ -1297,7 +1297,7 @@ userBuList: [], partInfoList: [], partDetailData: { - buNo: '', + bu: '', partNo: '', partDesc: '', seqNo: '', @@ -1341,7 +1341,7 @@ }, 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) { this.partInfoList = [] this.partDisableFlag = true diff --git a/src/views/modules/sys/role.vue b/src/views/modules/sys/role.vue index fa2d63b..7e4b5d0 100644 --- a/src/views/modules/sys/role.vue +++ b/src/views/modules/sys/role.vue @@ -46,8 +46,12 @@ width="150" :label="buttons.cz||'操作'"> @@ -120,6 +124,11 @@ import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/user this.favoriteIsOk() this.getDataList() }, + computed: { + adminUser() { + return this.$store.state.user.id === 1 + } + }, methods: { // 校验用户是否收藏 favoriteIsOk() {