diff --git a/src/api/ManufacturingCenter/MaterialArrivalManagement.js b/src/api/ManufacturingCenter/MaterialArrivalManagement.js index 3bd60bb2..5c603b88 100644 --- a/src/api/ManufacturingCenter/MaterialArrivalManagement.js +++ b/src/api/ManufacturingCenter/MaterialArrivalManagement.js @@ -25,7 +25,7 @@ export function searchtable2(num1) { } }) } - +// 完成备料工序 export function handlechange(Number, code) { return request({ url: '', @@ -37,17 +37,32 @@ export function handlechange(Number, code) { } }) } +// 查询外购备料零件 +export function searchtable3(num, num1, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_外购备料查询', + param: '零件图号_check=' + num + '&零件图号=' + num1, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 自家备料出库 export function change(Number, code, num) { return request({ url: '', method: 'post', data: { type: '2', - name: '车间生产管理工艺_备料到货更改', - param: '工序流水号组=' + Number + '&工作者考勤编号=' + code + '&工艺计划流水号组=' + num + name: '车间生产管理工艺_备料到货_状态更改', + param: '工艺计划流水号=' + Number + '&重量=' + code + '&单价=' + num } }) } +// 外购备料出库 export function change2(Number, code, num) { return request({ url: '', diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js index 1bebf117..7cf21080 100644 --- a/src/api/ManufacturingCenter/ProcessPlanning.js +++ b/src/api/ManufacturingCenter/ProcessPlanning.js @@ -419,3 +419,15 @@ export function WeightCopy(num, num2) { } }) } +// 保存变更材质 +export function saveWeight(num0, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工艺计划_修改零件重量', + param: '工艺计划流水号=' + num0 + '&重量=' + num1 + } + }) +} diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js index 791ef478..198c845e 100644 --- a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js +++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js @@ -1,15 +1,136 @@ import request from '@/utils/request' -// 查询库存数 -export function searchInventoryNum(pageCurrent, pageSize, check1, name, check2, state1, state2) { +// 查询外购备料列表 +export function initPartDrawing(check1, name) { return request({ url: '', method: 'post', data: { type: '1', - name: '采购管理_离线合同_物料余量_查询数据', - param: `物料名称_check=${check1}&物料名称=${name}&库存状态_check=${check2}&库存状态=${state1}&采购状态=${state2}`, + name: '备料管理_外购备料_查询数据', + param: `零件图号_check=${check1}&零件图号=${name}` + } + }) +} +// 查询外购备料 +export function searchPurchasedMaterials(pageCurrent, pageSize, check1, name) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_外购备料_查询数据', + param: `零件图号_check=${check1}&零件图号=${name}`, Pagination: pageCurrent + '&' + pageSize } }) } +// 查询采购单 +export function searchPurchaseOrder(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 addPurchaseOrder(PurchaseOrderName, supplier, person, date) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_采购计划_增加数据', + param: `采购单名称=${PurchaseOrderName}&采购员=${person}&供应商=${supplier}&计划完成日期=${date}` + } + }) +} +// 编辑采购单 +export function editPurchaseOrder(PurchaseOrderNameValue, PurchaseOrderName, supplier, date) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_采购计划_编辑数据', + param: `采购计划流水号=${PurchaseOrderNameValue}&采购单名称=${PurchaseOrderName}&供应商=${supplier}&计划完成日期=${date}` + } + }) +} +// 删除采购单 +export function deletePurchaseOrder(PurchaseOrderNameValue) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_采购计划_删除数据', + param: `采购计划流水号=${PurchaseOrderNameValue}` + } + }) +} +// 查询采购计划明细 +export function searchMateriel(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_采购计划明细_查询数据', + param: `采购计划流水号=${num}` + } + }) +} +// 增加采购计划明细 +export function addMateriel(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_采购计划明细_增加数据', + param: `采购计划流水号=${num1}&工艺计划流水号组=${num2}` + } + }) +} +// 保存采购计划明细 +export function saveMateriel(num1, num2, num3, num4) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_采购计划明细_保存数据', + param: `采购计划流水号=${num1}&采购计划明细流水号组=${num2}&单位组=${num3}&备注组=${num4}` + } + }) +} +// 删除采购计划明细 +export function deleteMateriel(num, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_外购备料_移出数据', + param: `采购计划明细流水号=${num}&工艺计划流水号=${num1}` + } + }) +} +// 查询供应商 +export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_供应商_查询数据_根据条件', + param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12 + } + }) +} diff --git a/src/api/WorkshopProcurement/FundApproval.js b/src/api/WorkshopProcurement/FundApproval.js index 341493e6..c8ff277f 100644 --- a/src/api/WorkshopProcurement/FundApproval.js +++ b/src/api/WorkshopProcurement/FundApproval.js @@ -87,3 +87,40 @@ export function execApprovalOffline(num1, num2, reason, person, state) { } }) } +// 查询采购计划待请款信息 +export function searchRequsetFundDetail1(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_请款明细_查询数据', + param: `采购计划请款流水号=${num}` + } + }) +} +// 查询备料审批/付款 +export function initApprovalMaterials(pageCurrent, pageSize, state) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_审批付款_查询数据', + param: `审批_付款状态=${state}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 执行审批/付款（备料） +export function execMaterials(num1, num2, reason, person, state) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_审批付款_修改数据', + param: `采购计划请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` + } + }) +} diff --git a/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js b/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js new file mode 100644 index 00000000..633a338a --- /dev/null +++ b/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js @@ -0,0 +1,122 @@ +import request from '@/utils/request' + +// 发票查询 +export function searchInvoice(pageCurrent, pageSize, check1, num1, check2, supplierName0, check3, transmit, check4, recipient) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_发票_查询数据', + param: '发票号_check=' + check1 + '&发票号=' + num1 + '&供应商名称_check=' + check2 + '&供应商名称=' + supplierName0 + '&传送人_check=' + check3 + '&传送人=' + transmit + '&接收人_check=' + check4 + '&接收人=' + recipient, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 发票明细查询 +export function searchInvoiceDetail(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_发票明细_查询数据', + param: '发票流水号=' + num + } + }) +} +// 发票增加 +export function addInvoice(num1, time1, money, send, receive, remark, num3, num4) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_发票_增加数据', + param: `采购计划流水号组=${num1}&开票时间=${time1}&开票金额=${money}&传送人=${send}&接收人=${receive}&备注=${remark}&供应商=${num3}&采购计划流水号字符串=${num4}` + } + }) +} +// 发票编辑 +export function editInvoice(num1, time1, money, send, receive, remark, num3) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_发票_编辑数据', + param: '发票流水号=' + num1 + '&供应商=' + num3 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark + } + }) +} +// 发票删除 +export function deleteInvoice(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_发票_删除数据', + param: '发票流水号=' + num1 + } + }) +} +// 初始化采购计划 +export function initPurchase() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_采购计划_查询数据_发票' + } + }) +} +// 接收人初始化 +export function initPerson() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=9' + } + }) +} +// 传送人初始化 +export function initPerson1() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', + param: '考核部门编号=5' + } + }) +} +// 初始化合同号 +export function initContract() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_付款情况_查询数据', + param: '采购合同流水号_check=0&供应商名称_check=0' + } + }) +} +// 查询供应商 +export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_供应商_查询数据_根据条件', + param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12 + } + }) +} diff --git a/src/api/WorkshopProcurement/OutsourcingStockArrival.js b/src/api/WorkshopProcurement/OutsourcingStockArrival.js new file mode 100644 index 00000000..41d73b6d --- /dev/null +++ b/src/api/WorkshopProcurement/OutsourcingStockArrival.js @@ -0,0 +1,63 @@ +import request from '@/utils/request' + +// 查询采购单列表 +export function initPurchaseOrder(check1, num, check2, name) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_采购计划_查询数据_到货', + param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}` + } + }) +} +// 查询采购单 +export function searchPurchaseOrder(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 searchMateriel(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_采购计划明细_查询数据', + param: `采购计划流水号=${num}` + } + }) +} +// 到货 +export function Arrival(num, num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_采购计划_到货', + param: `采购计划明细流水号=${num}&重量=${num1}&单价=${num2}` + } + }) +} +// 总价 +export function totalChange(num, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_采购计划_保存总价', + param: `采购计划流水号=${num}&总价=${num1}` + } + }) +} diff --git a/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js b/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js new file mode 100644 index 00000000..60f0080d --- /dev/null +++ b/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js @@ -0,0 +1,75 @@ +import request from '@/utils/request' + +// 查询请款表 +export function searchRequestFund(pageCurrent, pageSize, check1, start, end, check2, name) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_请款_查询数据', + param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}&供应商名称_check=${check2}&供应商名称=${name}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询采购计划待请款信息 +export function searchOfflineContract(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_待请款_查询数据', + param: `供应商=${num}` + } + }) +} +// 增加请款 +export function submitRequestFund(contractGroup, sumGroup, supplier, money, person) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_请款_增加数据', + param: `采购计划流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商=${supplier}&请款金额=${money}&请款人=${person}` + } + }) +} +// 查询采购计划待请款信息 +export function searchRequsetFundDetail(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_请款明细_查询数据', + param: `采购计划请款流水号=${num}` + } + }) +} +// 取消请款 +export function cancelRequestFund(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_请款_删除数据', + param: `采购计划请款流水号=${num}` + } + }) +} +// 保存请款明细 +export function SavingMoney(num, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_请款明细_保存数据', + param: `采购计划请款明细流水号组=${num}&请款金额组=${num1}` + } + }) +} diff --git a/src/api/WorkshopProcurement/StockPreparation.js b/src/api/WorkshopProcurement/StockPreparation.js new file mode 100644 index 00000000..960770b4 --- /dev/null +++ b/src/api/WorkshopProcurement/StockPreparation.js @@ -0,0 +1,74 @@ +import request from '@/utils/request' + +// 查询入库单列表 +export function initWarehouseReceipt(check1, num, check2, name) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_入库单_查询数据', + param: `入库单号_check=${check1}&入库单号=${num}&供应商名称_check=${check2}&供应商名称=${name}` + } + }) +} +// 查询采购单列表 +export function initPurchaseOrder() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_采购计划_查询数据_发票' + } + }) +} +// 查询入库单 +export function searchWarehouseReceipt(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 searchMateriel(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_采购计划明细_查询数据', + param: `采购计划流水号=${num}` + } + }) +} +// 创建入库单 +export function AddWarehousing(num, num1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_入库单_增加数据', + param: `采购计划流水号=${num}&入库人员=${num1}` + } + }) +} +// 删除入库单 +export function deleteWarehousing(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_入库单_删除数据', + param: `入库单流水号=${num}` + } + }) +} diff --git a/src/icons/svg/CreatingPurchasingMaterials.svg b/src/icons/svg/CreatingPurchasingMaterials.svg new file mode 100644 index 00000000..d27738fc --- /dev/null +++ b/src/icons/svg/CreatingPurchasingMaterials.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutsourcingMaterialsInvoice.svg b/src/icons/svg/OutsourcingMaterialsInvoice.svg new file mode 100644 index 00000000..97125710 --- /dev/null +++ b/src/icons/svg/OutsourcingMaterialsInvoice.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutsourcingStockArrival.svg b/src/icons/svg/OutsourcingStockArrival.svg new file mode 100644 index 00000000..97e7906a --- /dev/null +++ b/src/icons/svg/OutsourcingStockArrival.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/RequestOutsourcingMaterials.svg b/src/icons/svg/RequestOutsourcingMaterials.svg new file mode 100644 index 00000000..1a5bafe1 --- /dev/null +++ b/src/icons/svg/RequestOutsourcingMaterials.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/StockPreparation.svg b/src/icons/svg/StockPreparation.svg new file mode 100644 index 00000000..e6d57ff2 --- /dev/null +++ b/src/icons/svg/StockPreparation.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index b02d2c11..8ff301b9 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -44,9 +44,9 @@ {{ scope.row.材料 }} - + @@ -155,6 +155,9 @@ export default { if (response.data.total === 0) { this.loading = false } else { + // this.tableData.push({ + // 重量: response.data.rows[0].重量 + // }) this.Data = response.data.rows this.total = response.data.total } @@ -168,7 +171,7 @@ export default { 备料打印: this.Data[i].备料打印, 工艺要求: response.data[0].工艺要求, 材料: this.Data[i].材料, - 原材料规格: this.Data[i].原材料规格, + 重量: this.Data[i].重量, 批次数量: this.Data[i].批次数量 }) }) diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue index cfe45891..2f4e06a2 100644 --- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue @@ -6,24 +6,13 @@ 查询 - 自家备料出库 - 外购备料出库 + - - - - - + + + + + + + + + +
- + 零件图号: + + 查询 + 外购备料出库 + + + - - - - + + + + + + +
+ @size-change="handleSizeChange2" + @current-change="handleCurrentChange2"/>
@@ -97,7 +115,8 @@ + + diff --git a/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue b/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue new file mode 100644 index 00000000..25bdceb8 --- /dev/null +++ b/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue @@ -0,0 +1,317 @@ + + + + + diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue new file mode 100644 index 00000000..296f5255 --- /dev/null +++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue @@ -0,0 +1,366 @@ + + + + + + diff --git a/src/views/WorkshopProcurement/StockPreparation/index.vue b/src/views/WorkshopProcurement/StockPreparation/index.vue new file mode 100644 index 00000000..edfb4aee --- /dev/null +++ b/src/views/WorkshopProcurement/StockPreparation/index.vue @@ -0,0 +1,428 @@ + + + + +