From d1d929e9a552f29cfc8c06c75093b5cfb487a0fc Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 18 Mar 2019 09:17:38 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessPlanning/index.vue | 42 ++++++++++++++++--- .../ProcessingStatus/index.vue | 18 ++++---- .../ProcessingStatusEdit/index.vue | 2 +- 3 files changed, 46 insertions(+), 16 deletions(-) diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue index 4c6e958b..1005d7dd 100644 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue @@ -2,7 +2,7 @@
- + 未编制 已编制 @@ -31,15 +31,15 @@ 零件名称: + 投产总数量: + 材质: - - + + 规格: - 投产总数量: -
@@ -101,6 +101,7 @@ 计算重量 +
@@ -206,7 +207,34 @@ - + + + 查询 + + + + + +
+ +
+
+ 提交 +
+ + + 查询 @@ -499,6 +527,8 @@ export default { }, data() { return { + dialogMateria2: false, + prepareMateriel: '', lastFocusText: '', Result1: '', Result2: '', diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue index e1c418f4..775e66b9 100644 --- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue @@ -23,6 +23,14 @@ 零件图号: + 进度颜色： + 拖期 + 即将拖期 + 如期 + 工序外协 + 报废 + + 计划下达时间: - - + ~ 查询 - - 进度颜色： - 拖期 - 即将拖期 - 如期 - 工序外协 - 报废 - diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue index a735c6fb..ac6184ca 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue @@ -32,7 +32,7 @@ style="width: 160px" type="date" placeholder="选择日期"/> - - + ~ Date: Mon, 18 Mar 2019 10:23:57 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E5=B9=B3=E8=A1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductionCapacityBalance/index.vue | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue index c0405e35..e8d423a4 100644 --- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue +++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue @@ -1453,12 +1453,7 @@ export default { this.result1 = 0 for (let i = 0; i < this.tableData1.length; i++) { this.length = this.tableData1.length - if (this.预计外协[i] === '否') { - this.预计外协[i] = 1 - } else { - this.预计外协[i] = 2 - } - out(this.tableData1[i].工艺计划流水号, this.预计外协[i]).then(response => { + out(this.tableData1[i].工艺计划流水号, 1).then(response => { }).then(() => { plan(this.tableData1[i].工艺计划流水号).then(response => { if (this.tableData1[i].平衡次数 !== 0 || this.tableData1[i].是否焊接 !== 1) { @@ -1466,7 +1461,6 @@ export default { if (this.result1 === this.length) { this.$message.success('零件计划制定成功') this.total1 = 0 - this.pageSize1 = 10 this.pageList1 = 1 this.Selection1() } else if (response.data[0].result === '0') { From 322a41f681c954a119893940425b0c18b8c99a24 Mon Sep 17 00:00:00 2001 From: liushuai Date: Tue, 19 Mar 2019 16:26:52 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=A4=87=E6=96=99=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreatingPurchasingMaterials.js | 129 +++- src/api/WorkshopProcurement/FundApproval.js | 37 ++ .../OutsourcingMaterialsInvoice.js | 122 ++++ .../OutsourcingStockArrival.js | 63 ++ .../RequestOutsourcingMaterials.js | 75 +++ .../WorkshopProcurement/StockPreparation.js | 74 +++ src/icons/svg/CreatingPurchasingMaterials.svg | 1 + src/icons/svg/OutsourcingMaterialsInvoice.svg | 1 + src/icons/svg/OutsourcingStockArrival.svg | 1 + src/icons/svg/RequestOutsourcingMaterials.svg | 1 + src/icons/svg/StockPreparation.svg | 1 + .../CreatingPurchasingMaterials/index.vue | 544 ++++++---------- .../FundApproval2/index.vue | 130 +++- .../FundApproval3/index.vue | 130 +++- .../OutsourcingMaterialsInvoice/index.vue | 613 ++++++++++++++++++ .../OutsourcingStockArrival/index.vue | 317 +++++++++ .../RequestOutsourcingMaterials/index.vue | 366 +++++++++++ .../StockPreparation/index.vue | 428 ++++++++++++ 18 files changed, 2691 insertions(+), 342 deletions(-) create mode 100644 src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js create mode 100644 src/api/WorkshopProcurement/OutsourcingStockArrival.js create mode 100644 src/api/WorkshopProcurement/RequestOutsourcingMaterials.js create mode 100644 src/api/WorkshopProcurement/StockPreparation.js create mode 100644 src/icons/svg/CreatingPurchasingMaterials.svg create mode 100644 src/icons/svg/OutsourcingMaterialsInvoice.svg create mode 100644 src/icons/svg/OutsourcingStockArrival.svg create mode 100644 src/icons/svg/RequestOutsourcingMaterials.svg create mode 100644 src/icons/svg/StockPreparation.svg create mode 100644 src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue create mode 100644 src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue create mode 100644 src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue create mode 100644 src/views/WorkshopProcurement/StockPreparation/index.vue 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/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue index 1baf494e..c5c81d14 100644 --- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue +++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue @@ -3,9 +3,9 @@
零件图号: - + @@ -29,32 +29,32 @@ - + @@ -75,7 +75,7 @@
采购单号: - + 供应商: 创建采购单 + @click="addPurchaseOrder">创建采购单 保存 + @click="saveMateriel">保存
@@ -128,23 +128,23 @@ - + @@ -160,40 +160,40 @@ @size-change="handleSizeChange2" @current-change="handleCurrentChange2"/>
- + - + - + @@ -319,13 +319,13 @@ - - + + - - + + @@ -338,9 +338,9 @@ - + - - - - - - -
确定 + @click="submitAddPurchaseOrder">确定 确定 + @click="submitEditPurchaseOrder">确定
- - + +
+ + + + + + + + + + + + + + + + + + + +

江苏高精机电装备有限公司

锻件采购计划表

下单单位{{ 下单单位 }}单号{{ 单号 }}
下单日期{{ 下单日期 }}计划完成日期{{ 计划完成日期 }}
+ + + + + + + + + + + + + + + + + + + + + +
序号图号名称材料单位数量成品尺寸备注
{{ index + 1 }}{{ list.零件图号 }}{{ list.零件名称 }}{{ list.材料 }}{{ list.单位 }}{{ list.批次数量 }}{{ list.成品尺寸 }}{{ list.备注1 }}
+
+ - + + 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 @@ + + + + + From 7e830d562c5da67ce323c307daad4f28f528c858 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 20 Mar 2019 09:55:04 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E5=B9=B3=E8=A1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductionCapacityBalance/index.vue | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue index e8d423a4..0c9914fb 100644 --- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue +++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue @@ -27,8 +27,8 @@ 零件图号: - 查询 - 查询 + 查询 + 查询 是否扫描查询 @@ -431,11 +431,10 @@ @current-change="handleCurrentChange1"/>
虚拟排产 - 确定零件计划 + 确定零件计划 全部选出
- @@ -1103,11 +1102,9 @@ export default { if (this.result1 === this.multipleSelection.length) { this.result1 = 0 this.total1 = 0 - this.pageSize1 = 10 this.pageList1 = 1 this.Selection1() this.total = 0 - this.pageSize = 10 this.pageList = 1 this.getTable() } @@ -1128,11 +1125,9 @@ export default { } }).then(() => { this.total = 0 - this.pageSize = 10 this.pageList = 1 this.getTable() this.total1 = 0 - this.pageSize1 = 10 this.pageList1 = 1 this.Selection1() }) @@ -1148,7 +1143,6 @@ export default { xuanchu(this.工艺计划流水号[index]).then(response => { }).then(() => { this.pageList = 1 - this.pageSize = 10 this.total = 0 this.getTable() }).then(() => { @@ -1232,7 +1226,6 @@ export default { this.计划日期.push(response.data[i].计划日期) } }) - this.listLoading1 = false }) } } else { @@ -1240,6 +1233,8 @@ export default { this.listLoading1 = false this.total1 = 0 } + }).then(() => { + this.listLoading1 = false }) }, // 调整 @@ -1285,11 +1280,9 @@ export default { } }).then(() => { this.total = 0 - this.pageSize = 10 this.pageList = 1 this.getTable() this.total1 = 0 - this.pageSize1 = 10 this.pageList1 = 1 this.Selection1() }) @@ -1408,7 +1401,6 @@ export default { message: '板焊结束时间修改成功!' }) this.pageList = 1 - this.pageSize = 10 this.total = 0 this.getTable() } else { @@ -1495,7 +1487,6 @@ export default { if (i === this.multipleSelection.length - 1) { this.$message.success('零件计划制定成功') this.pageList = 1 - this.pageSize = 10 this.total = 0 this.getTable() } @@ -1565,7 +1556,6 @@ export default { }).then(() => { this.total = 0 this.pageList = 1 - this.pageSize = 10 this.getTable() }) }) From b059cf30ad895815ac93b187ee7243e1c07092b7 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 20 Mar 2019 16:19:05 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=88=B6=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/ProcessPlanning.js | 12 ++ .../ProcessPlanning/index.vue | 185 ++++++++++++------ 2 files changed, 132 insertions(+), 65 deletions(-) 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/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue index 1005d7dd..677263d6 100644 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue @@ -2,7 +2,7 @@
- + 未编制 已编制 @@ -33,13 +33,13 @@ 投产总数量: - 材质: - - + 物料: + + - 规格: - + +
@@ -60,6 +60,10 @@ 长度: 计算重量 + 重量: + + + @@ -72,6 +76,10 @@ 厚: 计算重量 + 重量: + + + @@ -80,6 +88,10 @@ 长度: 计算重量 + 重量: + + + @@ -90,6 +102,10 @@ 长度: 计算重量 + 重量: + + + @@ -100,6 +116,10 @@ 长度: 计算重量 + 重量: + + + @@ -233,34 +253,6 @@ 提交
- - - - 查询 - - - - - -
- -
-
- 提交 -
- - @@ -484,6 +476,7 @@