diff --git a/src/api/TechnologyCenter/ImportParts.js b/src/api/TechnologyCenter/ImportParts.js index 65480ad3..6fbc0f6b 100644 --- a/src/api/TechnologyCenter/ImportParts.js +++ b/src/api/TechnologyCenter/ImportParts.js @@ -286,19 +286,19 @@ export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num data: { type: '2', name: 'PDM_零件明细表_基本件_大量导入', - param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&备件数量=' + Num + param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注\\=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&备件数量=' + Num } }) } // 传递零件 -export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, id, oldId, oldNum) { +export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, num8, num9, id, oldId, oldNum) { return request({ url: '', method: 'post', data: { type: '2', name: 'PDM_零件明细表_整改件_大量导入', - param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&前id=' + oldId + '&前图号或者型号=' + oldNum + param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注\\=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&分类码=' + num8 + '&整改类型=' + num9 + '&id=' + id + '&前id=' + oldId + '&前图号或者型号=' + oldNum } }) } @@ -309,7 +309,7 @@ export function transferWG(groupNum, materialNum, totalNum, remarks, mark, desig data: { type: '2', name: 'PDM_零件明细表_标准件和外购件_大量导入', - param: `组件流水号=${groupNum}&物料流水号=${materialNum}&零件数量=${totalNum}&备注=${remarks}&标记=${mark}&设计者编号=${designNum}&是否传递=${isTransfer}&数据类型=${dataType}&序号=${No}&id=${id}&备件数量=${Num}` + param: `组件流水号=${groupNum}&物料流水号=${materialNum}&零件数量=${totalNum}&备注\\=${remarks}&标记=${mark}&设计者编号=${designNum}&是否传递=${isTransfer}&数据类型=${dataType}&序号=${No}&id=${id}&备件数量=${Num}` } }) } diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue index 7d3e5aa3..10d6df98 100644 --- a/src/views/TechnologyCenter/CreatePackingList/index.vue +++ b/src/views/TechnologyCenter/CreatePackingList/index.vue @@ -435,7 +435,7 @@

装          箱          单

- GJR1322-ZD + {{ receiptName }} diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue index 35c0177a..ee7d47f6 100644 --- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue +++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue @@ -567,8 +567,8 @@ export default { for (let i = 0; i < this.tableDataAll.length; i++) { const data = this.tableDataAll[i] const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量) - console.log(data.前id, data.前图号或者型号) - const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.前id, data.前图号或者型号) + console.log(data.分类码) + const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.分类码, data.整改类型, data.id, data.前id, data.前图号或者型号) await sleep(10) if (resp.data[0].result === '0') { this.err++ diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue index 3214c68c..ad82edb2 100644 --- a/src/views/TechnologyCenter/QueryParts/index.vue +++ b/src/views/TechnologyCenter/QueryParts/index.vue @@ -88,9 +88,14 @@ align="center"> + + +