From 16f3fdf00baa823505f13eed762b0775ad1748eb Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 29 Apr 2024 15:15:43 +0800 Subject: [PATCH] =?UTF-8?q?2024-04-29=20ecn=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/changeManagement/changeManagement.js | 14 + src/api/customer/customerInformation.js | 6 + .../processManagement/processManagement.js | 28 + .../modules/changeManagement/changeRecord.vue | 120 +++- .../changeManagement/changeRequest.vue | 14 +- .../customerInformationManagement.vue | 53 +- src/views/modules/part/partInformation.vue | 639 ++++++++++++------ .../processManagement/processBindingInfo.vue | 318 ++++++++- .../projectInfo/com_project_info_part.vue | 298 ++++---- src/views/modules/sys/user-add-or-update.vue | 42 +- 10 files changed, 1136 insertions(+), 396 deletions(-) diff --git a/src/api/changeManagement/changeManagement.js b/src/api/changeManagement/changeManagement.js index 6f6002c..badff8b 100644 --- a/src/api/changeManagement/changeManagement.js +++ b/src/api/changeManagement/changeManagement.js @@ -179,6 +179,20 @@ export const countersignatureSearch = data => createAPI(`/plm/changeManagement/c */ export const countersignatureUpdate = data => createAPI(`/plm/changeManagement/countersignatureUpdate`,'post',data) +/** + * 下达 + * @param data + * @returns {*} + */ +export const issueChange = data => createAPI(`/plm/changeManagement/issueChange`,'post',data) + +/** + * 提交 + * @param data + * @returns {*} + */ +export const submitChange = data => createAPI(`/plm/changeManagement/submitChange`,'post',data) + diff --git a/src/api/customer/customerInformation.js b/src/api/customer/customerInformation.js index 6bbdfcc..33b3b2e 100644 --- a/src/api/customer/customerInformation.js +++ b/src/api/customer/customerInformation.js @@ -26,3 +26,9 @@ export const customerInformationEdit = data => createAPI(`/plm/customerInformati export const customerInformationDelete = data => createAPI(`/plm/customerInformation/customerInformationDelete`,'post',data) export const customerInformationSearchForCheck= data => createAPI(`/plm/customerInformation/customerInformationSearchForCheck`,'post',data) +/** + * 客户组ID输入校验 + * @param data + * @returns {*} + */ +export const checkCustomerGroup = data => createAPI(`/plm/customerInformation/checkCustomerGroup`,'post',data) diff --git a/src/api/processManagement/processManagement.js b/src/api/processManagement/processManagement.js index 8cdb2ed..3a0d090 100644 --- a/src/api/processManagement/processManagement.js +++ b/src/api/processManagement/processManagement.js @@ -56,5 +56,33 @@ export const saveRequestNodeDetail = data => createAPI(`/plm/request/saveRequest **/ export const deleteRequestNodeDetailByLine = data => createAPI(`/plm/request/deleteRequestNodeDetailByLine`,'post',data) +/** + * 获取table列表 + * @param data + * @returns {*} + */ +export const getTableList = data => createAPI(`/plm/request/getTableList`,'post',data) + +/** + * 获取表字段 + * @param data + * @returns {*} + */ +export const getFieldList = data => createAPI(`/plm/request/getFieldList`,'post',data) + +/** + * 获取权限字段集合 + * @param data + * @returns {*} + */ +export const getAuthorityFieldList = data => createAPI(`/plm/request/getAuthorityFieldList`,'post',data) + +/** + * 保存节点权限 + * @param data + * @returns {*} + */ +export const saveAuthorityList = data => createAPI(`/plm/request/saveAuthorityList`,'post',data) + diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue index efdf847..c06d021 100644 --- a/src/views/modules/changeManagement/changeRecord.vue +++ b/src/views/modules/changeManagement/changeRecord.vue @@ -58,7 +58,7 @@ label="操作"> @@ -262,6 +262,7 @@ 保存 关闭 + 提交 @@ -602,7 +603,6 @@ type="selection" header-align="center" align="center" - :selectable="selectFlag" width="50"> + + + + + + + + + + + + 确定 + 取消 + + + + + @@ -828,13 +846,17 @@ executionUpdate, // 修改执行信息 countersignatureSearch, // 查询会签信息 countersignatureUpdate, // 编辑会签信息 + issueChange, // 下达 + submitChange, // 提交 } from '@/api/changeManagement/changeManagement.js' import ChooseList from '@/views/modules/common/Chooselist' import changeUploadFile from "../base/upload_file.vue"; import {downLoadQuotationFile} from '@/api/quotation/quotationInformation.js' import DictDataSelect from "../sys/dict-data-select.vue"; + import UploadFileList from "../common/uploadFileList.vue"; export default { components: { + UploadFileList, DictDataSelect, changeUploadFile, ChooseList, @@ -875,7 +897,13 @@ } } }, + uploadDialog (newValue,oldValue) { + if (newValue === false) { + this.getChangeFileList() + } + }, }, + data () { return { // 导出 @@ -938,7 +966,8 @@ cqcOperatorId: '', cqcOperatorName: '', faiOperatorId: '', - faiOperatorName: '' + faiOperatorName: '', + nodeConclusion: '' }, costImpactData: { site: this.$store.state.user.site, @@ -1011,6 +1040,7 @@ form: [], modelList: [], itemList: [], + chooseFileList: [], // ======== 列表表头 ======== columnList: [ { @@ -1184,7 +1214,7 @@ columnProp: 'partNo', headerAlign: 'center', align: 'center', - columnLabel: '物料编码', + columnLabel: '正式物料编码', columnHidden: false, columnImage: false, status: true, @@ -1364,7 +1394,7 @@ columnProp: 'partNo', headerAlign: 'center', align: 'center', - columnLabel: '物料编码', + columnLabel: '正式物料编码', columnHidden: false, columnImage: false, status: true, @@ -1662,7 +1692,9 @@ modalFlag: false, modalDisableFlag: false, ecnTypeModalFlag: false, - chooseModelFlag: false + chooseModelFlag: false, + uploadDialog: false, + submitModalFlag: false } }, @@ -1686,6 +1718,10 @@ }, methods: { + // 获取流程的配置权限 + getNodeAuthority () { + + }, // ======= 正则校验 ======= handleInput (value, type) { @@ -1982,10 +2018,11 @@ fileRemark: '', folder: 'change', } + this.uploadDialog = true //打开组件 去做新增业务 - this.$nextTick(() => { - this.$refs.changeUploadFile.init(currentData); - }) + // this.$nextTick(() => { + // this.$refs.changeUploadFile.init(currentData); + // }) }, // 删除变更单文件 @@ -2076,7 +2113,8 @@ cqcOperatorId: row.cqcOperatorId, cqcOperatorName: row.cqcOperatorName, faiOperatorId: row.faiOperatorId, - faiOperatorName: row.faiOperatorName + faiOperatorName: row.faiOperatorName, + nodeConclusion: '' } this.changeTitle = '变更申请-' + this.modalData.changeNo // 查选择的ECN种类 @@ -2096,7 +2134,61 @@ // 下达 issueModal (row) { + let tempData = { + site: row.site, + userName: this.$store.state.user.name, + changeNo: row.changeNo, + menuId: this.$route.meta.menuId + } + issueChange(tempData).then(({data}) => { + if (data && data.code === 0) { + this.getDataList() + this.$message({message: '操作成功', type: 'success'}) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + // 打开提交模态框 + submitDataModal () { + this.modalData.nodeConclusion = 'Y' + this.submitModalFlag = true + }, + + // 提交 + submitData () { + if (this.modalData.nodeConclusion == null || this.modalData.nodeConclusion === '') { + this.$message.warning('请选择节点结论！') + return + } + this.$confirm(`是否确认提交?`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + let tempData = { + site: this.modalData.site, + userName: this.$store.state.user.name, + changeNo: this.modalData.changeNo, + menuId: this.$route.meta.menuId, + nodeConclusion: this.modalData.nodeConclusion + } + submitChange(tempData).then(({data}) => { + if (data && data.code === 0) { + this.getDataList() + this.$message({message: '操作成功', type: 'success'}) + this.submitModalFlag = false + this.modalFlag = false + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }) }, // 获取选择的ECN种类 @@ -2286,10 +2378,10 @@ this.$message.warning('请选择CQC或者FAI人员！') return } - if (this.modalData.cqcOperatorId !== '' && this.modalData.cqcOperatorId != null && this.modalData.faiOperatorId !== '' && this.modalData.faiOperatorId != null) { - this.$message.warning('CQC和FAI人员只能选一个！') - return - } + // if (this.modalData.cqcOperatorId !== '' && this.modalData.cqcOperatorId != null && this.modalData.faiOperatorId !== '' && this.modalData.faiOperatorId != null) { + // this.$message.warning('CQC和FAI人员只能选一个！') + // return + // } this.modalData.detailList = this.chooseDataList this.modalData.ecnTypeData = this.form changeRequestUpdate(this.modalData).then(({data}) => { diff --git a/src/views/modules/changeManagement/changeRequest.vue b/src/views/modules/changeManagement/changeRequest.vue index 86a1e4a..9694fdd 100644 --- a/src/views/modules/changeManagement/changeRequest.vue +++ b/src/views/modules/changeManagement/changeRequest.vue @@ -3,7 +3,7 @@ - + @@ -1049,7 +1049,7 @@ columnProp: 'partNo', headerAlign: 'center', align: 'center', - columnLabel: '物料编码', + columnLabel: '正式物料编码', columnHidden: false, columnImage: false, status: true, @@ -1195,7 +1195,7 @@ columnProp: 'partNo', headerAlign: 'center', align: 'center', - columnLabel: '物料编码', + columnLabel: '正式物料编码', columnHidden: false, columnImage: false, status: true, @@ -2069,10 +2069,10 @@ this.$message.warning('请选择CQC或者FAI人员！') return } - if (this.modalData.cqcOperatorId !== '' && this.modalData.cqcOperatorId != null && this.modalData.faiOperatorId !== '' && this.modalData.faiOperatorId != null) { - this.$message.warning('CQC和FAI人员只能选一个！') - return - } + // if (this.modalData.cqcOperatorId !== '' && this.modalData.cqcOperatorId != null && this.modalData.faiOperatorId !== '' && this.modalData.faiOperatorId != null) { + // this.$message.warning('CQC和FAI人员只能选一个！') + // return + // } this.modalData.detailList = this.chooseDataList this.modalData.ecnTypeData = this.form this.fileData.orderRef1 = this.modalData.site diff --git a/src/views/modules/customer/customerInformationManagement.vue b/src/views/modules/customer/customerInformationManagement.vue index cd1e282..abb0ebb 100644 --- a/src/views/modules/customer/customerInformationManagement.vue +++ b/src/views/modules/customer/customerInformationManagement.vue @@ -149,12 +149,12 @@ 客户组1 - + 客户组2 - + @@ -694,6 +694,7 @@ customerInformationSave, // 客户信息新增 customerInformationEdit, // 客户信息编辑 customerInformationDelete, // 客户信息删除 + checkCustomerGroup, // 客户组ID输入校验 } from '@/api/customer/customerInformation.js' import { customerContactSearch, // 客户联系人列表查询 @@ -742,6 +743,14 @@ deep: true, handler: function (newV, oldV) { this.modalData.customerNo = this.modalData.customerNo.toUpperCase() + this.modalData.customerGroupId1 = this.modalData.customerGroupId1.toUpperCase() + this.modalData.customerGroupId2 = this.modalData.customerGroupId2.toUpperCase() + if (this.modalData.customerGroupId1 == null || this.modalData.customerGroupId1 === '') { + this.modalData.customerGroupName1 = '' + } + if (this.modalData.customerGroupId2 == null || this.modalData.customerGroupId2 === '') { + this.modalData.customerGroupName2 = '' + } } } }, @@ -812,6 +821,7 @@ customerGroupId2: '', customerGroupName1: '', customerGroupName2: '', + type: '' }, contactModalData: { flag: '', @@ -2069,7 +2079,8 @@ defaultAddress: '', addressStatus: '启用', addressType: '类型一', - createBy: this.$store.state.user.name + createBy: this.$store.state.user.name, + type: '' } this.modalDisableFlag = false this.detailModalFlag = false @@ -2200,7 +2211,8 @@ contactStatus: row.contactStatus, addressName: row.addressName, defaultAddress: 'Y', - updateBy: this.$store.state.user.name + updateBy: this.$store.state.user.name, + type: '' } this.modalDisableFlag = true this.detailModalFlag = false @@ -2352,7 +2364,8 @@ companyName: row.companyName, jobDescription: row.jobDescription, contactStatus: row.contactStatus, - addressName: row.addressName + addressName: row.addressName, + type: '' } this.modalDisableFlag = true this.detailModalFlag = true @@ -2932,6 +2945,36 @@ this.projectInformationSelections = val }, + // 客户组ID输入校验 + customerGroupBlur () { + if (this.modalData.customerGroupId1 != null && this.modalData.customerGroupId1 !== '') { + this.modalData.type = '1' + checkCustomerGroup(this.modalData).then(({data}) => { + if (data && data.code === 0) { + this.modalData.customerGroupId1 = data.rows.customerGroupId + this.modalData.customerGroupName1 = data.rows.customerGroupName + } else { + this.modalData.customerGroupName1 = '' + } + }) + } + }, + + // 客户组ID输入校验 + customerGroupBlur2 () { + if (this.modalData.customerGroupId2 != null && this.modalData.customerGroupId2 !== '') { + this.modalData.type = '2' + checkCustomerGroup(this.modalData).then(({data}) => { + if (data && data.code === 0) { + this.modalData.customerGroupId12 = data.rows.customerGroupId + this.modalData.customerGroupName2 = data.rows.customerGroupName + } else { + this.modalData.customerGroupName2 = '' + } + }) + } + }, + // ======== chooseList相关方法 ======== /** * 获取基础数据列表S diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index ba0721c..b207b50 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -118,7 +118,7 @@ - + @@ -145,50 +145,50 @@ 安全代码 / Safety Code - + 计划人 / Planner - + 会计组 / Accounting Group - + 库存计量单位 / Inventory UoM - + 产品代码 / Product Code - + 商品组1 / Comm Group 1 - + 产品大类 / Product Family - + 商品组2 / Comm Group 2 - + @@ -198,7 +198,7 @@ 资产等级 / Asset Class - + @@ -208,7 +208,7 @@ 零件状态 / Part Status - + @@ -223,7 +223,7 @@ ABC类 / ABC Class ABC类 / ABC Class - + @@ -237,7 +237,7 @@ 属性模板 - + @@ -259,7 +259,7 @@ 来源国家 / Country of Origin - + @@ -272,7 +272,7 @@ 区域代码 / Region Code - + @@ -283,7 +283,7 @@ 海关统计序号 / Customs Stat No - + @@ -321,7 +321,7 @@ 零件成本组 / Part Cost Group - + @@ -360,7 +360,7 @@ 计划方法 / Planning Method - + @@ -765,7 +765,7 @@ - 上传文件 + 上传文件 + + @@ -1386,17 +1388,23 @@ copyPart, // 复制物料 getBomAndRoutingList, // 查询物料的bom和routing集合 partInformationToOfficial, // 转正式物料 + getProjectPartNo, // 获取物料编码 } from '@/api/part/partInformation.js' import { getFileContentList, // 获取物料单附件列表 deleteQuotationFile, // 文件删除 downLoadQuotationFile // 文件下载 } from '@/api/quotation/quotationInformation.js' + import { + getChooselistData + } from "@/api/chooselist/chooselist.js" import Chooselist from '@/views/modules/common/Chooselist' import partUploadFile from "./part_upload_file" import DictDataSelect from '../sys/dict-data-select.vue' + import UploadFileList from "../common/uploadFileList.vue"; export default { components: { + UploadFileList, DictDataSelect, Chooselist, partUploadFile @@ -1429,6 +1437,7 @@ this.modalData.customsStatNo = this.modalData.customsStatNo.toUpperCase() this.modalData.partCostGroupId = this.modalData.partCostGroupId.toUpperCase() this.modalData.planningMethod = this.modalData.planningMethod.toUpperCase() + this.modalData.ifsPartNo = this.modalData.ifsPartNo.toUpperCase() } }, itemData: { @@ -1454,8 +1463,12 @@ handler: function (newV, oldV) { this.locationData.locationId = this.locationData.locationId.toUpperCase() } - - } + }, + uploadDialog (newValue,oldValue) { + if (newValue === false) { + this.getFileContentData() + } + }, }, data () { return { @@ -1487,7 +1500,7 @@ limit: 10 }, // 其它 - + loading: false, // 初始页签 activeTable: 'part_item', inventoryPartTable: 'General', @@ -1590,7 +1603,8 @@ overReportTolerance: '', fixedLeadTimeHour: '', density: '', - variableLeadTimeHour: '' + variableLeadTimeHour: '', + ifsPartNo: '' }, revisionData: { flag: '', @@ -1679,6 +1693,7 @@ bomAlternativeList: [], routingAlternativeList: [], copyAttributeList: [], + fileList: [], // ======== 列表表头 ======== columnList: [ { @@ -1693,8 +1708,6 @@ columnLabel: '物料编码', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 120 @@ -1711,26 +1724,22 @@ columnLabel: '物料描述', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', - columnWidth: 120 + columnWidth: 150 }, { userId: this.$store.state.user.name, functionId: 104001, - serialNumber: '104001Table1Status', + serialNumber: '104001Table1StatusDesc', tableId: '104001Table1', tableName: '物料信息表', - columnProp: 'status', + columnProp: 'statusDesc', headerAlign: 'center', align: 'center', - columnLabel: '是否为正式物料', + columnLabel: '物料状态', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 100 @@ -1747,8 +1756,6 @@ columnLabel: '规格型号', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 120 @@ -1765,11 +1772,9 @@ columnLabel: '库存计量单位', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', - columnWidth: 60 + columnWidth: 100 }, { userId: this.$store.state.user.name, @@ -1783,8 +1788,6 @@ columnLabel: '净重', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 60 @@ -1801,11 +1804,9 @@ columnLabel: '净重单位', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', - columnWidth: 60 + columnWidth: 80 }, { userId: this.$store.state.user.name, @@ -1819,8 +1820,6 @@ columnLabel: '净数量', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 60 @@ -1837,11 +1836,9 @@ columnLabel: '数量单位', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', - columnWidth: 60 + columnWidth: 80 }, { userId: this.$store.state.user.name, @@ -1851,15 +1848,13 @@ tableName: '物料信息表', columnProp: 'lotTrackingCode', headerAlign: 'center', - align: 'left', + align: 'center', columnLabel: '批号跟踪', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', - columnWidth: 60 + columnWidth: 110 }, { userId: this.$store.state.user.name, @@ -1873,11 +1868,9 @@ columnLabel: '零件类型', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 130 }, { userId: this.$store.state.user.name, @@ -1891,11 +1884,9 @@ columnLabel: '产品大类', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 100 }, { userId: this.$store.state.user.name, @@ -1909,11 +1900,9 @@ columnLabel: '产品代码', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 100 }, { userId: this.$store.state.user.name, @@ -1927,11 +1916,9 @@ columnLabel: '商品组1', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 100 }, { userId: this.$store.state.user.name, @@ -1945,11 +1932,9 @@ columnLabel: '商品组2', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 100 }, { userId: this.$store.state.user.name, @@ -1963,11 +1948,9 @@ columnLabel: '会计组', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 100 }, { userId: this.$store.state.user.name, @@ -1981,11 +1964,9 @@ columnLabel: '计划人', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 100 }, { userId: this.$store.state.user.name, @@ -1999,8 +1980,6 @@ columnLabel: '属性模板', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 100 @@ -2017,29 +1996,25 @@ columnLabel: '备注', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', - columnWidth: 160 + columnWidth: 150 }, { userId: this.$store.state.user.name, functionId: 104001, - serialNumber: '104001Table1Active', + serialNumber: '104001Table1PlmPartNo', tableId: '104001Table1', tableName: '物料信息表', - columnProp: 'active', + columnProp: 'plmPartNo', headerAlign: 'center', align: 'center', - columnLabel: '是否在用', + columnLabel: 'PLM料号', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', - columnWidth: 60 + columnWidth: 120 }, { userId: this.$store.state.user.name, @@ -2053,8 +2028,6 @@ columnLabel: '创建时间', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 160 @@ -2071,8 +2044,6 @@ columnLabel: '创建人', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 80 @@ -2089,8 +2060,6 @@ columnLabel: '更新时间', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 160 @@ -2107,8 +2076,6 @@ columnLabel: '更新人', columnHidden: false, columnImage: false, - columnSortable: false, - sortLv: 0, status: true, fixed: '', columnWidth: 80 @@ -2690,7 +2657,7 @@ serialNumber: '104001Table4CreatedBy', tableId: '104001Table4', tableName: '文件信息表', - columnProp: 'createdBy', + columnProp: 'createBy', headerAlign: 'center', align: 'center', columnLabel: '上传人', @@ -3030,8 +2997,8 @@ updateRevisionModelFlag: false, updateRevisionModelDisableFlag: false, copyPartModelFlag: false, - loading: false, attributeDialog: true, + uploadDialog: false, } }, @@ -3651,106 +3618,112 @@ * 物料信息新增模态框 */ addModal () { - this.modalData = { - flag: '1', - title: '物料新增', - site: this.$store.state.user.site, - partNo: '', - partDesc: '', - spec: '', - partTypeDb: '', - partType: 'Purchased (raw)', - familyId: '', - familyName: '', - groupId: '', - groupName: '', - umId: '', - umName: '', - weightNet: '', - uomForWeightNet: 'kg', - volumeNet: '', - uomForVolumeNet: 'm3', - lotTrackingCode: 'Order Based', - active: 'Y', - remark: '', - supplierId: '', - supplierName: '', - productGroupId1: '', - productGroupName1: '', - productGroupId2: '', - productGroupName2: '', - productGroupId3: '', - productGroupName3: '', - productGroupId4: '*', - productGroupName4: 'NorthSky Application owner', - erpPartNo: '', - codeNo: '', - codeDesc: '', - manufacturerId: '', - manufacturerName: '', - agentId: '', - agentName: '', - createBy: this.$store.state.user.name, - typeDesignation: '', - hazardCode: '', - hazardDesc: '', - assetClass: 'S', - assetClassDesc: '标准', - dimQuality: '', - abcClass: 'C', - abcClassDesc: '', - frequencyClass: 'Very Slow Mover', - lifecycleStage: 'Development', - countryOfOrigin: '', - countryOfOriginDesc: '', - manufacturingLeadTime: 0, - expectedLeadTime: 0, - regionOfOrigin: '', - regionOfOriginDesc: '', - durabilityWeek: '', - customsStatNo: '', - customsStatDesc: '', - durabilityDay: '', - intrastatConvFactor: '', - umDesc: '', - status: 'N', - partStatus: 'A', - partStatusDesc: '活动', - configurationId: '*', - estimatedMaterialCost: 0, - inventoryValuationMethod: 'Standard Cost', - partCostGroupId: '', - partCostGroupDesc: '', - inventoryPartCostLevel: 'Cost Per Part', - invoiceConsideration: 'Ignore Invoice Price', - zeroCostFlag: 'Zero Cost Forbidden', - planningMethod: '', - planningMethodDesc: '', - safetyStock: 0, - minOrderQty: 0, - maxOrderQty: 0, - mulOrderQty: 0, - safetyLeadTime: 0, - shrinkageFac: 0, - stdOrderQty: 0, - cumLeadTime: 0, - backFlushPart: 'All Locations', - byProdAsSupplyInMrpDb: '', - unprotectedLeadTime: 0, - issueType: 'Reserve And Backflush', - mrpControlFlagDb: 'Y', - fixedLeadTimeDay: 0, - overReporting: 'Allowed', - useTheoreticalDensityDb: '', - variableLeadTimeDay: 0, - overReportTolerance: 0, - fixedLeadTimeHour: 0, - density: 0, - variableLeadTimeHour: 0 - } - this.inventoryPartTable = 'General' - this.modalDisableFlag = false - this.modalFlag = true + getProjectPartNo(this.searchData).then(({data}) => { + if (data && data.code === 0) { + this.modalData = { + flag: '1', + title: '物料新增', + site: this.$store.state.user.site, + partNo: data.partNo, + partDesc: '', + spec: '', + partTypeDb: '', + partType: 'Purchased (raw)', + familyId: '', + familyName: '', + groupId: '', + groupName: '', + umId: '', + umName: '', + weightNet: '', + uomForWeightNet: 'kg', + volumeNet: '', + uomForVolumeNet: 'm3', + lotTrackingCode: 'Order Based', + active: 'Y', + remark: '', + supplierId: '', + supplierName: '', + productGroupId1: '', + productGroupName1: '', + productGroupId2: '', + productGroupName2: '', + productGroupId3: '', + productGroupName3: '', + productGroupId4: '*', + productGroupName4: 'NorthSky Application owner', + erpPartNo: '', + codeNo: '', + codeDesc: '', + manufacturerId: '', + manufacturerName: '', + agentId: '', + agentName: '', + createBy: this.$store.state.user.name, + typeDesignation: '', + hazardCode: '', + hazardDesc: '', + assetClass: 'S', + assetClassDesc: '标准', + dimQuality: '', + abcClass: 'C', + abcClassDesc: '', + frequencyClass: 'Very Slow Mover', + lifecycleStage: 'Development', + countryOfOrigin: '', + countryOfOriginDesc: '', + manufacturingLeadTime: 0, + expectedLeadTime: 0, + regionOfOrigin: '', + regionOfOriginDesc: '', + durabilityWeek: '', + customsStatNo: '', + customsStatDesc: '', + durabilityDay: '', + intrastatConvFactor: '', + umDesc: '', + status: 'N', + partStatus: 'A', + partStatusDesc: '活动', + configurationId: '*', + estimatedMaterialCost: 0, + inventoryValuationMethod: 'Standard Cost', + partCostGroupId: '', + partCostGroupDesc: '', + inventoryPartCostLevel: 'Cost Per Part', + invoiceConsideration: 'Ignore Invoice Price', + zeroCostFlag: 'Zero Cost Forbidden', + planningMethod: '', + planningMethodDesc: '', + safetyStock: 0, + minOrderQty: 0, + maxOrderQty: 0, + mulOrderQty: 0, + safetyLeadTime: 0, + shrinkageFac: 0, + stdOrderQty: 0, + cumLeadTime: 0, + backFlushPart: 'All Locations', + byProdAsSupplyInMrpDb: '', + unprotectedLeadTime: 0, + issueType: 'Reserve And Backflush', + mrpControlFlagDb: 'Y', + fixedLeadTimeDay: 0, + overReporting: 'Allowed', + useTheoreticalDensityDb: '', + variableLeadTimeDay: 0, + overReportTolerance: 0, + fixedLeadTimeHour: 0, + density: 0, + variableLeadTimeHour: 0 + } + this.inventoryPartTable = 'General' + this.modalDisableFlag = false + this.modalFlag = true + } else { + this.$message.error('获取项目物料编码失败！') + } + }) }, /** * 物料信息编辑模态框 @@ -4642,6 +4615,277 @@ }) }, + // 安全代码输入校验 + hazardCodeBlur () { + if (this.modalData.hazardCode != null && this.modalData.hazardCode !== '') { + getChooselistData({"sqlcode": "Select hazard_code, hazard_desc from plm_safety_code where active = 'Y' and hazard_code = '" + this.modalData.hazardCode + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.hazardCode = data.baseListData[0].hazard_code + this.modalData.hazardDesc = data.baseListData[0].hazard_desc + } else { + this.modalData.hazardDesc = '' + } + } + }) + } + }, + + // 计划人输入校验 + productGroupId4Blur () { + if (this.modalData.productGroupId4 != null && this.modalData.productGroupId4 !== '') { + getChooselistData({"sqlcode": "select product_group_id,product_group_name from product_group where active = 'Y' and type = '4' and product_group_id = '" + this.modalData.productGroupId4 + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.productGroupId4 = data.baseListData[0].product_group_id + this.modalData.productGroupName4 = data.baseListData[0].product_group_name + } else { + this.modalData.productGroupName4 = '' + } + } + }) + } + }, + + // 会计组输入校验 + productGroupId3Blur () { + if (this.modalData.productGroupId3 != null && this.modalData.productGroupId3 !== '') { + getChooselistData({"sqlcode": "select product_group_id,product_group_name from product_group where active = 'Y' and type = '3' and product_group_id = '" + this.modalData.productGroupId3 + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.productGroupId3 = data.baseListData[0].product_group_id + this.modalData.productGroupName3 = data.baseListData[0].product_group_name + } else { + this.modalData.productGroupName3 = '' + } + } + }) + } + }, + + // 库存计量单位输入校验 + umIdBlur () { + if (this.modalData.umId != null && this.modalData.umId !== '') { + getChooselistData({"sqlcode": "select um_id, um_name from um where active = 'Y' and um_id = '" + this.modalData.umId + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.umId = data.baseListData[0].um_id + this.modalData.umName = data.baseListData[0].um_name + } else { + this.modalData.umName = '' + } + } + }) + } + }, + + // 产品代码输入校验 + groupIdBlur () { + if (this.modalData.groupId != null && this.modalData.groupId !== '') { + getChooselistData({"sqlcode": "select group_id, group_name from part_group where active = 'Y' and group_id = '" + this.modalData.groupId + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.groupId = data.baseListData[0].group_id + this.modalData.groupName = data.baseListData[0].group_name + } else { + this.modalData.groupName = '' + } + } + }) + } + }, + + // 商品组1输入校验 + productGroupId1Blur () { + if (this.modalData.productGroupId1 != null && this.modalData.productGroupId1 !== '') { + getChooselistData({"sqlcode": "select product_group_id, product_group_name from product_group where active = 'Y' and type = '1' and product_group_id = '" + this.modalData.productGroupId1 + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.productGroupId1 = data.baseListData[0].product_group_id + this.modalData.productGroupName1 = data.baseListData[0].product_group_name + } else { + this.modalData.productGroupName1 = '' + } + } + }) + } + }, + + // 产品大类输入校验 + familyIdBlur () { + if (this.modalData.familyId != null && this.modalData.familyId !== '') { + getChooselistData({"sqlcode": "select family_id, family_name from part_family where active = 'Y' and family_id = '" + this.modalData.familyId + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.familyId = data.baseListData[0].family_id + this.modalData.familyName = data.baseListData[0].family_name + } else { + this.modalData.familyName = '' + } + } + }) + } + }, + + // 商品组2输入校验 + productGroupId2Blur () { + if (this.modalData.productGroupId2 != null && this.modalData.productGroupId2 !== '') { + getChooselistData({"sqlcode": "Select product_group_id, product_group_name from product_group where active = 'Y' and type = '2' and product_group_id = '" + this.modalData.productGroupId2 + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.productGroupId2 = data.baseListData[0].product_group_id + this.modalData.productGroupName2 = data.baseListData[0].product_group_name + } else { + this.modalData.productGroupName2 = '' + } + } + }) + } + }, + + // 资产等级输入校验 + assetClassBlur () { + if (this.modalData.assetClass != null && this.modalData.assetClass !== '') { + getChooselistData({"sqlcode": "Select asset_class, asset_class_desc from plm_asset_class where active = 'Y' and asset_class = '" + this.modalData.assetClass + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.assetClass = data.baseListData[0].asset_class + this.modalData.assetClassDesc = data.baseListData[0].asset_class_desc + } else { + this.modalData.assetClassDesc = '' + } + } + }) + } + }, + + // 零件状态输入校验 + partStatusBlur () { + if (this.modalData.partStatus != null && this.modalData.partStatus !== '') { + getChooselistData({"sqlcode": "Select part_status, part_status_desc from plm_part_status where active = 'Y' and part_status = '" + this.modalData.partStatus + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.partStatus = data.baseListData[0].part_status + this.modalData.partStatusDesc = data.baseListData[0].part_status_desc + } else { + this.modalData.partStatusDesc = '' + } + } + }) + } + }, + + // abc类输入校验 + abcClassBlur () { + if (this.modalData.abcClass != null && this.modalData.abcClass !== '') { + getChooselistData({"sqlcode": "Select abc_class, abc_class_desc from plm_abc_class where active = 'Y' and abc_class = '" + this.modalData.abcClass + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.abcClass = data.baseListData[0].abc_class + this.modalData.abcClassDesc = data.baseListData[0].abc_class_desc + } else { + this.modalData.abcClassDesc = '' + } + } + }) + } + }, + + // 属性模板输入校验 + codeNoBlur () { + if (this.modalData.codeNo != null && this.modalData.codeNo !== '') { + getChooselistData({"sqlcode": "Select Code_no,Code_desc,Active from plm_properties_model_header where function_type='IP' and Code_no = '" + this.modalData.codeNo + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.codeNo = data.baseListData[0].Code_no + this.modalData.codeDesc = data.baseListData[0].Code_desc + } else { + this.modalData.codeDesc = '' + } + } + }) + } + }, + + // 来源国家输入校验 + countryOfOriginBlur () { + if (this.modalData.countryOfOrigin != null && this.modalData.countryOfOrigin !== '') { + getChooselistData({"sqlcode": "Select country_of_origin, country_of_origin_desc from plm_country where active = 'Y' and country_of_origin = '" + this.modalData.countryOfOrigin + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.countryOfOrigin = data.baseListData[0].country_of_origin + this.modalData.countryOfOriginDesc = data.baseListData[0].country_of_origin_desc + } else { + this.modalData.countryOfOriginDesc = '' + } + } + }) + } + }, + + // 区域代码输入校验 + regionOfOriginBlur () { + if (this.modalData.regionOfOrigin != null && this.modalData.regionOfOrigin !== '') { + getChooselistData({"sqlcode": "Select region_of_origin, region_of_origin_desc from plm_region_of_origin where active = 'Y' and region_of_origin = '" + this.modalData.regionOfOrigin + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.regionOfOrigin = data.baseListData[0].region_of_origin + this.modalData.regionOfOriginDesc = data.baseListData[0].region_of_origin_desc + } else { + this.modalData.regionOfOriginDesc = '' + } + } + }) + } + }, + + // 海关统计序号输入校验 + customsStatNoBlur () { + if (this.modalData.customsStatNo != null && this.modalData.customsStatNo !== '') { + getChooselistData({"sqlcode": "Select customs_stat_no, customs_stat_desc from plm_customs_stat where active = 'Y' and customs_stat_no = '" + this.modalData.customsStatNo + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.customsStatNo = data.baseListData[0].customs_stat_no + this.modalData.customsStatDesc = data.baseListData[0].customs_stat_desc + } else { + this.modalData.customsStatDesc = '' + } + } + }) + } + }, + + // 零件成本组输入校验 + partCostGroupIdBlur () { + if (this.modalData.partCostGroupId != null && this.modalData.partCostGroupId !== '') { + getChooselistData({"sqlcode": "Select part_cost_group_id, part_cost_group_desc from plm_part_cost_group where active = 'Y' and part_cost_group_id = '" + this.modalData.partCostGroupId + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.partCostGroupId = data.baseListData[0].part_cost_group_id + this.modalData.partCostGroupDesc = data.baseListData[0].part_cost_group_desc + } else { + this.modalData.partCostGroupDesc = '' + } + } + }) + } + }, + + // 计划方法 + planningMethodBlur () { + if (this.modalData.planningMethod != null && this.modalData.planningMethod !== '') { + getChooselistData({"sqlcode": "Select planning_method, planning_method_desc from plm_planning_method where active = 'Y' and planning_method = '" + this.modalData.planningMethod + "'"}).then(({data}) => { + if (data && data.code === 0) { + if (data.baseListData.length > 0) { + this.modalData.planningMethod = data.baseListData[0].planning_method + this.modalData.planningMethodDesc = data.baseListData[0].planning_method_desc + } else { + this.modalData.planningMethodDesc = '' + } + } + }) + } + }, // ======== 列表操作方法 ======== /** @@ -4724,10 +4968,11 @@ createBy: this.$store.state.user.name, partNo: this.partCurrentRow.partNo } + this.uploadDialog = true //打开组件 去做新增业务 - this.$nextTick(() => { - this.$refs.partUploadFile.init(currentData); - }) + // this.$nextTick(() => { + // this.$refs.partUploadFile.init(currentData); + // }) }, /** * 文件删除 diff --git a/src/views/modules/processManagement/processBindingInfo.vue b/src/views/modules/processManagement/processBindingInfo.vue index edc406e..59ddb4b 100644 --- a/src/views/modules/processManagement/processBindingInfo.vue +++ b/src/views/modules/processManagement/processBindingInfo.vue @@ -171,10 +171,11 @@ fixed="right" header-align="center" align="center" - width="100" + width="130" label="操作"> @@ -202,29 +203,63 @@ style="width: 100%;"> - + + + + + + + + + + + + + + @@ -235,6 +270,57 @@ + + + + + + + + + + + + + + + + + + + +
+ 应用 + 关闭 +
+ + + @@ -250,6 +336,10 @@ getNodeDetail,//获取流程节点出口配置 saveRequestNodeDetail,//保存流程节点出口配置 deleteRequestNodeDetailByLine,//删除流程当前节点的全部出口配置 + getTableList, // 获取table列表 + getFieldList, // 获取表字段 + getAuthorityFieldList, // 获取权限字段集合 + saveAuthorityList, // 保存节点权限 } from '@/api/processManagement/processManagement.js' import Chooselist from '@/views/modules/common/Chooselist' import DictDataSelect from '../sys/dict-data-select.vue' @@ -312,11 +402,25 @@ updateDate: '', updateBy: '' }, + authorityData: { + site: this.$store.state.user.site, + bu: '', + classificationNo: '', + nodeId: '', + nodeName: '', + fieldId: '', + tableId: '', + fieldList: [], + createBy: '', + }, // ======== 数据列表 ======== dataList: [], checkedDetail: [], nodeList: [], tableData: [], + tableList: [], + fieldList: [], + authoritySelections: [], // ======== 列表表头 ======== columnList: [ { @@ -427,7 +531,6 @@ fixed: '', columnWidth: 60 }, - { userId: this.$store.state.user.name, functionId: 109001, @@ -684,7 +787,6 @@ },*/ ], - // ======== 必填规则 ======== rules: { classificationName: [ @@ -725,7 +827,7 @@ subDetailFlag: false, maintenanceFlag: false, modalFlag: false, - + authorityFlag: false } }, @@ -738,10 +840,135 @@ }, created () { + // 获取数据列表 this.getDataList() }, methods: { + + // 点击行选中复选框 + authorityClickRow (row) { + this.$refs.authorityTable.toggleRowSelection(row) + }, + + // 多选 + selectionAuthority (val) { + this.authoritySelections = val + }, + + // 权限配置 + authorityModal (row) { + this.authorityData = { + site: row.site, + bu: '', + classificationNo: row.classificationNo, + nodeId: row.nodeId, + nodeName: row.nodeName, + fieldId: '', + tableId: this.tableList.length > 0 ? this.tableList[0].tableId : '', + fieldList: [], + createBy: this.$store.state.user.name + } + // 先清空缓存选中 + this.$nextTick(() => this.$refs.authorityTable.clearSelection()) + getAuthorityFieldList(this.authorityData).then(({data}) => { + if (data && data.code === 0) { + this.authorityData.fieldList = data.rows + this.authorityData.fieldList.forEach(val => { + // 回显选中 + if (val.updateCheck) { + this.$nextTick(() => this.$refs.authorityTable.toggleRowSelection(val, true)) + } + }) + } else { + this.authorityData.fieldList = [] + } + }) + this.authorityFlag = true + }, + + // 表改变事件 + tableChange3 () { + getAuthorityFieldList(this.authorityData).then(({data}) => { + if (data && data.code === 0) { + this.authorityData.fieldList = data.rows + this.authorityData.fieldList.forEach(val => { + // 回显选中 + if (val.updateCheck) { + this.$nextTick(() => this.$refs.authorityTable.toggleRowSelection(val, true)) + } + }) + } else { + this.authorityData.fieldList = [] + } + }) + }, + + // 保存节点权限 + saveAuthorityList () { + let tempData = { + site: this.authorityData.site, + bu: '', + classificationNo: this.authorityData.classificationNo, + nodeId: this.authorityData.nodeId, + nodeName: this.authorityData.nodeName, + fieldId: '', + tableId: this.authorityData.tableId, + fieldList: this.authoritySelections, + createBy: this.$store.state.user.name + } + saveAuthorityList(tempData).then(({data}) => { + if (data && data.code === 0) { + this.$message.success( '操作成功') + } else { + this.$message.error(data.msg) + } + }) + }, + + // 表改变事件 + tableChange (index) { + let tempData = { + tableId: this.tableData[index].plmTable + } + getFieldList(tempData).then(({data}) => { + if (data && data.code === 0) { + this.fieldList = data.rows + } else { + this.fieldList = [] + } + }) + this.tableData[index].plmField = '' + }, + + // 表改变事件 + tableChange2 (index) { + let tempData = { + tableId: this.tableData[index].plmTable + } + getFieldList(tempData).then(({data}) => { + if (data && data.code === 0) { + this.fieldList = data.rows + } else { + this.fieldList = [] + } + }) + }, + + // 获取Table列表 + getTableList (type) { + let tempData = { + tableType: type + } + getTableList(tempData).then(({data}) => { + if (data && data.code === 0) { + this.tableList = data.rows + } else { + this.tableList = [] + } + }) + }, + // ======= 正则校验 ======= handleInput (value, type) { // 大于等于0，且只能输入4位小数 @@ -802,6 +1029,12 @@ this.requestCurrentRow = JSON.parse(JSON.stringify(row)) // 刷新当前页表 this.refreshCurrentTabTable() + + this.tableList = [] + this.fieldList = [] + if (row.menuId === '108002') { + this.getTableList('plm_change') + } } }, /** @@ -823,22 +1056,40 @@ }, // 点击新增更多 handleAddBtn () { - let obj = {} - obj.site = this.$store.state.user.site, - obj.classificationNo = this.nodeCurrentRow.classificationNo, - obj.workflowId = this.nodeCurrentRow.workflowId, - obj.nodeId = this.nodeCurrentRow.nodeId, - obj.nodeName = this.nodeCurrentRow.nodeName, - obj.createBy = this.$store.state.user.name, - obj.remark = "", - obj.plmField = "", - obj.oaField = "", - obj.fieldValue = "", - obj.fieldDesc = "", - obj.orderRef1 = "", - obj.orderRef2 = "", - obj.orderRef3 = "", - obj.orderRef4 = "" + let obj = { + site: this.$store.state.user.site, + classificationNo: this.nodeCurrentRow.classificationNo, + workflowId: this.nodeCurrentRow.workflowId, + nodeId: this.nodeCurrentRow.nodeId, + nodeName: this.nodeCurrentRow.nodeName, + createBy: this.$store.state.user.name, + remark: '', + plmField: '', + oaField: '', + fieldValue: '', + fieldDesc: '', + orderRef1: '', + orderRef2: '', + orderRef3: '', + orderRef4: '', + plmTable: '', + fieldType: 'B' + } + // obj.site = this.$store.state.user.site + // obj.classificationNo = this.nodeCurrentRow.classificationNo + // obj.workflowId = this.nodeCurrentRow.workflowId + // obj.nodeId = this.nodeCurrentRow.nodeId + // obj.nodeName = this.nodeCurrentRow.nodeName + // obj.createBy = this.$store.state.user.name + // obj.remark = "" + // obj.plmField = "" + // obj.oaField = "" + // obj.fieldValue = "" + // obj.fieldDesc = "" + // obj.orderRef1 = "" + // obj.orderRef2 = "" + // obj.orderRef3 = "" + // obj.orderRef4 = "" this.tableData.push(obj) }, @@ -899,6 +1150,9 @@ getNodeDetail(tempData).then(({data}) => { if (data && data.code === 0) { this.tableData = data.rows + for (let i = 0; i < this.tableData.length; i++) { + this.tableChange2(i) + } } else { this.tableData = [] } @@ -1030,12 +1284,20 @@ checkDataBySubDetail(){ for (let i = 0; i < this.tableData.length; i++) { + if(this.tableData[i].plmTable === '' || this.tableData[i].plmTable == null){ + this.$message.warning('序号' + (i+1) +'未选择PLM数据表,数据表为必填项！') + return + } + if(this.tableData[i].plmField === '' || this.tableData[i].plmField == null){ + this.$message.warning('序号' + (i+1) +'未选择PLM字段名,字段名为必填项！') + return + } if(this.tableData[i].oaField === '' || this.tableData[i].oaField == null){ this.$message.warning('序号' + (i+1) +'未填写OA字段名,字段名为必填项！') return } - if(this.tableData[i].plmField === '' || this.tableData[i].plmField == null){ - this.$message.warning('序号' + (i+1) +'未填写PLM字段名,字段名为必填项！') + if(this.tableData[i].fieldType === '' || this.tableData[i].fieldType == null){ + this.$message.warning('序号' + (i+1) +'未选择PLM字段类型,字段类型为必填项！') return } } diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue index b1824d5..d60882f 100644 --- a/src/views/modules/project/projectInfo/com_project_info_part.vue +++ b/src/views/modules/project/projectInfo/com_project_info_part.vue @@ -781,41 +781,8 @@ status: true, fixed: '', columnWidth: 100 - },{ - userId: this.$store.state.user.name, - functionId: 101002001, - serialNumber: '101002001Table4PartType', - tableId: "101002001Table4", - tableName: "项目物料", - columnProp: "partType", - 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: 101002001, - serialNumber: '101002001Table4PartTypeDesc', - tableId: "101002001Table4", - tableName: "项目物料", - columnProp: "partTypeDesc", - headerAlign: "center", - align: "left", - columnLabel: "物料分类名称", - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 80 - },{ + }, + { userId: this.$store.state.user.name, functionId: 101002001, serialNumber: '101002001Table4PartDesc', @@ -832,7 +799,62 @@ status: true, fixed: '', columnWidth: 120 - },{ + }, + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table4StatusDesc', + tableId: "101002001Table4", + tableName: "项目物料", + columnProp: "statusDesc", + headerAlign: "center", + align: "center", + columnLabel: "物料状态", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + }, + // { + // userId: this.$store.state.user.name, + // functionId: 101002001, + // serialNumber: '101002001Table4PartType', + // tableId: "101002001Table4", + // tableName: "项目物料", + // columnProp: "partType", + // 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: 101002001, + serialNumber: '101002001Table4PartTypeDesc', + tableId: "101002001Table4", + tableName: "项目物料", + columnProp: "partTypeDesc", + headerAlign: "center", + align: "left", + columnLabel: "物料分类", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 + }, + { userId: this.$store.state.user.name, functionId: 101002001, serialNumber: '101002001Table4CodeNo', @@ -849,7 +871,8 @@ status: true, fixed: '', columnWidth: 80 - },{ + }, + { userId: this.$store.state.user.name, functionId: 101002001, serialNumber: '101002001Table4CodeDesc', @@ -866,94 +889,117 @@ status: true, fixed: '', columnWidth: 100 - },{ - userId: this.$store.state.user.name, - functionId: 101002001, - serialNumber: '101002001Table4Remark', - tableId: "101002001Table4", - tableName: "项目物料", - columnProp: "remark", - headerAlign: "center", - align: "left", - columnLabel: "备注", - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 101002001, - serialNumber: '101002001Table4CreateDate', - tableId: "101002001Table4", - tableName: "项目物料", - columnProp: "createDate", - headerAlign: "center", - align: "left", - columnLabel: "创建时间", - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 101002001, - serialNumber: '101002001Table4CreateBy', - tableId: "101002001Table4", - tableName: "项目物料", - columnProp: "createBy", - headerAlign: "center", - align: "left", - columnLabel: "创建人", - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 80 - },{ - userId: this.$store.state.user.name, - functionId: 101002001, - serialNumber: '101002001Table4UpdateDate', - tableId: "101002001Table4", - tableName: "项目物料", - columnProp: "updateDate", - headerAlign: "center", - align: "left", - columnLabel: "上次修改日期", - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - },{ - userId: this.$store.state.user.name, - functionId: 101002001, - serialNumber: '101002001Table4UpdateBy', - tableId: "101002001Table4", - tableName: "项目物料", - columnProp: "updateBy", - headerAlign: "center", - align: "left", - columnLabel: "修改人", - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 80 - }, + }, + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table4Remark', + tableId: "101002001Table4", + tableName: "项目物料", + columnProp: "remark", + headerAlign: "center", + align: "left", + columnLabel: "备注", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table4PlmPartNo', + tableId: "101002001Table4", + tableName: "项目物料", + columnProp: "plmPartNo", + headerAlign: "center", + align: "center", + columnLabel: "PLM料号", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table4CreateDate', + tableId: "101002001Table4", + tableName: "项目物料", + columnProp: "createDate", + headerAlign: "center", + align: "left", + columnLabel: "创建时间", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table4CreateBy', + tableId: "101002001Table4", + tableName: "项目物料", + columnProp: "createBy", + headerAlign: "center", + align: "left", + columnLabel: "创建人", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 + }, + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table4UpdateDate', + tableId: "101002001Table4", + tableName: "项目物料", + columnProp: "updateDate", + headerAlign: "center", + align: "left", + columnLabel: "上次修改日期", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, + { + userId: this.$store.state.user.name, + functionId: 101002001, + serialNumber: '101002001Table4UpdateBy', + tableId: "101002001Table4", + tableName: "项目物料", + columnProp: "updateBy", + headerAlign: "center", + align: "left", + columnLabel: "修改人", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 + }, ], - dataForm:{ + dataForm: { id:'', site: '', projectId: '', @@ -1675,7 +1721,7 @@ this.modalDisableFlag = false this.inventoryPartTable = 'General' } else { - this.$message.error('获取项目物料编码失败，请重试！') + this.$message.error('获取项目物料编码失败！') } }) }, @@ -1903,7 +1949,7 @@ this.modalDisableFlag = false this.inventoryPartTable = 'General' } else { - this.$message.error('获取项目物料失败，请重试！') + this.$message.error('获取项目物料编码失败！') } }) }, diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue index ec7feda..5fff725 100644 --- a/src/views/modules/sys/user-add-or-update.vue +++ b/src/views/modules/sys/user-add-or-update.vue @@ -7,9 +7,7 @@ :visible.sync="visible" @close="closeDataDialog"> - + @@ -18,8 +16,7 @@ - + @@ -86,12 +83,14 @@ + + + + + - {{ - role.roleName - }} - + {{role.roleName}} @@ -159,7 +158,8 @@ export default { siteID: '', bu:'', siteName:'', - userDisplay: '' + userDisplay: '', + domainControlAccount: '' }, buttons: { add: '添加', @@ -181,6 +181,7 @@ export default { siteID: '工厂', siteName:'工厂名称', language: '语言', + domainControlAccount: '域控账号' }, } }, @@ -314,6 +315,7 @@ export default { this.dataForm.departmentName = data.user.departmentName this.dataForm.post = data.user.post this.dataForm.postNo = data.user.postNo + this.dataForm.domainControlAccount = data.user.domainControlAccount this.getBDPList() } }) @@ -328,19 +330,20 @@ export default { salt: '', email: '', mobile: '', - bu:'', - department:'', - departmentNo:'', - departmentName:'', - post:'', - postNo:'', - postName:'', + bu: '', + department: '', + departmentNo: '', + departmentName: '', + post: '', + postNo: '', + postName: '', roleIdList: [], status: 1, site: '', siteID: '', - siteName:'', - userDisplay: '' + siteName: '', + userDisplay: '', + domainControlAccount: '' } } }) @@ -367,6 +370,7 @@ export default { 'buNo': this.dataForm.buNo, 'departmentNo': this.dataForm.departmentNo, 'postNo': this.dataForm.postNo, + 'domainControlAccount': this.dataForm.domainControlAccount }) }).then(({data}) => { if (data && data.code === 0) {