diff --git a/index.html b/index.html index 7d978087..c727e55c 100644 --- a/index.html +++ b/index.html @@ -8,6 +8,31 @@
+ diff --git a/package.json b/package.json index 4bf74258..18989cfd 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml" }, "dependencies": { + "@xkeshi/vue-barcode": "^1.0.0", "axios": "0.18.0", "echarts": "^4.2.0-rc.2", "element-ui": "2.4.6", 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..53802841 100644 --- a/src/api/Inventory/InventoryCheck.js +++ b/src/api/Inventory/InventoryCheck.js @@ -105,7 +105,7 @@ export function searchStandardPartOut(data1) { data: { type: '1', name: '库存管理_库存盘点_标准件出库记录', - param: '组件零件流水号=' + data1 + param: '采购合同明细流水号=' + data1 } }) } @@ -211,15 +211,39 @@ export function searchHoursePurchasePart(pageCurrent, pageSize, project_check, p } }) } +// 车间采购外购件出库记录查询 +export function searchShopPurchasePartOut(teampart) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_库存盘点_车间外购件出库记录', + param: '请购单明细流水号=' + teampart + } + }) +} +// 车间采购外购件入库记录查询 +export function searchShopPurchasePartIn(teampart) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_库存盘点_车间外购件入库记录', + param: '请购单明细流水号=' + teampart + } + }) +} // 车间采购库存盘点修改 -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/InventoryManagement.js b/src/api/Inventory/InventoryManagement.js index b121a949..2e6d2393 100644 --- a/src/api/Inventory/InventoryManagement.js +++ b/src/api/Inventory/InventoryManagement.js @@ -12,14 +12,14 @@ export function initWarehouse() { }) } // 增加仓库 -export function addWarehouse(num0, num1, num2, num3, num4) { +export function addWarehouse(num0, num1, num2, num3, num4, num5) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_货位仓库_仓库_增加数据', - param: '仓库编号=' + num0 + '&仓库名称=' + num1 + '&仓库描述=' + num2 + '&地址=' + num3 + '&联系人=' + num4 + '&备注=' + num4 + param: '仓库编号=' + num0 + '&仓库名称=' + num1 + '&仓库描述=' + num2 + '&地址=' + num3 + '&联系人=' + num4 + '&备注=' + num5 } }) } diff --git a/src/api/Inventory/OfflinePurchase.js b/src/api/Inventory/OfflinePurchase.js index c37abee8..5c90819b 100644 --- a/src/api/Inventory/OfflinePurchase.js +++ b/src/api/Inventory/OfflinePurchase.js @@ -74,14 +74,14 @@ export function addRequestCardDetail(data1, data2) { }) } // 请购单明细修改 -export function alterNumber(data1, data2, data3) { +export function alterNumber(data2, data3) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_离线请购单_请购单明细修改', - param: '离线请购单流水号=' + data1 + '&离线请购单明细流水号组=' + data2 + '&数量组=' + data3 + param: '离线请购单明细流水号组=' + data2 + '&数量组=' + data3 } }) } diff --git a/src/api/Inventory/PartOut.js b/src/api/Inventory/PartOut.js index 170cfc0e..066a83bb 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: '', @@ -84,3 +97,15 @@ export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8, } }) } +// 交换出库 +export function ExchangePartOut(data0, data1, data2, data3, data4, data5) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_交换件出库_修改数据', + param: '交换单流水号=' + data0 + '&采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + } + }) +} diff --git a/src/api/Inventory/SubstitutePart.js b/src/api/Inventory/SubstitutePart.js index 90408e00..fb0cb20d 100644 --- a/src/api/Inventory/SubstitutePart.js +++ b/src/api/Inventory/SubstitutePart.js @@ -36,26 +36,26 @@ export function searchTeam(machineNumber) { }) } // 外购件、标准件查询 -export function searchPurchasePart(project_check, project, machine_check, machine, group_check, group) { +export function searchPurchasePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) { return request({ url: '', method: 'post', data: { type: '1', name: '库存管理_外购件出库_零件查询', - param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group + param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group, + Pagination: pageCurrent + '&' + pageSize } }) } // 被替换件查询 -export function searchSubstituted(material_check, material) { +export function searchSubstituted() { return request({ url: '', method: 'post', data: { type: '1', - name: '库存管理_替换件_被替换件查询', - param: '物料名称_check=' + material_check + '&物料名称=' + material + name: '库存管理_离线外购件_出库查询' } }) } 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/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js index 6f0f26fc..be639a9b 100644 --- a/src/api/ManufacturingCenter/ProcessPlanning.js +++ b/src/api/ManufacturingCenter/ProcessPlanning.js @@ -209,8 +209,8 @@ export function gongyiCopy(num1, num2) { method: 'post', data: { type: '1', - name: '车间生产管理工艺_零件工序_工艺拷贝_工艺流水号', - param: '工艺流水号_完成工艺=' + num1 + '=int&工艺流水号_被拷工艺=' + num2 + '=int' + name: '车间生产管理工艺_零件工序_工艺拷贝_工艺计划流水号', + param: '工艺计划流水号_完成工艺=' + num1 + '=int&工艺计划流水号_被拷工艺=' + num2 + '=int' } }) } diff --git a/src/api/ManufacturingCenter/RepairTimeEntry.js b/src/api/ManufacturingCenter/RepairTimeEntry.js index fc99ccd6..937b6c2e 100644 --- a/src/api/ManufacturingCenter/RepairTimeEntry.js +++ b/src/api/ManufacturingCenter/RepairTimeEntry.js @@ -12,6 +12,50 @@ export function searchTechnology(num) { } }) } +export function getNames() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改' + } + }) +} + +export function getMachines(gongyi) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_机床名称_查询数据_查询所有机床', + param: '项目流水号=' + gongyi + '=int' + } + }) +} +export function getGroups(stepNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组', + param: '机床流水号=' + stepNumber + '=int' + } + }) +} +export function getParts(stepNumber, a, b, c, d, e, f, g) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_基础表_员工月修补工时_查询零件', + param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0' + } + }) +} // 查询人员编号 export function searchperson(num) { return request({ @@ -31,33 +75,45 @@ export function searchtable(check, num, pageCurrent, pageSize) { method: 'post', data: { type: '1', - name: '车间生产管理_基础表_员工月修补工时_查询数据', + name: '车间生产管理_基础表_员工月修补工时_查询数据_MESWORK', param: '人员编号_check=' + check + '&人员编号=' + num, Pagination: pageCurrent + '&' + pageSize } }) } // 增加 -export function edittype(ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, roleName) { +export function edittype(num1, ManufacturerNumber, ManufacturerAbbreviation, address, roleName, num2) { return request({ url: '', method: 'post', data: { type: '2', name: '车间生产管理_基础表_员工月修补工时_增加数据', - param: '人员编号=' + ManufacturerNumber + '&工艺编号=' + ManufacturerName + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName + param: '工艺计划流水号=' + num1 + '&人员编号=' + ManufacturerNumber + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName + '&修补工艺=' + num2 } }) } // 编辑 -export function handlechange(CoManufacturerFlowNumber, ManufacturerNumber, ManufacturerName, ManufacturerAbbreviation, address, roleName) { +export function handlechange(CoManufacturerFlowNumber, num1, ManufacturerNumber, ManufacturerAbbreviation, address, roleName, num2) { return request({ url: '', method: 'post', data: { type: '2', name: '车间生产管理_基础表_员工月修补工时_修改数据', - param: '员工月修补工时流水号=' + CoManufacturerFlowNumber + '&人员编号=' + ManufacturerNumber + '&工艺编号=' + ManufacturerName + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName + param: '员工月修补工时流水号=' + CoManufacturerFlowNumber + '&工艺计划流水号=' + num1 + '&人员编号=' + ManufacturerNumber + '&年=' + ManufacturerAbbreviation + '&月=' + address + '&修补工时=' + roleName + '&修补工艺=' + num2 + } + }) +} +// 删除工艺信息 +export function delList(MaterialCode) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理_基础表_员工月修补工时_删除数据', + param: '员工月修补工时流水号=' + MaterialCode } }) } diff --git a/src/api/WorkshopProcurement/AccountingPrice.js b/src/api/WorkshopProcurement/AccountingPrice.js index 2f1c25a8..4a53883d 100644 --- a/src/api/WorkshopProcurement/AccountingPrice.js +++ b/src/api/WorkshopProcurement/AccountingPrice.js @@ -7,19 +7,19 @@ export function initPayState() { method: 'post', data: { type: '1', - name: '车间管理_基本件外购质检_合同查询' + name: '车间采购管理_采购合同_查询' } }) } // 查询表1 -export function searchParts(pageCurrent, pageSize, check1, num, check2, name) { +export function searchParts(pageCurrent, pageSize, check1, num) { return request({ url: '', method: 'post', data: { type: '1', name: '车间管理_核算价格_查询数据', - param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, + param: `采购合同流水号_check=${check1}&采购合同流水号=${num}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/WorkshopProcurement/ProcurementContractApproval.js b/src/api/WorkshopProcurement/ProcurementContractApproval.js index ae79da7d..537d2474 100644 --- a/src/api/WorkshopProcurement/ProcurementContractApproval.js +++ b/src/api/WorkshopProcurement/ProcurementContractApproval.js @@ -7,7 +7,7 @@ export function initContract() { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同_查询_cjn' + name: '车间采购管理_采购合同_未审批查询' } }) } @@ -60,14 +60,14 @@ export function searchTable3(num) { } }) } -export function submitApproval(num, num1, num2) { +export function submitApproval(num, num1, num2, num3) { return request({ url: '', method: 'post', data: { type: '2', name: '采购管理_合同审批_修改数据', - param: '采购合同流水号=' + num + '&审批情况流水号=' + num1 + '&未通过原因=' + num2 + param: '采购合同流水号=' + num + '&请购单流水号=' + num3 + '&审批情况流水号=' + num1 + '&未通过原因=' + num2 } }) } diff --git a/src/api/WorkshopProcurement/PurchaseContractChange.js b/src/api/WorkshopProcurement/PurchaseContractChange.js index a802ba6a..124734fd 100644 --- a/src/api/WorkshopProcurement/PurchaseContractChange.js +++ b/src/api/WorkshopProcurement/PurchaseContractChange.js @@ -7,7 +7,7 @@ export function initContract() { method: 'post', data: { type: '1', - name: '车间采购管理_采购合同_查询_cjn' + name: '车间采购管理_采购合同_查询' } }) } diff --git a/src/api/WorkshopProcurement/PurchasingQualityInspection.js b/src/api/WorkshopProcurement/PurchasingQualityInspection.js index 4bc6c826..f368dd00 100644 --- a/src/api/WorkshopProcurement/PurchasingQualityInspection.js +++ b/src/api/WorkshopProcurement/PurchasingQualityInspection.js @@ -7,7 +7,7 @@ export function initPayState() { method: 'post', data: { type: '1', - name: '车间管理_基本件外购质检_合同查询' + name: '车间采购管理_采购合同_查询' } }) } diff --git a/src/api/WorkshopProcurement/QualityInspectionQuery.js b/src/api/WorkshopProcurement/QualityInspectionQuery.js index 8be8d887..d2d5e9ab 100644 --- a/src/api/WorkshopProcurement/QualityInspectionQuery.js +++ b/src/api/WorkshopProcurement/QualityInspectionQuery.js @@ -7,30 +7,19 @@ export function initPayState() { method: 'post', data: { type: '1', - name: '车间管理_基本件外购质检_合同查询' - } - }) -} -// 初始化零件 -export function initParts() { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '车间管理_基本件外购质检_零件查询' + 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/api/WorkshopProcurement/ReceiptConnectionSheet.js b/src/api/WorkshopProcurement/ReceiptConnectionSheet.js index dfb3b616..0af7fba4 100644 --- a/src/api/WorkshopProcurement/ReceiptConnectionSheet.js +++ b/src/api/WorkshopProcurement/ReceiptConnectionSheet.js @@ -49,7 +49,7 @@ export function deleteInvoice(num1, num2) { } }) } -// 传送人接收人初始化 +// 接收人初始化 export function initPerson() { return request({ url: '', @@ -61,6 +61,18 @@ export function initPerson() { } }) } +// 传送人初始化 +export function initPerson1() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=5' + } + }) +} // 初始化合同号 export function initContract() { return request({ diff --git a/src/main.js b/src/main.js index 36e6a610..8c256bac 100644 --- a/src/main.js +++ b/src/main.js @@ -19,6 +19,8 @@ import time from 'time-formater' import htmlToPdf from '@/vendor/htmlToPdf' import Viewer from 'v-viewer' import 'viewerjs/dist/viewer.css' +import VueBarcode from '@xkeshi/vue-barcode' +Vue.component('barcode', VueBarcode) Vue.use(curd) Vue.use(htmlToPdf) diff --git a/src/utils/request.js b/src/utils/request.js index 58be7fc5..cdf4a490 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,23 +3,25 @@ import axios from 'axios' // import store from '../store' // import { getToken } from '@/utils/auth' -export const wsuri = `ws://192.168.0.2:61101//WebMoudule//websocket` +export const wsuri = `ws://192.168.1.212:61101//WebMoudule//websocket` export const name = `OP8888` // 创建axios实例 -export const readFile = `http://192.168.0.2:8411/webpage/file/` // invoice -export const readImg = `http://192.168.0.2:8411/webpage/img/` // delivery/MS/performancebond -export const upload = `http://192.168.0.2:8411/submit/uploadFile.ashx` // ContractInformationManagement -export const upload2 = `http://192.168.0.2:8411/submit/upload2.ashx` // delivery -export const upload3 = `http://192.168.0.2:8411/submit/upload3.ashx` // performancebond -export const uploadInvoiceScan = `http://192.168.0.2:8411/submit/uploadInvoiceScan.ashx` // invoice -export const download = `http://192.168.0.2:8411/submit/downloadFile.ashx` // ContractInformationManagement +export const readFile = `http://192.168.1.212:8411/webpage/file/` // invoice +export const readImg = `http://192.168.1.212:8411/webpage/img/` // delivery/MS/performancebond +export const upload = `http://192.168.1.212:8411/submit/uploadFile.ashx` // ContractInformationManagement +export const upload2 = `http://192.168.1.212:8411/submit/upload2.ashx` // delivery +export const upload3 = `http://192.168.1.212:8411/submit/upload3.ashx` // performancebond +export const uploadInvoiceScan = `http://192.168.1.212:8411/submit/uploadInvoiceScan.ashx` // invoice +export const download = `http://192.168.1.212:8411/submit/downloadFile.ashx` // ContractInformationManagement const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + + // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 diff --git a/src/views/Assembly/PrintingAssemblyProcessCard/index.vue b/src/views/Assembly/PrintingAssemblyProcessCard/index.vue index 0414c418..bb9257dd 100644 --- a/src/views/Assembly/PrintingAssemblyProcessCard/index.vue +++ b/src/views/Assembly/PrintingAssemblyProcessCard/index.vue @@ -18,7 +18,7 @@ :value="item.value"/> 查询 - 导出 + 导出 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
GAOJING专机装配工艺过程卡
机床编号:{{ MachineNum }}机床名称:{{ MachineName }}客户名称:{{ CustomerName }}
序号工序名称工艺内容及装配具体要求质检工时/时完成情况/装配工检验情况/检验员备注
{{ item.table1 }}
{{ list.序号 }}{{ list.工序名称 }}{{ list.工艺内容及装配具体要求 }}{{ list.质检 }}{{ list.工时 }} - - -
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GAOJING专机装配工艺过程卡
机床编号:{{ MachineNum }}机床名称:{{ MachineName }}客户名称:{{ CustomerName }}
序号工序名称工艺内容及装配具体要求质检工时/时完成情况/装配工检验情况/检验员备注条码
{{ item.table1 }}
{{ list.序号 }}{{ list.工序名称 }}{{ list.工艺内容及装配具体要求 }}{{ list.质检 }}{{ list.工时 }} + + +
+
- + diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue index 89d9bb97..676e867a 100644 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue @@ -43,9 +43,10 @@ 查询 + 是否核准 在制零件工艺调整 - 切换编辑模式 + 切换编辑模式
种类: @@ -57,9 +58,8 @@ - 是否核准 规格: - + 投产总数量:
@@ -81,8 +81,6 @@ 计算公差 - 复制并保存 - 粘贴 典艺 @@ -90,7 +88,9 @@ 删除 - 保存 + 复制并保存 + + 保存 @@ -353,10 +353,9 @@ - + - @@ -834,6 +833,8 @@ export default { }, WYbtn() { // 完艺按钮 this.tableData4 = [] + this.tuhaoValue = '' + this.remark1 = '' this.dialogFormVisible1 = true }, selectPerson(row) { // 选择工艺员 @@ -1218,20 +1219,15 @@ export default { .doing-row4 { background: #f0f9eb; } - .el-card { margin-bottom: 15px; } - .el-date-editor { width: 150px } - span { margin: 10px 0 10px 10px; } - - - - - diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue index 5f348334..b63cd08f 100644 --- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue @@ -15,7 +15,7 @@ size="small" placeholder="选择日期"/> 查询 - 导出外协加工任务单 + 导出外协加工任务单 @@ -77,70 +77,72 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
GAOJING外协加工任务单
任务单号:{{ 任务单号 }}任务下达日期:{{ 任务下达日期 }}外协厂家:{{ 外协厂家 }}
外协员:{{ 外协员 }}电话:{{ 外协员电话 }}联系人:{{ 联系人 }}电话:{{ 联系人电话 }}
序号零件图号零件名称数量内容零件类型外协类别加工价格材料价格其他价格计划开始计划结束
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - -
GAOJING外协加工任务单
任务单号:{{ 任务单号 }}任务下达日期:{{ 任务下达日期 }}外协厂家:{{ 外协厂家 }}
外协员:{{ 外协员 }}电话:{{ 外协员电话 }}联系人:{{ 联系人 }}电话:{{ 联系人电话 }}
序号零件图号零件名称数量内容零件类型外协类别加工价格材料价格其他价格计划开始计划结束
费用加工费：￥{{ 加工价格合计 }}元；材料费：￥{{ 材料价格合计 }}元；其他费用：￥{{ 其他价格合计 }}元；运费￥{{ 运费 }}元；合计：￥{{ 总计 }}元；人民币大写：{{ 大写金额 }}0 - - {{ 加工价格合计 }}{{ 材料价格合计 }}{{ 其他价格合计 }}{{ 最早时间 }}{{ 最晚时间 }}
外协员:外协科长:采购二部长:制品部长:定额科统计员:定额科长:外协厂:
+ + + + 费用 + 加工费：￥{{ 加工价格合计 }}元；材料费：￥{{ 材料价格合计 }}元；其他费用：￥{{ 其他价格合计 }}元；运费￥{{ 运费 }}元；合计：￥{{ 总计 }}元；人民币大写：{{ 大写金额 }} + 0 + + + {{ 加工价格合计 }} + {{ 材料价格合计 }} + {{ 其他价格合计 }} + {{ 最早时间 }} + {{ 最晚时间 }} + + + 外协员: + 外协科长: + 采购二部长: + 制品部长: + 定额科统计员: + 定额科长: + 外协厂: + + + + @@ -169,6 +171,7 @@ import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel' import { convertCurrency } from '@/vendor/int2Chinese' import { mapGetters } from 'vuex' import elInput from 'element-ui/packages/input' +import $ from 'jquery' export default { components: { @@ -288,6 +291,20 @@ export default { this.getList() }, methods: { + exportTable() { + if (this.List3.length === 0) { + this.$message.warning('暂无数据') + } else { + const htmlNode = $('#RWD').html() + const body = $('body') + body.children().hide() + const printNode = $(htmlNode) + body.append(printNode) + window.print() + body.children().not('script').show() + printNode.remove() + } + }, shouhuo(row) { this.$confirm('此操作将不可更改, 是否继续?', '提示', { confirmButtonText: '确定', @@ -460,7 +477,7 @@ export default { } this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费 this.大写金额 = convertCurrency(this.总计) - // cjn end + // RWD end if (response.data.length === 0) { this.loading = false } @@ -762,7 +779,7 @@ export default { if (response.data.length === 0) { this.loading = false } - // cjn end + // RWD end if (response.data.length === 0) { this.loading = false } @@ -886,7 +903,7 @@ export default { } this.总计 = this.加工价格合计 + this.材料价格合计 + this.其他价格合计 + this.运费 this.大写金额 = convertCurrency(this.总计) - // cjn end + // RWD end if (response.data.length === 0) { this.loading = false } @@ -1279,7 +1296,7 @@ export default { this.$message.warning('请选择订单') } }, - downLoadCjn(tableid) { + downLoadRWD(tableid) { if (this.List3.length === 0) { this.$message.warning('暂无数据') } else { diff --git a/src/views/Outsourcing/UnqualifiedTreatment/index.vue b/src/views/Outsourcing/UnqualifiedTreatment/index.vue index ad6ebdec..545948fc 100644 --- a/src/views/Outsourcing/UnqualifiedTreatment/index.vue +++ b/src/views/Outsourcing/UnqualifiedTreatment/index.vue @@ -78,18 +78,18 @@ {{ scope.row.废品数量 }} - + - + @@ -107,7 +107,7 @@ - + @@ -138,6 +138,7 @@ import { initOutHelp, searchTable, editList } from '@/api/Outsourcing/Unqualifie export default { data() { return { + num_bhg: '', count2: 0, form: { wasteQuantity: '', // 废品数量 @@ -165,6 +166,7 @@ export default { }, created() { this.fetchData() + this.searchTable() }, methods: { fetchData() { @@ -218,24 +220,29 @@ export default { } this.number = row.外协加工任务单明细流水号 this.form.wasteQuantity = row.废品数量 + this.num_bhg = row.批次数量 this.form.processingMethod = row.不合格处理方式 this.dialogFormVisible1 = true }, // 提交编辑 submitEdit() { - editList(this.number, this.form.wasteQuantity, this.form.processingMethod).then(response => { - if (response.data[0].result === '1') { - this.dialogFormVisible1 = false - this.$message({ - type: 'success', - message: '信息更新成功!' - }) - this.searchTable() - } else { - this.dialogFormVisible1 = false - this.$message.error('信息更新失败') - } - }) + if (this.form.wasteQuantity > this.num_bhg) { + this.$message.error('废品数量大于总数量') + } else { + editList(this.number, this.form.wasteQuantity, this.form.processingMethod).then(response => { + if (response.data[0].result === '1') { + this.dialogFormVisible1 = false + this.$message({ + type: 'success', + message: '信息更新成功!' + }) + this.searchTable() + } else { + this.dialogFormVisible1 = false + this.$message.error('信息更新失败') + } + }) + } }, // 提交添加或者修改 submit(formName) { diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 604b0e38..14632376 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -969,12 +969,14 @@ export default { this.useqrcode(row.离线合同流水号) // 显示二维码 }).then(() => { const htmlNode = $('#offlineContract').html() - const body = $('body') + const body = $('body').attr('style', 'padding: 20px;margin: 0 auto;display: block;width: 800px;background: #fff;') body.children().hide() const printNode = $(htmlNode) body.append(printNode) window.print() + body.removeAttr('style') body.children().not('script').show() + body.children().not('#app').hide() printNode.remove() }).catch(res => { console.log(res) diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue index e4a58ea5..7fd4a266 100644 --- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue @@ -249,12 +249,14 @@ export default { if (this.contractValue) { // exportExcelMethod('print', '采购合同', '采购合同sheet1') const htmlNode = $('#print').html() - const body = $('body') + const body = $('body').attr('style', 'padding: 20px;margin: 0 auto;display: block;width: 800px;background: #fff;') body.children().hide() const printNode = $(htmlNode) body.append(printNode) window.print() + body.removeAttr('style') body.children().not('script').show() + body.children().not('#app').hide() printNode.remove() } else { this.$message.error('请选择合同') diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue index 64c1a7f4..5b683f91 100644 --- a/src/views/TechnologyCenter/CreatePackingList/index.vue +++ b/src/views/TechnologyCenter/CreatePackingList/index.vue @@ -606,7 +606,6 @@ export default { console.log(resp) const groupData = resp.data.map(item => { item.类别 = '机床所属部件' - item.代号 = data[i].代号 + '-' + item.代号 + '组' return item }) console.log(groupData) diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue index 5e0477d3..e7c2a055 100644 --- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue +++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue @@ -546,7 +546,7 @@ export default { 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.材料流水号, 1, data.是否传递, data.序号, data.id, data.前id, data.前图号或者型号) + const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.前id, data.前图号或者型号) await sleep(10) if (resp.data[0].result === '0') { this.err++ diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue index c3f40d9e..3d830dee 100644 --- a/src/views/TechnologyCenter/ImportParts/index.vue +++ b/src/views/TechnologyCenter/ImportParts/index.vue @@ -168,6 +168,7 @@ export default { this.disabled = false return } else { + console.log(this.worksheet[j], 111111111) if (this.worksheet[j].M2.v.substring(0, 1) !== '9') { this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = '' this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = '' diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue index e7910ff9..ad110d6a 100644 --- a/src/views/TechnologyCenter/QueryParts/index.vue +++ b/src/views/TechnologyCenter/QueryParts/index.vue @@ -160,6 +160,7 @@ size="mini" type="danger" icon="el-icon-delete" + disabled @click="handleDelete(scope.row)">删除 diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index 961ce743..8efdbfcb 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -203,8 +203,10 @@ icon="" style="margin-top:10px" @click="calculateContractSum">计算合同总额 - 合同总额: + 合同总额(未税): + 合同总额(含税): + @@ -364,6 +366,7 @@ export default { paramRow: '', // 参数row contractSum: 0, contractSum1: 0, + contractSum2: 0, deliveryDay: [], deliveryDay1: [], contractNumValue: '', @@ -515,6 +518,7 @@ export default { this.tableData4.push(this.groupNum2[i]) } this.contractSum = (this.contractSum + this.contractSum1).toFixed(2) + this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100 this.costAccount = this.contractSum if (parseInt(this.costAccount) === 0) { this.$message.error('成本核算不可为0') @@ -543,6 +547,11 @@ export default { this.fax ? this.supplierCheck11 = 1 : (this.supplierCheck11 = 0, this.fax = '') this.goodTime ? this.supplierCheck12 = 1 : (this.supplierCheck12 = 0, this.goodTime = '') searchSupplier(this.supplierCheck1, this.supplierName, this.supplierCheck2, this.enterpriseNature, this.supplierCheck3, this.createDate, this.supplierCheck4, this.registeredCapital, this.supplierCheck5, this.taxNum, this.supplierCheck6, this.EMail, this.supplierCheck7, this.address, this.supplierCheck8, this.account, this.supplierCheck9, this.openingBank, this.supplierCheck10, this.phone, this.supplierCheck11, this.fax, this.supplierCheck12, this.goodTime).then(response => { + for (let i = 0; i < response.data.length; i++) { + if (response.data[i].创立日期 !== '' && response.data[i].创立日期 !== null) { + response.data[i].创立日期 = response.data[i].创立日期.split(' ')[0] + } + } this.tableData01 = response.data }) }, @@ -676,59 +685,6 @@ export default { }) } }, - // payMethodChange() { // 付款方式改变 - // for (let i = 0; i < this.payMethod.length; i++) { - // if (this.payMethod[i].value === this.payMethodValue) { - // this.payMethodName = this.payMethod[i].label - // } - // } - // const payTimeNum = this.payMethodName.split(':') - // switch (payTimeNum.length) { - // case 1: - // this.disable2 = true - // this.disable3 = true - // this.disable4 = true - // this.disable5 = true - // this.disable6 = true - // break - // case 2: - // this.disable2 = false - // this.disable3 = true - // this.disable4 = true - // this.disable5 = true - // this.disable6 = true - // break - // case 3: - // this.disable2 = false - // this.disable3 = false - // this.disable4 = true - // this.disable5 = true - // this.disable6 = true - // break - // case 4: - // this.disable2 = false - // this.disable3 = false - // this.disable4 = false - // this.disable5 = true - // this.disable6 = true - // break - // case 5: - // this.disable2 = false - // this.disable3 = false - // this.disable4 = false - // this.disable5 = false - // this.disable6 = true - // break - // case 6: - // this.disable2 = false - // this.disable3 = false - // this.disable4 = false - // this.disable5 = false - // this.disable6 = false - // break - // } - // this.fetchData() - // }, exportExcel() {} } } diff --git a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue index ea31c8b7..afa3b525 100644 --- a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue +++ b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue @@ -75,7 +75,7 @@ @@ -207,7 +207,7 @@ @@ -314,6 +314,8 @@ export default { } } }) + response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100 + response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100 } this.tableData1 = response.data.rows this.total1 = response.data.total @@ -381,6 +383,8 @@ export default { } searchRequestTable(this.checkRequest, this.startRequestDate, this.endRequestDate).then(response => { for (let j = 0; j < response.data.length; j++) { + response.data[j].含税总金额 = parseInt(response.data[j].含税总金额 * 100) / 100 + response.data[j].欠款金额 = parseInt(response.data[j].欠款金额 * 100) / 100 if (response.data[j].请款时间 !== null) { response.data[j].请款时间 = response.data[j].请款时间.substring(0, response.data[j].请款时间.indexOf(' ')) } diff --git a/src/views/WorkshopProcurement/FundApproval2/index.vue b/src/views/WorkshopProcurement/FundApproval2/index.vue index e457a357..f18587cd 100644 --- a/src/views/WorkshopProcurement/FundApproval2/index.vue +++ b/src/views/WorkshopProcurement/FundApproval2/index.vue @@ -35,7 +35,7 @@ @@ -108,6 +108,10 @@ export default { }, searchTable() { initApproval1(this.pageCurrent, this.pageSize, 2).then(response => { + for (let j = 0; j < response.data.rows.length; j++) { + response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100 + response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100 + } this.tableData = response.data.rows this.total = response.data.total }) diff --git a/src/views/WorkshopProcurement/FundApproval3/index.vue b/src/views/WorkshopProcurement/FundApproval3/index.vue index 8fd7d5da..3a68d499 100644 --- a/src/views/WorkshopProcurement/FundApproval3/index.vue +++ b/src/views/WorkshopProcurement/FundApproval3/index.vue @@ -35,7 +35,7 @@ @@ -108,6 +108,10 @@ export default { }, searchTable() { initApproval1(this.pageCurrent, this.pageSize, 3).then(response => { + for (let j = 0; j < response.data.rows.length; j++) { + response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100 + response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100 + } this.tableData = response.data.rows this.total = response.data.total }) diff --git a/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue b/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue index 5fda01d6..791d6cb5 100644 --- a/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue +++ b/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue @@ -182,7 +182,9 @@ export default { this.contractNum ? this.check1 = 1 : this.check1 = 0 this.supplierName ? this.check2 = 1 : this.check2 = 0 searchContractInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.contractNum, this.check2, this.supplierName).then(response => { - console.log(response.data.rows) + for (let j = 0; j < response.data.rows.length; j++) { + response.data.rows[j].合同总金额 = parseInt(response.data.rows[j].合同总金额 * 100) / 100 + } this.tableData1 = response.data.rows this.total1 = response.data.total }) diff --git a/src/views/WorkshopProcurement/PayStateSearch/index.vue b/src/views/WorkshopProcurement/PayStateSearch/index.vue index 1cc8fffa..a9038ea0 100644 --- a/src/views/WorkshopProcurement/PayStateSearch/index.vue +++ b/src/views/WorkshopProcurement/PayStateSearch/index.vue @@ -56,7 +56,7 @@ @@ -66,7 +66,7 @@ @@ -74,7 +74,7 @@ @@ -141,6 +141,10 @@ export default { this.contractNumValue ? this.check1 = 1 : this.check1 = 0 this.supplierName ? this.check2 = 1 : this.check2 = 0 searchPayState(this.pageCurrent1, this.pageSize1, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => { + for (let j = 0; j < response.data.rows.length; j++) { + response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100 + response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100 + } this.tableData1 = response.data.rows this.total1 = response.data.total }) diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue index f68ced98..9f6cdf48 100644 --- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue +++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue @@ -61,7 +61,7 @@ @@ -303,6 +303,7 @@ export default { TotalAmount1: '', RMB1: '', total1: 0, + QGNUM: '', pageCurrent1: 1, pageSize1: 10, tableData1: [], @@ -398,6 +399,7 @@ export default { console.log(row) this.dialogVisible3 = true this.ProcurementContractNum = row.采购合同流水号 + this.QGNUM = row.请购单流水号 }, selectChange() { if (this.form2.审批是否通过 === 2) { @@ -409,7 +411,7 @@ export default { submitApproval(formName) { this.$refs[formName].validate((valid) => { if (valid) { - submitApproval(this.ProcurementContractNum, this.form2.审批是否通过, this.form2.未通过原因).then(response => { + submitApproval(this.ProcurementContractNum, this.form2.审批是否通过, this.form2.未通过原因, this.QGNUM).then(response => { if (response.data[0].result === '1') { this.$message.success('审批成功') this.dialogVisible3 = false diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue index d8dd5ea3..fde4c1e2 100644 --- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue +++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue @@ -70,7 +70,7 @@ @@ -431,7 +431,7 @@ export default { const printNode = $(htmlNode) body.append(printNode) window.print() - body.children().show() + body.children().not('script').show() printNode.remove() }, handleSizeChange1(val) { diff --git a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue index 2d62fce3..e271072e 100644 --- a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue +++ b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue @@ -17,7 +17,7 @@ @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询 - +