diff --git a/src/api/TechnologyCenter/CreatePackingList.js b/src/api/TechnologyCenter/CreatePackingList.js index 6080da49..7e9efae5 100644 --- a/src/api/TechnologyCenter/CreatePackingList.js +++ b/src/api/TechnologyCenter/CreatePackingList.js @@ -105,14 +105,14 @@ export function updateMachineData(No, number, remark) { }) } -export function getGroupData(project, machine) { +export function getGroupData(machine) { return request({ url: '', method: 'post', data: { type: '1', name: 'PDM_装箱单_机床所属部件_查询数据', - param: `项目=${project}&机床=${machine}` + param: `机床流水号=${machine}` } }) } diff --git a/src/api/TechnologyCenter/ImportParts.js b/src/api/TechnologyCenter/ImportParts.js index a3ff0187..846a683c 100644 --- a/src/api/TechnologyCenter/ImportParts.js +++ b/src/api/TechnologyCenter/ImportParts.js @@ -291,14 +291,14 @@ export function allDelete(project, machine, group) { }) } // 传递零件 -export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, id) { +export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, id, Num) { 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 + param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&备件数量=' + Num } }) } @@ -314,14 +314,14 @@ export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, nu } }) } -export function transferWG(groupNum, materialNum, totalNum, remarks, mark, designNum, isTransfer, dataType, No, id) { +export function transferWG(groupNum, materialNum, totalNum, remarks, mark, designNum, isTransfer, dataType, No, id, Num) { return request({ url: '', method: 'post', data: { type: '2', name: 'PDM_零件明细表_标准件和外购件_大量导入', - param: `组件流水号=${groupNum}&物料流水号=${materialNum}&零件数量=${totalNum}&备注=${remarks}&标记=${mark}&设计者编号=${designNum}&是否传递=${isTransfer}&数据类型=${dataType}&序号=${No}&id=${id}` + param: `组件流水号=${groupNum}&物料流水号=${materialNum}&零件数量=${totalNum}&备注=${remarks}&标记=${mark}&设计者编号=${designNum}&是否传递=${isTransfer}&数据类型=${dataType}&序号=${No}&id=${id}&备件数量=${Num}` } }) } diff --git a/src/api/WorkshopProcurement/AccountingPrice.js b/src/api/WorkshopProcurement/AccountingPrice.js new file mode 100644 index 00000000..175fd598 --- /dev/null +++ b/src/api/WorkshopProcurement/AccountingPrice.js @@ -0,0 +1,38 @@ +import request from '@/utils/request' + +// 初始化合同 +export function initPayState() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间管理_基本件外购质检_合同查询' + } + }) +} +// 查询表1 +export function searchParts(pageCurrent, pageSize, check1, num, check2, name) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间管理_基本件外购质检_查询数据', + param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 保存 +export function Preservation(id, num, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间管理_核算总额_编辑数据', + param: `请购单明细流水号组=${id}&核算总额组=${num}&核算单价组=${num1}` + } + }) +} diff --git a/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js b/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js index 57496b04..70092be1 100644 --- a/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js +++ b/src/api/WorkshopProcurement/OutsourcingProcessPlanning.js @@ -131,18 +131,6 @@ export function searchTolerance(val1, val2) { } }) } -// 工艺定额人员查询 -export function initPerson() { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17' - } - }) -} // 完艺工艺拷贝 export function gongyiCopy(num1, num2) { return request({ diff --git a/src/api/WorkshopProcurement/PurchasingQualityInspection.js b/src/api/WorkshopProcurement/PurchasingQualityInspection.js index d21cfbf8..4bc6c826 100644 --- a/src/api/WorkshopProcurement/PurchasingQualityInspection.js +++ b/src/api/WorkshopProcurement/PurchasingQualityInspection.js @@ -11,26 +11,15 @@ export function initPayState() { } }) } -// 初始化零件 -export function initParts() { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '车间管理_基本件外购质检_零件查询' - } - }) -} // 查询表1 -export function searchParts(pageCurrent, pageSize, check1, num, check2, name, check3, num1) { +export function searchParts(pageCurrent, pageSize, check1, num, check2, name) { return request({ url: '', method: 'post', data: { type: '1', name: '车间管理_基本件外购质检_查询数据', - param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}&物料流水号_check=${check3}&物料流水号=${num1}`, + param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue index d5ed8b9c..e9333ad3 100644 --- a/src/views/TechnologyCenter/CreatePackingList/index.vue +++ b/src/views/TechnologyCenter/CreatePackingList/index.vue @@ -98,7 +98,7 @@ /> {{ scope.row.名称 }} - + { item.类别 = '机床所属部件' - item.代号 = data[i].代号 + '-' + item.组号.split('-')[0] + item.代号 = data[i].代号 + '-' + item.代号 + '组' return item }) + console.log(groupData) this.machineTableData.push({ 序号: data[i].序号, 代号: data[i].代号, @@ -686,6 +689,10 @@ export default { }, async getSpareData() { const response = await getSpareData(this.receiptNum) + console.log(response) + for (let i = 0; i < response.data.length; i++) { + response.data[i].图号 = response.data[i].图号 + response.data[i].规格 + } this.spareData = response.data }, addSpare() { diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue index bcac8fcd..c3f40d9e 100644 --- a/src/views/TechnologyCenter/ImportParts/index.vue +++ b/src/views/TechnologyCenter/ImportParts/index.vue @@ -118,6 +118,7 @@ export default { }, async selected(data) { // 选择需要导入的文件 this.worksheet = data.worksheet // 获取每个多选文件的表格坐标及值 + console.log(this.worksheet) this.itemFile = data.itemFile }, handleRemove(file) { // 移除文件 diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue index 92fb47f2..1d0ac2d6 100644 --- a/src/views/TechnologyCenter/ImportParts/specificationData.vue +++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue @@ -522,7 +522,7 @@ export default { const data = this.tableDataAll[i] console.log(data) const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量) - const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id) + const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.备件数量) await sleep(10) if (resp.data[0].result === '0') { this.err++ @@ -538,7 +538,7 @@ export default { } else { dataType = 1 } - const resp = await transferWG(data.组件流水号, data.物料流水号, total, data.备注, data.标记, data.设计者编号, data.是否传递, dataType, data.序号, data.id) + const resp = await transferWG(data.组件流水号, data.物料流水号, total, data.备注, data.标记, data.设计者编号, data.是否传递, dataType, data.序号, data.id, data.备件数量) await sleep(10) if (resp.data[0].result === '0') { this.err++ diff --git a/src/views/WorkshopProcurement/AccountingPrice/index.vue b/src/views/WorkshopProcurement/AccountingPrice/index.vue new file mode 100644 index 00000000..9cec9c6d --- /dev/null +++ b/src/views/WorkshopProcurement/AccountingPrice/index.vue @@ -0,0 +1,180 @@ + + + + + diff --git a/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue b/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue index 839079f7..23e1770f 100644 --- a/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue +++ b/src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue @@ -633,7 +633,6 @@ export default { }, created() { this.fetchData() - this.initPerson() }, methods: { fetchData() { diff --git a/src/views/WorkshopProcurement/PurchasingQualityInspection/index.vue b/src/views/WorkshopProcurement/PurchasingQualityInspection/index.vue index d65270de..6e7c3694 100644 --- a/src/views/WorkshopProcurement/PurchasingQualityInspection/index.vue +++ b/src/views/WorkshopProcurement/PurchasingQualityInspection/index.vue @@ -15,14 +15,6 @@ 供应商: - 零件名称: - - - 查询 @@ -105,8 +97,7 @@ 通过 + @click="handleEdit(scope.row)">完成 @@ -125,7 +116,7 @@