From 28c8c57ad4cd1c2e5466e70c5384204a0ee4ea92 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 21 Nov 2023 17:37:32 +0800 Subject: [PATCH 1/2] 2023-11-21 --- src/api/part/bomManagement.js | 32 + src/api/part/partInformation.js | 16 +- src/views/modules/part/bomManagement.vue | 544 +++++++++++++ src/views/modules/part/partInformation.vue | 822 ++++++++++++++++---- src/views/modules/part/part_upload_file.vue | 27 +- 5 files changed, 1273 insertions(+), 168 deletions(-) create mode 100644 src/api/part/bomManagement.js create mode 100644 src/views/modules/part/bomManagement.vue diff --git a/src/api/part/bomManagement.js b/src/api/part/bomManagement.js new file mode 100644 index 0000000..7924e3d --- /dev/null +++ b/src/api/part/bomManagement.js @@ -0,0 +1,32 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +/** + * bom列表查询 + * @param data + * @returns {*} + */ +export const bomManagementSearch = data => createAPI(`/plm/bomManagement/bomManagementSearch`,'post',data) + +/** + * bom新增 + * @param data + * @returns {*} + */ +export const bomManagementSave = data => createAPI(`/plm/bomManagement/bomManagementSave`,'post',data) + +/** + * bom编辑 + * @param data + * @returns {*} + */ +export const bomManagementEdit = data => createAPI(`/plm/bomManagement/bomManagementEdit`,'post',data) + +/** + * bom删除 + * @param data + * @returns {*} + */ +export const bomManagementDelete = data => createAPI(`/plm/bomManagement/bomManagementDelete`,'post',data) + + + diff --git a/src/api/part/partInformation.js b/src/api/part/partInformation.js index 45947aa..12e70fd 100644 --- a/src/api/part/partInformation.js +++ b/src/api/part/partInformation.js @@ -33,16 +33,24 @@ export const partInformationDelete = data => createAPI(`/plm/partInformation/par export const getPartItem = data => createAPI(`/plm/partInformation/getPartItem`,'post',data) /** - * 获取材料单附件列表 + * 编辑材料属性 * @param data * @returns {*} */ -export const getFileContentList = data => createAPI(`/plm/partInformation/getFileContentList`,'post',data) +export const savePartItemValue = data => createAPI(`/plm/partInformation/savePartItemValue`,'post',data) + +/** + * 获取代理商列表 + * @param data + * @returns {*} + */ +export const getAgentList = data => createAPI(`/plm/partInformation/getAgentList`,'post',data) + /** - * 获取材料单附件列表 + * 获取材料代理商 * @param data * @returns {*} */ -export const deletePartFile = data => createAPI(`/plm/partInformation/deletePartFile`,'post',data) +export const getPartAgent = data => createAPI(`/plm/partInformation/getPartAgent`,'post',data) diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue new file mode 100644 index 0000000..6fdf9e6 --- /dev/null +++ b/src/views/modules/part/bomManagement.vue @@ -0,0 +1,544 @@ + + + + + + + + + + + + + + + diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index b06f61a..0213b35 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -117,7 +117,7 @@ - + @@ -125,61 +125,65 @@ - + - - 计量单位 + + 计量单位 - - 材料分类1 + + 材料分类1 - - 材料分类2 + + 材料分类2 - 商品组1 + 商品组1 - 商品组2 + 商品组2 - 商品组3 + 商品组3 - 商品组4 + 商品组4 - - 属性模板 + + 属性模板 - - 制造商 + + 制造商 - - + + + + 代理商 + + @@ -232,13 +236,173 @@ fixed="right" label="操作"> + + + + + + + + + + + + + + + + + + + + + + + + + + 上传文件 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 保存 + 关闭 + + + + + +
+ + + + + + + + + 查询 + + + + + + + + + +
+ + 确认 + 关闭 + + + @@ -254,10 +418,13 @@ partInformationEdit, // 材料信息编辑 partInformationDelete, // 材料信息删除 getPartItem, // 查询材料属性 - getFileContentList, // 获取材料单附件列表 - deletePartFile, // 文件删除 + savePartItemValue, // 编辑属性值 + getAgentList, // 获取代理商列表 + getPartAgent, // 获取材料代理商 } from '@/api/part/partInformation.js' import { + getFileContentList, // 获取材料单附件列表 + deleteQuotationFile, // 文件删除 downLoadQuotationFile // 文件下载 } from '@/api/quotation/quotationInformation.js' import Chooselist from '@/views/modules/common/Chooselist' @@ -280,8 +447,8 @@ return { // 导出 exportData: [], - exportName: '设备分类' + this.dayjs().format('YYYYMMDDHHmmss'), - exportHeader: ['设备分类'], + exportName: '物料档案管理' + this.dayjs().format('YYYYMMDDHHmmss'), + exportHeader: ['物料档案管理'], exportFooter: [], resultList: [], // ======== 行高 ======== @@ -344,12 +511,32 @@ createDate: '', createBy: '', updateDate: '', - updateBy: '' + updateBy: '', + agentId: '', + agentName: '' + }, + itemData:{ + site: '', + partNo: '', + propertiesItemNo: '', + itemDesc: '', + textValue: '', + numValue: '', + recordType: 'B' + }, + agentData: { + site: this.$store.state.user.site, + agentId: '', + agentName: '', }, // ======== 数据列表 ======== dataList: [], partItemList: [], + partAgentList: [], fileContentList: [], + availableValueList:[], + agentList: [], + agentSelections: [], // ======== 列表表头 ======== columnList: [ { @@ -556,7 +743,7 @@ serialNumber: '104001Table1ItemNo', tableId: '104001Table1', tableName: '材料信息表', - columnProp: 'codeNo', + columnProp: 'codeDesc', headerAlign: 'center', align: 'center', columnLabel: '属性模板', @@ -586,6 +773,24 @@ fixed: '', columnWidth: 160 }, + { + userId: this.$store.state.user.name, + functionId: 104001, + serialNumber: '104001Table1AgentName', + tableId: '104001Table1', + tableName: '材料信息表', + columnProp: 'agentName', + headerAlign: 'center', + align: 'center', + columnLabel: '代理商', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 160 + }, { userId: this.$store.state.user.name, functionId: 104001, @@ -613,7 +818,7 @@ columnProp: 'active', headerAlign: 'center', align: 'center', - columnLabel: '在用', + columnLabel: '是否在用', columnHidden: false, columnImage: false, columnSortable: false, @@ -753,8 +958,8 @@ { userId: this.$store.state.user.name, functionId: 104001, - serialNumber: '104001TableValueChooseFlag', - tableId: "104001Table", + serialNumber: '104001Table2ValueChooseFlag', + tableId: "104001Table2", tableName: "材料属性表", columnProp: 'textValue', headerAlign: "center", @@ -771,8 +976,8 @@ { userId: this.$store.state.user.name, functionId: 104001, - serialNumber: '104001TableValueChooseFlag', - tableId: "104001Table", + serialNumber: '104001Table2ValueChooseFlag', + tableId: "104001Table2", tableName: "材料属性表", columnProp: 'numValue', headerAlign: "center", @@ -787,12 +992,133 @@ columnWidth: 70, }, ], - fileColumnList: [ + columnAgentList: [ { userId: this.$store.state.user.name, functionId: 104001, - serialNumber: '104001Table2FileName', - tableId: '104001Table2', + serialNumber: '104001Table3AgentId', + tableId: "104001Table3", + tableName: "材料代理商表", + columnProp: 'agentId', + headerAlign: "center", + align: "center", + columnLabel: '代理商编码', + columnHidden: false, + columnImage: false, + columnSortable: true, + sortLv: 0, + status: true, + fixed: '', + }, + { + userId: this.$store.state.user.name, + functionId: 104001, + serialNumber: '104001Table3AgentName', + tableId: "104001Table3", + tableName: "材料代理商表", + columnProp: 'agentName', + headerAlign: "center", + align: "center", + columnLabel: '代理商名称', + columnHidden: false, + columnImage: false, + columnSortable: true, + sortLv: 0, + status: true, + fixed: '', + }, + { + userId: this.$store.state.user.name, + functionId: 104001, + serialNumber: '104001Table3Active', + tableId: '104001Table3', + tableName: '材料代理商表', + columnProp: 'active', + headerAlign: 'center', + align: 'center', + columnLabel: '是否在用', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + userId: this.$store.state.user.name, + functionId: 104001, + serialNumber: '104001Table3CreateDate', + tableId: '104001Table3', + tableName: '材料代理商表', + columnProp: 'createDate', + headerAlign: 'center', + align: 'center', + columnLabel: '创建时间', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + userId: this.$store.state.user.name, + functionId: 104001, + serialNumber: '104001Table3CreateBy', + tableId: '104001Table3', + tableName: '材料代理商表', + columnProp: 'createBy', + headerAlign: 'center', + align: 'center', + columnLabel: '创建人', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + userId: this.$store.state.user.name, + functionId: 104001, + serialNumber: '104001Table3UpdateDate', + tableId: '104001Table3', + tableName: '材料代理商表', + columnProp: 'updateDate', + headerAlign: 'center', + align: 'center', + columnLabel: '更新时间', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + userId: this.$store.state.user.name, + functionId: 104001, + serialNumber: '104001Table3UpdateBy', + tableId: '104001Table3', + tableName: '材料代理商表', + columnProp: 'updateBy', + headerAlign: 'center', + align: 'center', + columnLabel: '更新人', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + } + ], + columnFileList: [ + { + userId: this.$store.state.user.name, + functionId: 104001, + serialNumber: '104001Table4FileName', + tableId: '104001Table4', tableName: '文件信息表', columnProp: 'fileName', headerAlign: 'center', @@ -804,13 +1130,12 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 140 }, { userId: this.$store.state.user.name, functionId: 104001, - serialNumber: '104001Table2FileRemark', - tableId: '104001Table2', + serialNumber: '104001Table4FileRemark', + tableId: '104001Table4', tableName: '文件信息表', columnProp: 'fileRemark', headerAlign: 'center', @@ -822,13 +1147,12 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 240 }, { userId: this.$store.state.user.name, functionId: 104001, - serialNumber: '104001Table2CreateDate', - tableId: '104001Table2', + serialNumber: '104001Table4CreateDate', + tableId: '104001Table4', tableName: '文件信息表', columnProp: 'createDate', headerAlign: 'center', @@ -840,13 +1164,12 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 140 }, { userId: this.$store.state.user.name, functionId: 104001, - serialNumber: '104001Table2CreatedBy', - tableId: '104001Table2', + serialNumber: '104001Table4CreatedBy', + tableId: '104001Table4', tableName: '文件信息表', columnProp: 'createdBy', headerAlign: 'center', @@ -858,12 +1181,99 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 140 } ], + agentColumnList: [ + { + columnProp: 'agentId', + headerAlign: "center", + align: "center", + columnLabel: '代理商编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'agentName', + headerAlign: "center", + align: "center", + columnLabel: '代理商名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + ], // ======== 必填规则 ======== rules: { - + partDesc: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + spec: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + umName: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + familyName: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + groupName: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + codeDesc: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + manufacturerName: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + active: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], + agentName: [ + { + required: true, + message: ' ', + trigger: 'change' + } + ], }, // ======== 复选数据集 ======== partSelections: [], @@ -872,6 +1282,12 @@ // ======== 模态框开关控制 ======== modalFlag: false, modalDisableFlag: false, + itemChooseFlag: false, + itemTextDisableFlag: false, + itemNumberDisableFlag: false, + itemModalDisableFlag: false, + itemModalFlag: false, + agentModelFlag: false } }, mounted () { @@ -940,6 +1356,10 @@ refreshCurrentTabTable () { if (this.activeTable === 'part_item') { this.getPartItem() + } else if (this.activeTable === 'part_agent') { + this.getPartAgent() + } else if (this.activeTable === 'part_file') { + this.getFileContentData() } }, @@ -962,7 +1382,23 @@ } }) }, - + /** + * 查询材料代理商 + */ + getPartAgent () { + let tempData = { + site: this.$store.state.user.site, + partNo: this.partCurrentRow.partNo, + agentId: this.partCurrentRow.agentId + } + getPartAgent(tempData).then(({data}) => { + if (data && data.code === 0) { + this.partAgentList = data.rows + } else { + this.partAgentList = [] + } + }) + }, // ======== 列表数据刷新方法 ======== /** @@ -1011,7 +1447,7 @@ groupName: '', umId: '', umName: '', - active: '', + active: 'Y', remark: '', supplierId: '', supplierName: '', @@ -1025,8 +1461,11 @@ productGroupName4: '', erpPartNo: '', codeNo: '', + codeDesc: '', manufacturerId: '', manufacturerName: '', + agentId: '', + agentName: '', createBy: this.$store.state.user.name } this.modalDisableFlag = false @@ -1066,14 +1505,82 @@ productGroupName4: row.productGroupName4, erpPartNo: row.erpPartNo, codeNo: row.codeNo, + codeDesc: row.codeDesc, manufacturerId: row.manufacturerId, manufacturerName: row.manufacturerName, + agentId: row.agentId, + agentName: row.agentName, updateBy: this.$store.state.user.name } this.modalDisableFlag = true this.modalFlag = true }, + /** + * 选择代理商 + */ + getAgentList () { + // 先清空缓存选中 + this.$nextTick(() => this.$refs.agentTable.clearSelection()) + // 拿到选中的代理商id + let tempDataList = this.modalData.agentId.split(';') + // 查询所有代理商 + getAgentList(this.agentData).then(({data}) => { + if (data && data.code === 0) { + this.agentList = data.rows + this.agentList.forEach(val => { + // 回显选中的代理商 + if (tempDataList.includes(val.agentId)) { + this.$nextTick(() => this.$refs.agentTable.toggleRowSelection(val, true)) + } + }) + this.agentModelFlag = true + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + /** + * 代理商多选 + * @param row + */ + agentClickRow (row) { + this.$refs.agentTable.toggleRowSelection(row); + }, + /** + * 获得选中的代理商 + * @param val + */ + selectionAgent (val) { + this.agentSelections = val + }, + /** + * 返回列表唯一值 + * @param row + * @returns {string|[{trigger: string, message: string, required: boolean}]|*} + */ + getRowKeys (row) { + // 唯一值，一般都为id + return row.agentId; + }, + /** + * 确认多选代理商 + * @returns {boolean} + */ + confirmAgent () { + this.modalData.agentId = '' + this.modalData.agentName = '' + for (let i = 0; i < this.agentSelections.length; i++) { + this.modalData.agentId = this.modalData.agentId + ";" + this.agentSelections[i].agentId + this.modalData.agentName = this.modalData.agentName + ";" + this.agentSelections[i].agentName + } + this.modalData.agentId = this.modalData.agentId.substring(1) + this.modalData.agentName = this.modalData.agentName.substring(1) + this.agentModelFlag = false + }, + // ======== 新增/编辑/删除方法 ======== /** * 材料信息新增/编辑 @@ -1091,14 +1598,30 @@ this.$message.warning('请选择计量单位！') return } - // if (this.modalData.codeNo === '' || this.modalData.codeNo == null) { - // this.$message.warning('请选择属性模板！') - // return - // } + if (this.modalData.familyId === '' || this.modalData.familyId == null) { + this.$message.warning('请选择分类！') + return + } + if (this.modalData.groupId === '' || this.modalData.groupId == null) { + this.$message.warning('请选择分组！') + return + } + if (this.modalData.codeNo === '' || this.modalData.codeNo == null) { + this.$message.warning('请选择属性模板！') + return + } + if (this.modalData.manufacturerId === '' || this.modalData.manufacturerId == null) { + this.$message.warning('请选择制造商！') + return + } if (this.modalData.active === '' || this.modalData.active == null) { this.$message.warning('请选择是否在用！') return } + if (this.modalData.agentId === '' || this.modalData.agentId == null) { + this.$message.warning('请选择代理商！') + return + } if (this.modalData.flag === '1') { partInformationSave(this.modalData).then(({data}) => { if (data && data.code === 0) { @@ -1189,6 +1712,67 @@ this.$refs.selectDiv.setLengthselected(this.partSelections.length) }, + // ======== 属性页签相关方法 ======== + /** + * 编辑属性值模态框 + */ + updateItemModal (row) { + this.itemData = { + site: row.site, + partNo: row.partNo, + propertiesItemNo: row.propertiesItemNo, + itemDesc: row.itemDesc, + textValue: row.textValue, + numValue: row.numValue, + recordType: 'B' + } + this.availableValueList = row.availableValueList + if (row.valueChooseFlag === 'Y') { + this.itemChooseFlag = true + } else { + this.itemChooseFlag = false + } + this.itemTextDisableFlag = true + this.itemNumberDisableFlag = true + if (row.valueTypeDb !== 'T') { + this.itemNumberDisableFlag = false + } else { + this.itemTextDisableFlag = false + } + this.itemModalDisableFlag = true + this.itemModalFlag = true + }, + /** + * 编辑属性值方法 + * @returns {boolean} + */ + itemSaveData () { + if(this.itemData.partNo === '' || this.itemData.partNo == null){ + this.$message.warning('未选择物料！') + return false + } + if(this.itemData.propertiesItemNo === ''|| this.itemData.propertiesItemNo == null){ + this.$message.warning('未选择属性！') + return false + } + savePartItemValue(this.itemData).then(({data}) => { + if (data && data.code === 0) { + this.itemModalFlag = false + this.getPartItem() + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => {} + }) + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + // ======== 附件的相关方法 ======== /** * 获取材料附件列表 @@ -1211,12 +1795,10 @@ */ uploadFile () { let currentData = { - titleCon: '报价附件上传', + titleCon: '材料附件上传', site: this.$store.state.user.site, createBy: this.$store.state.user.name, - quotationNo: this.enterResultData.quotationNo, - fileRemark: '', - folder: 'quotationFile' + partNo: this.partCurrentRow.partNo } //打开组件 去做新增业务 this.$nextTick(() => { @@ -1233,9 +1815,9 @@ cancelButtonText: '取消', type: 'warning' }).then(() => { - deletePartFile(row).then(({data}) => { + deleteQuotationFile(row).then(({data}) => { if (data && data.code === 0) { - this.getFileContentList(); + this.getFileContentData() this.$message({ message: '操作成功', type: 'success', @@ -1281,48 +1863,26 @@ */ getBaseList (val, type) { this.tagNo = val - this.tagNo1 = type this.$nextTick(() => { let strVal = '' if (val === 107) { - if(type === 1) { - strVal = this.modalData.umId - } - } - if (val === 108) { - if(type === 1) { - strVal = this.modalData.familyId - } - } - if (val === 109) { - if(type === 1) { - strVal = this.modalData.groupId - } - } - if (val === 110) { - if(type === 1) { - strVal = this.modalData.productGroupId1 - } - } - if (val === 111) { - if(type === 1) { - strVal = this.modalData.productGroupId2 - } - } - if (val === 112) { - if(type === 1) { - strVal = this.modalData.productGroupId3 - } - } - if (val === 113) { - if(type === 1) { - strVal = this.modalData.productGroupId4 - } - } - if (val === 114) { - if(type === 1) { - strVal = this.modalData.manufacturerId - } + strVal = this.modalData.umId + } else if (val === 108) { + strVal = this.modalData.familyId + } else if (val === 109) { + strVal = this.modalData.groupId + } else if (val === 110) { + strVal = this.modalData.productGroupId1 + } else if (val === 111) { + strVal = this.modalData.productGroupId2 + } else if (val === 112) { + strVal = this.modalData.productGroupId3 + } else if (val === 113) { + strVal = this.modalData.productGroupId4 + } else if (val === 114) { + strVal = this.modalData.manufacturerId + } else if (val === 20) { + strVal = this.modalData.codeNo } this.$refs.baseList.init(val, strVal) }) @@ -1333,52 +1893,32 @@ */ getBaseData (val) { if (this.tagNo === 107) { - if(this.tagNo1 === 1) { - this.modalData.umId = val.um_id - this.modalData.umName = val.um_name - } - } - if (this.tagNo === 108) { - if(this.tagNo1 === 1) { - this.modalData.familyId = val.family_id - this.modalData.familyName = val.family_name - } - } - if (this.tagNo === 109) { - if(this.tagNo1 === 1) { - this.modalData.groupId = val.group_id - this.modalData.groupName = val.group_name - } - } - if (this.tagNo === 110) { - if(this.tagNo1 === 1) { - this.modalData.productGroupId1 = val.product_group_id - this.modalData.productGroupName1 = val.product_group_name - } - } - if (this.tagNo === 111) { - if(this.tagNo1 === 1) { - this.modalData.productGroupId2 = val.product_group_id - this.modalData.productGroupName2 = val.product_group_name - } - } - if (this.tagNo === 112) { - if(this.tagNo1 === 1) { - this.modalData.productGroupId3 = val.product_group_id - this.modalData.productGroupName3 = val.product_group_name - } - } - if (this.tagNo === 113) { - if(this.tagNo1 === 1) { - this.modalData.productGroupId4 = val.product_group_id - this.modalData.productGroupName4 = val.product_group_name - } - } - if (this.tagNo === 114) { - if(this.tagNo1 === 1) { - this.modalData.manufacturerId = val.manufacturer_id - this.modalData.manufacturerName = val.manufacturer_name - } + this.modalData.umId = val.um_id + this.modalData.umName = val.um_name + } else if (this.tagNo === 108) { + this.modalData.familyId = val.family_id + this.modalData.familyName = val.family_name + } else if (this.tagNo === 109) { + this.modalData.groupId = val.group_id + this.modalData.groupName = val.group_name + } else if (this.tagNo === 110) { + this.modalData.productGroupId1 = val.product_group_id + this.modalData.productGroupName1 = val.product_group_name + } else if (this.tagNo === 111) { + this.modalData.productGroupId2 = val.product_group_id + this.modalData.productGroupName2 = val.product_group_name + } else if (this.tagNo === 112) { + this.modalData.productGroupId3 = val.product_group_id + this.modalData.productGroupName3 = val.product_group_name + } else if (this.tagNo === 113) { + this.modalData.productGroupId4 = val.product_group_id + this.modalData.productGroupName4 = val.product_group_name + } else if (this.tagNo === 114) { + this.modalData.manufacturerId = val.manufacturer_id + this.modalData.manufacturerName = val.manufacturer_name + } else if (this.tagNo === 20) { + this.modalData.codeNo = val.Code_no + this.$set(this.modalData, 'codeDesc', val.Code_desc) } }, diff --git a/src/views/modules/part/part_upload_file.vue b/src/views/modules/part/part_upload_file.vue index 78e27ef..881d188 100644 --- a/src/views/modules/part/part_upload_file.vue +++ b/src/views/modules/part/part_upload_file.vue @@ -4,16 +4,8 @@ - - - - - - - - - - + + @@ -54,19 +46,15 @@ import { export default { data() { return { - folder: '', visible: false, fileList: [], pageData: { titleCon: '', site: this.$store.state.user.site, createBy: this.$store.state.user.name, - quotationNo: '', + partNo: '', fileRemark: '', - folder: '', - // options: [] }, - // options: [], dataListLoading: false, } }, @@ -75,8 +63,6 @@ export default { init(currentRow) { // 初始化参数 this.pageData = JSON.parse(JSON.stringify(currentRow)) - // this.options = this.pageData.options - this.folder = this.pageData.folder // 打开页面 this.visible = true }, @@ -105,16 +91,11 @@ export default { this.$message.error("请先上传文件!") return false } - // if(this.pageData.quotationNo === '' || this.pageData.quotationNo == null){ - // this.$message.error("请选择申请单号!") - // return false - // } const formData = new FormData() //片接文件 formData.append("file", this.fileList[0].raw) - formData.append("folder", this.folder) formData.append("orderRef1", this.pageData.site) - formData.append("orderRef2", this.pageData.quotationNo) + formData.append("orderRef2", this.pageData.partNo) formData.append("fileRemark", remark) uploadFile(formData).then(({data}) => { if (data.code === 0) { From c8eea7323646ba96739ea30d78e294801c326ee4 Mon Sep 17 00:00:00 2001 From: zelian_wu Date: Tue, 21 Nov 2023 17:58:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2023-11-21=20plm=E6=8A=A5=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/part/partInformation.js | 8 + src/api/quotation/quotationHeader.js | 7 + .../sellForQuotation/quotationDetail.vue | 673 ++++++++++++++---- 3 files changed, 566 insertions(+), 122 deletions(-) diff --git a/src/api/part/partInformation.js b/src/api/part/partInformation.js index 45947aa..cc1c952 100644 --- a/src/api/part/partInformation.js +++ b/src/api/part/partInformation.js @@ -46,3 +46,11 @@ export const getFileContentList = data => createAPI(`/plm/partInformation/getFil export const deletePartFile = data => createAPI(`/plm/partInformation/deletePartFile`,'post',data) +/** + * 查询材料信息 + * @param data + * @returns {*} + */ +export const searchPartList = (data) => createAPI(`/plm/partInformation/searchPartList`,'get',data); + + diff --git a/src/api/quotation/quotationHeader.js b/src/api/quotation/quotationHeader.js index a520d14..1e3be63 100644 --- a/src/api/quotation/quotationHeader.js +++ b/src/api/quotation/quotationHeader.js @@ -81,3 +81,10 @@ export const updateQuotationRouting = (data) => createAPI('/plm/quotationRouting * @returns {*} */ export const deleteQuotationRouting = (data) => createAPI('/plm/quotationRouting/deleteQuotationRouting','post',data); + +/** + * 查询 quotationPart + * @param data + * @returns {*} + */ +export const searchQuotationPart = (data) => createAPI('/plm/quotationPart/searchQuotationPart','get',data); diff --git a/src/components/quotation/sellForQuotation/quotationDetail.vue b/src/components/quotation/sellForQuotation/quotationDetail.vue index 3a26a20..0990e28 100644 --- a/src/components/quotation/sellForQuotation/quotationDetail.vue +++ b/src/components/quotation/sellForQuotation/quotationDetail.vue @@ -243,91 +243,218 @@ 新 增 从其他报价单复制 - - - - - - - - - - - - - - - - + 批 量 删 除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 新 增 从其他报价单复制 - 批 量 删 除 - - - - - - - - - - - - - - - - - - - - - - - - - - - + 批 量 删 除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 新 增 从其他报价单复制 @@ -635,13 +762,13 @@ - + - {{ item.workCenterNo }} + {{ item.workCenterNo }} {{ item.workCenterDesc }} @@ -670,47 +797,47 @@ - - + + - {{ item.umName }} - {{ item.umId }} + v-for="item in outputUnitList" + :key="item.label" + :label="item.label" + :value="item.label"> - + - + - + - + - + - + @@ -728,27 +855,126 @@ - + - + 工具编码 + - + + + + + + + + {{item.umName }} + + {{ item.umId}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 取 消 - 确 定 + 确 定 + + + + + + + + + + + + + + + + + + 重 置 + + + + + + + + + + + + + + + + 取 消 + 确 定 + +