diff --git a/src/api/changeManagement/changeManagement.js b/src/api/changeManagement/changeManagement.js index 36343f8..3bc6429 100644 --- a/src/api/changeManagement/changeManagement.js +++ b/src/api/changeManagement/changeManagement.js @@ -245,7 +245,7 @@ export const csExecute = data => createAPI(`/plm/changeManagement/csExecute`,'po */ export const checkSuperAdmin = data => createAPI(`/plm/changeManagement/checkSuperAdmin`,'post',data) - +export const searchDelegateAccess = (data)=> createAPI(`/plm/changeManagement/searchDelegateAccess`,'post',data) diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue index 8c6799c..911a3f7 100644 --- a/src/views/modules/changeManagement/changeRecord.vue +++ b/src/views/modules/changeManagement/changeRecord.vue @@ -203,7 +203,15 @@ - + + + + DelegateAccess + + + + + @@ -1298,6 +1306,43 @@ + + + + + + + + + + 查询 + + + + + + + + + + 确定 + 关闭 + + + @@ -1338,6 +1383,7 @@ technicalSpecificationSearch2, // 获取技术参数卡列表 choosePartNoList, // 根据视图查物料计划 checkSuperAdmin, // 校验是否为超级管理员 + searchDelegateAccess } from '@/api/changeManagement/changeManagement.js' import { getNodeList @@ -1352,6 +1398,7 @@ import OssComponents from "../oss/ossComponents.vue"; import FilterSearch from "../../common/filterSearch.vue"; import {changeRecordSearchAny, technicalSpecificationSearchAny} from "../../../api/changeManagement/changeManagement"; + import {searchDelegateAccessByUser} from "@/api/proofing/proofingInformation.js" export default { components: { FilterSearch, @@ -1363,6 +1410,13 @@ ChooseList, }, computed: { + delegateAccessName: { + get() { + return this.selectionDelegateAccess.map(item => item.delegateAccessName).join(';') + }, + set(val) { + } + }, totalCost: { get () { let total = 0 @@ -1526,6 +1580,15 @@ data () { return { buList: [], + // DelegateAccess 相关 + selectionDelegateAccess: [], + selectionDelegateAccess2: [], + delegateAccessVisible: false, + baseDelegateAccessList: [], + changeDelegateAccess: { + delegateAccess: '', + delegateAccessName: '', + }, // 导出 exportData: [], exportName: '工程变更记录' + this.dayjs().format('YYYYMMDDHHmmss'), @@ -3707,6 +3770,10 @@ this.tpExecutionInfoSearch() // 查变更单会签信息 this.countersignatureSearch() + // 查询DelegateAccess人员列表 + this.searchDelegateAccessByUser() + // 回显已选择的DelegateAccess人员 + this.searchDelegateAccess() this.activeName = 'basicInformation' this.modalFlag = true this.modalDisableFlag = true @@ -4198,6 +4265,7 @@ this.modalData.costImpactData = this.costImpactData this.modalData.executionInfoData = this.executionInfoData this.modalData.countersignatureData = this.countersignatureData + this.modalData.delegateAccessList = this.selectionDelegateAccess.map(item => item.delegateAccess) // DelegateAccess人员编码列表 this.saveLoading = true changeRequestUpdate(this.modalData).then(({data}) => { if (data && data.code === 0) { @@ -4936,6 +5004,78 @@ this.modalData.faiOperatorName = '' }, + // ======== DelegateAccess 相关方法 ======== + searchDelegateAccessByUser() { + // 角色 ROO7 的用户 + let params = { + ...this.changeDelegateAccess, + site: this.$store.state.user.site, + } + searchDelegateAccessByUser(params).then(({data}) => { + if (data && data.code === 0) { + this.baseDelegateAccessList = data.rows; + } else { + this.$message.warning(data.msg) + } + }).catch((error) => { + this.$message.error(error) + }) + }, + + handleSelectionChange(val) { + // 获得选中的 用户 + this.selectionDelegateAccess2 = val; + }, + + handleTableClick(row, column, event, val) { + // 表格行点击选择 + this.$refs[val].toggleRowSelection(row); + }, + + openDelegateAccess() { + let rows = JSON.parse(JSON.stringify(this.selectionDelegateAccess)) + if (rows && rows.length > 0) { + this.$nextTick(() => { + rows.forEach(item => { + let row = this.baseDelegateAccessList.find(row => row.delegateAccess === item.delegateAccess); + if (row) { + this.$refs.delegateAccesstTable.toggleRowSelection(row); + } + }) + }) + } + }, + + closeDelegateAccess() { + this.selectionDelegateAccess2 = []; + }, + + confirmDelegateAccess() { + this.selectionDelegateAccess = JSON.parse(JSON.stringify(this.selectionDelegateAccess2)) + this.delegateAccessVisible = false; + }, + + searchDelegateAccess() { + let params = { + site: this.modalData.site, + changeNo: this.modalData.changeNo, + } + searchDelegateAccess(params).then(({data}) => { + if (data && data.code === 0) { + this.selectionDelegateAccess = data.rows.map(item => { + return { + delegateAccess: item.delegateAccess, + delegateAccessName: item.delegateAccessName, + } + }) + } else { + this.$message.warning(data.msg) + } + }).catch((error) => { + this.$message.error(error) + }) + }, + toMenu (row) { if (this.$router.resolve(`/sampleManagement-technicalSpecificationList`).resolved.name === '404') { this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',}) diff --git a/src/views/modules/changeManagement/changeRequest.vue b/src/views/modules/changeManagement/changeRequest.vue index f376e40..5153b2e 100644 --- a/src/views/modules/changeManagement/changeRequest.vue +++ b/src/views/modules/changeManagement/changeRequest.vue @@ -199,7 +199,15 @@ - + + + + DelegateAccess + + + + + @@ -943,6 +951,43 @@ + + + + + + + + + + 查询 + + + + + + + + + + 确定 + 关闭 + + + @@ -971,6 +1016,7 @@ deleteTempChangeInfo, // 删除临时变更数据 } from "@/api/changeManagement/changeManagement.js" import {getChooselistData, verifyData} from "@/api/chooselist/chooselist.js" + import { searchDelegateAccessByUser} from "@/api/proofing/proofingInformation.js" import ChooseList from '@/views/modules/common/Chooselist' import DictDataSelect from '../sys/dict-data-select.vue' import UploadFileList from "../common/uploadFileList.vue" @@ -1041,6 +1087,15 @@ uploadDialog: false, form: [], buList: [], + // DelegateAccess 相关 + selectionDelegateAccess: [], + selectionDelegateAccess2: [], + delegateAccessVisible: false, + baseDelegateAccessList: [], + changeDelegateAccess: { + delegateAccess: '', + delegateAccessName: '', + }, // 导出 exportData: [], exportName: '工程变更申请' + this.dayjs().format('YYYYMMDDHHmmss'), @@ -2156,6 +2211,13 @@ }) }, computed:{ + delegateAccessName: { + get() { + return this.selectionDelegateAccess.map(item => item.delegateAccessName).join(';') + }, + set(val) { + } + }, totalCost: { get () { let total = 0 @@ -2622,6 +2684,7 @@ this.modalData.costImpactData = this.costImpactData // 库存成本影响 this.modalData.executionInfoData = this.executionInfoData // TP执行信息 this.modalData.countersignatureData = this.countersignatureData // 会签信息 + this.modalData.delegateAccessList = this.selectionDelegateAccess.map(item => item.delegateAccess) // DelegateAccess人员编码列表 changeRequestUpdate(this.modalData).then(({data}) => { if (data && data.code === 0) { this.modalData = data.rows.modalData @@ -3246,7 +3309,54 @@ this.modalData.faiOperatorName = '' }, + // ======== DelegateAccess 相关方法 ======== + searchDelegateAccessByUser() { + // 角色 ROO7 的用户 + let params = { + ...this.changeDelegateAccess, + site: this.$store.state.user.site, + } + searchDelegateAccessByUser(params).then(({data}) => { + if (data && data.code === 0) { + this.baseDelegateAccessList = data.rows; + } else { + this.$message.warning(data.msg) + } + }).catch((error) => { + this.$message.error(error) + }) + }, + + handleSelectionChange(val) { + // 获得选中的 用户 + this.selectionDelegateAccess2 = val; + }, + + handleTableClick(row, column, event, val) { + // 表格行点击选择 + this.$refs[val].toggleRowSelection(row); + }, + openDelegateAccess() { + let rows = JSON.parse(JSON.stringify(this.selectionDelegateAccess)) + if (rows && rows.length > 0) { + this.$nextTick(() => { + rows.forEach(item => { + let row = this.baseDelegateAccessList.find(row => row.delegateAccess === item.delegateAccess); + this.$refs.delegateAccesstTable.toggleRowSelection(row); + }) + }) + } + }, + + closeDelegateAccess() { + this.selectionDelegateAccess2 = []; + }, + + confirmDelegateAccess() { + this.selectionDelegateAccess = JSON.parse(JSON.stringify(this.selectionDelegateAccess2)) + this.delegateAccessVisible = false; + }, // ======== 导出相关方法 ======== /** diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue index 10be5b5..d1352fe 100644 --- a/src/views/modules/quote/detail/quoteDetail.vue +++ b/src/views/modules/quote/detail/quoteDetail.vue @@ -1028,6 +1028,15 @@ export default { formatDecimal(value) { const num = parseFloat(value); return !isNaN(num) ? num.toFixed(4) : value; + }, + handleSetDefaultQuoteRow(row) { + if (!this.isAuth('5011:group:current')) { + return; + } + const oldVal = this.quoteGroupDetail.currentQuoteDetailItemNo; + this.quoteGroupDetail.currentQuoteDetailItemNo = row.itemNo; + // 直接触发emit事件 + this.$emit('currentQuoteDetailItemNo', oldVal); } }, watch:{ @@ -1059,13 +1068,13 @@ export default { this.handleQueryQuoteDetail(); } }, - 'quoteGroupDetail.currentQuoteDetailItemNo'(newVal,oldVal){ - // console.log(this.quoteGroupDetail) - // emit事件触发修改 - if (this.quoteGroupDetail && this.quoteGroupDetail.currentQuoteDetailItemNo){ - this.$emit('currentQuoteDetailItemNo',oldVal); - } - } + // 'quoteGroupDetail.currentQuoteDetailItemNo'(newVal,oldVal){ + // // console.log(this.quoteGroupDetail) + // // emit事件触发修改 + // if (this.quoteGroupDetail && this.quoteGroupDetail.currentQuoteDetailItemNo){ + // this.$emit('currentQuoteDetailItemNo',oldVal); + // } + // } }, created() { this.quoteDetail.profitRate = this.quote.markup @@ -1097,14 +1106,17 @@ export default { - · +