diff --git a/src/api/BasicData/ShiftManagement.js b/src/api/BasicData/ShiftManagement.js index 033f7c59..18f45f6a 100644 --- a/src/api/BasicData/ShiftManagement.js +++ b/src/api/BasicData/ShiftManagement.js @@ -60,7 +60,7 @@ export function deleteShift(shiftCode) { } }) } -// 删除班次 +// 班次类型与工作时间增加 export function addShiftType() { return request({ url: '', diff --git a/src/api/Inventory/InventoryCheck.js b/src/api/Inventory/InventoryCheck.js index 4618e7c5..2ae3782e 100644 --- a/src/api/Inventory/InventoryCheck.js +++ b/src/api/Inventory/InventoryCheck.js @@ -212,14 +212,14 @@ export function searchHoursePurchasePart(pageCurrent, pageSize, project_check, p }) } // 车间采购库存盘点修改 -export function CheckAlter(receive, project, machinenumber, partnumber, oldnumber, reason, number, people, locate, contractdetail, alterdate, craftnumber, materialType, materiallocate) { +export function CheckAlter(receive, project, machinenumber, partnumber, oldnumber, reason, number, people, locate, contractdetail, craftnumber, materialType, materiallocate, name, mode, picture, type, material) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_库存盘点_修改数量', - param: '收件信息ID=' + receive + '&项目流水号=' + project + '&机床流水号=' + machinenumber + '&组件流水号=' + partnumber + '&原数量=' + oldnumber + '&修改原因=' + reason + '&数量=' + number + '&人员编号=' + people + '&货位流水号=' + locate + '&采购合同明细流水号=' + contractdetail + '&工艺计划流水号=' + craftnumber + '&零件类型代码=' + materialType + '&物料与货位对照流水号=' + materiallocate + param: '收件信息ID=' + receive + '&项目流水号=' + project + '&机床流水号=' + machinenumber + '&组件流水号=' + partnumber + '&原数量=' + oldnumber + '&修改原因=' + reason + '&数量=' + number + '&人员编号=' + people + '&货位流水号=' + locate + '&采购合同明细流水号=' + contractdetail + '&工艺计划流水号=' + craftnumber + '&零件类型代码=' + materialType + '&物料与货位对照流水号=' + materiallocate + '&名称=' + name + '&规格=' + mode + '&图号=' + picture + '&型号=' + type + '&材料=' + material } }) } diff --git a/src/api/Inventory/PartOut.js b/src/api/Inventory/PartOut.js index 170cfc0e..aa7a250f 100644 --- a/src/api/Inventory/PartOut.js +++ b/src/api/Inventory/PartOut.js @@ -36,15 +36,28 @@ export function ListDetailOut(listNumber) { } }) } +// 交换件查询 +export function ExchangeOut(listNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_零件出库_交换件查询', + param: '领料单流水号=' + listNumber + } + }) +} + // 外购件零件出库 -export function PurchasePart(data1, data2, data3, data4, data5) { +export function PurchasePart(data1, data2, data3, data4, data5, data6) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_外购件出库_修改数据', - param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&物料与货位对照流水号=' + data5 + '&备注=' + data6 } }) } @@ -61,18 +74,18 @@ export function BasicPart(data1, data2, data3, data4, data5) { }) } // 车间采购件零件出库 -export function WorkShopPart(data1, data2, data3, data4, data5) { +export function WorkShopPart(data1, data2, data3, data4, data5, data6) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_车间采购出库_修改数据', - param: '请购单明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + param: '请购单明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&物料与货位对照流水号=' + data5 + '&备注=' + data6 } }) } -// 车间采购件零件出库 +// 异常出库 export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12) { return request({ url: '', diff --git a/src/api/ManufacturingCenter/MaterialArrivalManagement.js b/src/api/ManufacturingCenter/MaterialArrivalManagement.js index f58bc510..622f59fc 100644 --- a/src/api/ManufacturingCenter/MaterialArrivalManagement.js +++ b/src/api/ManufacturingCenter/MaterialArrivalManagement.js @@ -49,3 +49,14 @@ export function handlechange(Number, code) { } }) } +export function change(Number, code, num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_备料到货更改', + param: '工序流水号组=' + Number + '&工作者考勤编号=' + code + '&工艺计划流水号组=' + num + } + }) +} diff --git a/src/views/Inventory/ExchangePart/index.vue b/src/views/Inventory/ExchangePart/index.vue index e511be4c..66257b0e 100644 --- a/src/views/Inventory/ExchangePart/index.vue +++ b/src/views/Inventory/ExchangePart/index.vue @@ -432,7 +432,6 @@ export default { this.listLoading1 = true searchExchangePart(this.PageCurrent1, this.PageSize1).then(response => { const data = response.data.rows - console.log(data, 2233) for (let i = 0; i < data.length; i++) { data[i].审批通过 === '1' || data[i].审批通过 === '2' ? data[i].是否禁用 = true : data[i].是否禁用 = false } diff --git a/src/views/Inventory/InboundCard/index.vue b/src/views/Inventory/InboundCard/index.vue index 8c4febc9..603936c1 100644 --- a/src/views/Inventory/InboundCard/index.vue +++ b/src/views/Inventory/InboundCard/index.vue @@ -1021,7 +1021,7 @@ export default { const printNode = $(htmlNode) body.append(printNode) window.print() - body.children().show() + body.children().not('script').show() printNode.remove() } } diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue index 900a82b6..a93bfa12 100644 --- a/src/views/Inventory/InventoryCheck/index.vue +++ b/src/views/Inventory/InventoryCheck/index.vue @@ -79,13 +79,13 @@ {{ scope.row.零件类型名称 }} - + @@ -565,12 +565,12 @@ @@ -580,8 +580,8 @@ @@ -1259,7 +1259,12 @@ export default { locate: '', contractdetail: '', craftnumber: '', - receive: '' + receive: '', + name: '', // 名称 + mode: '', // 规格 + picture: '', // 图号 + type: '', // 型号 + material: '' // 材料 } }, computed: { @@ -1314,7 +1319,6 @@ export default { this.GroupNum = [] this.MachineValue = '' this.GroupNumValue = '' - console.log(this.ProjectValue) if (this.ProjectValue !== '') { searchmachine(1, this.ProjectValue).then(response => { for (let i = 0; i < response.data.length; i++) { @@ -1559,7 +1563,7 @@ export default { this.$refs[formName].resetFields() }, tableRowClassName1({ row }) { - if (row.安全库存量 > row.库存数量) { + if (Number(row.安全库存量) > Number(row.货位存量)) { return 'background: #ff6666' } else { return '' @@ -1713,6 +1717,25 @@ export default { }) }, AlterNumber(row) { + this.project = row.项目流水号 + this.machinenumber = row.机床流水号 + this.partnumber = row.组件流水号 + this.oldnumber = row.货位存量 + this.locate = row.货位流水号 + this.contractdetail = row.采购合同明细流水号 + this.craftnumber = row.工艺计划流水号 + this.receive = row.收件信息id + this.materiallocate = row.物料与货位对照流水号 + this.materialType = row.零件类型代码 + this.dialogFormVisible = true + this.name = row.物料名称 + this.mode = row.物料规格 + this.picture = row.零件图号 + this.type = row.物料型号 + this.material = row.材料 + }, + AlterBasicNumber(row) { + console.log(row, 556677) this.project = row.项目流水号 this.machinenumber = row.机床流水号 this.partnumber = row.组件流水号 @@ -1720,13 +1743,18 @@ export default { this.locate = row.货位流水号 this.contractdetail = row.采购合同明细流水号 this.craftnumber = row.工艺计划流水号 - this.receive = row.收件信息ID + this.receive = row.收件信息id this.materiallocate = row.物料与货位对照流水号 - this.materialType = row.零件类型代码 + this.materialType = row.零件类型 this.dialogFormVisible = true + this.name = row.零件名称 + this.mode = row.物料规格 + this.picture = row.零件图号 + this.type = row.物料型号 + this.material = row.材料 }, submitChannge() { - CheckAlter(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate).then(response => { + CheckAlter(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate, this.name, this.mode, this.picture, this.type, this.material).then(response => { if (response.data[0].result === '1') { this.$message.success('修改成功') this.dialogFormVisible = false diff --git a/src/views/Inventory/OfflinePurchase/index.vue b/src/views/Inventory/OfflinePurchase/index.vue index 43ad22ca..74d44954 100644 --- a/src/views/Inventory/OfflinePurchase/index.vue +++ b/src/views/Inventory/OfflinePurchase/index.vue @@ -551,7 +551,7 @@ export default { const printNode = $(htmlNode) body.append(printNode) window.print() - body.children().show() + body.children().not('script').show() printNode.remove() }, // 传递请购单 diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue index 9e346b64..1b3b789b 100644 --- a/src/views/Inventory/PartOut/index.vue +++ b/src/views/Inventory/PartOut/index.vue @@ -93,6 +93,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -112,7 +167,7 @@