From d8357d96472585b4383dd998f2bd3c35bbef4ce2 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Tue, 28 May 2019 15:24:29 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E5=AE=A1=E6=89=B9half?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/FundApproval2/index.vue | 8 +-- src/views/layout/components/Navbar.vue | 62 ++++++++++++++++++- 2 files changed, 64 insertions(+), 6 deletions(-) diff --git a/src/views/PurchasingCenter/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue index 060db5c8..3037b8cc 100644 --- a/src/views/PurchasingCenter/FundApproval2/index.vue +++ b/src/views/PurchasingCenter/FundApproval2/index.vue @@ -117,9 +117,9 @@ @current-change="handleCurrentChange2"/> -

采购合同

+

采购合同

-

离线合同

+

离线合同

- + - + diff --git a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue index 887a1179..bb24fb59 100644 --- a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue +++ b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue @@ -66,7 +66,7 @@ {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }} - + @@ -76,17 +76,7 @@ {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }} - - - - - - - + @@ -96,6 +86,16 @@ {{ scope.row.审批4时间 ? scope.row.审批4时间 : '—' }} + + + + + + - + - + @@ -108,11 +108,21 @@ {{ scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }} - + + + + + + +
{ this.tableData00 = response.data.rows this.total00 = response.data.total + const remark = [] + const supplier = [] + this.remarkFilters = [] + this.supplierFilters = [] + response.data.rows.map(v => { + if (!remark.includes(v.备注)) { + remark.push(v.备注) + supplier.push(v.供货商) + this.remarkFilters.push({ text: v.备注, value: v.备注 }) + this.supplierFilters.push({ text: v.供货商, value: v.供货商 }) + } + }) }) }, handleSizeChange00(val) { // 标准件和外购件列表分页 From eedd773c4cfadf8fa877aed79e0b2599c3ac5b36 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Wed, 29 May 2019 08:49:57 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E8=AF=B7=E6=AC=BE=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=90=8D=E7=A7=B0=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/icons/svg/FundApproval2workshop.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/icons/svg/FundApproval2workshop.svg diff --git a/src/icons/svg/FundApproval2workshop.svg b/src/icons/svg/FundApproval2workshop.svg new file mode 100644 index 00000000..5e6226be --- /dev/null +++ b/src/icons/svg/FundApproval2workshop.svg @@ -0,0 +1 @@ + \ No newline at end of file From f9afa032a030a3e32a34de3946ba029f1f3eddef Mon Sep 17 00:00:00 2001 From: chenjianan Date: Wed, 29 May 2019 11:24:14 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/ProcessAdjustQuery.js | 2 +- src/api/PurchasingCenter/OfflineContract.js | 2 +- .../ProcessAdjustQuery/index.vue | 19 +++++-------------- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/api/ManufacturingCenter/ProcessAdjustQuery.js b/src/api/ManufacturingCenter/ProcessAdjustQuery.js index 151b6d6d..ae7575dd 100644 --- a/src/api/ManufacturingCenter/ProcessAdjustQuery.js +++ b/src/api/ManufacturingCenter/ProcessAdjustQuery.js @@ -8,7 +8,7 @@ export function initCraftmen() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17' + param: '考核部门编号=20' } }) } diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js index a47cae3e..0cd9792f 100644 --- a/src/api/PurchasingCenter/OfflineContract.js +++ b/src/api/PurchasingCenter/OfflineContract.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询库存数 +// 询价状态修改 export function changeInquiryStatus(num) { return request({ url: '', diff --git a/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue b/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue index 372a510d..1a2f5e0f 100644 --- a/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue +++ b/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue @@ -10,14 +10,13 @@ :value="item.value"/> 零件图号: - + - 查询 打回时间: @@ -219,15 +218,11 @@ export default { tableRowClassName2({ row }) { for (let i = 0; i < this.tableData1.length; i++) { row.工艺编号 === null ? row.工艺编号 = 0 : row.工艺编号 - if (this.tableData1[i].工序流水号 === row.工序流水号 && this.tableData1[i].工艺编号 !== null) { + if (this.tableData1[i].工序顺序 === row.工序顺序) { if (this.tableData1[i].工艺编号 !== row.工艺编号 || this.tableData1[i].工艺要求 !== row.工艺要求 || this.tableData1[i].工艺难度等级 !== row.工艺难度等级) { return 'change' } else { - if (this.tableData1[i].工序顺序 !== row.工序顺序 && (row.工艺要求 || row.工艺难度等级)) { - return 'change' - } else { - return '' - } + return '' } } } @@ -235,15 +230,11 @@ export default { tableRowClassName1({ row }) { for (let i = 0; i < this.tableData2.length; i++) { row.工艺编号 === null ? row.工艺编号 = 0 : row.工艺编号 - if (this.tableData2[i].工序流水号 === row.工序流水号 && this.tableData2[i].工艺编号 !== null) { + if (this.tableData2[i].工序顺序 === row.工序顺序) { if (this.tableData2[i].工艺编号 !== row.工艺编号 || this.tableData2[i].工艺要求 !== row.工艺要求 || this.tableData2[i].工艺难度等级 !== row.工艺难度等级) { return 'change' } else { - if (this.tableData1[i].工序顺序 !== row.工序顺序 && (row.工艺要求 || row.工艺难度等级)) { - return 'change' - } else { - return '' - } + return '' } } } From d9891368ee1dfbba537c76d729e7134f5bb7429c Mon Sep 17 00:00:00 2001 From: chenjianan Date: Wed, 29 May 2019 12:11:18 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E9=94=9A=E7=82=B9=E5=AE=9A=E4=BD=8D?= =?UTF-8?q?=E5=BD=B1=E5=93=8D=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/PurchasingCenter/FundApproval2/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/PurchasingCenter/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue index 3037b8cc..674bdd5e 100644 --- a/src/views/PurchasingCenter/FundApproval2/index.vue +++ b/src/views/PurchasingCenter/FundApproval2/index.vue @@ -205,13 +205,13 @@ export default { }, methods: { searchContactDetail(row) { - window.location.hash = '#firstAnchor' + document.documentElement.scrollTop = this.$el.querySelector('#firstAnchor').offsetTop searchContactDetail(row.采购合同流水号).then(response => { this.contractDetail1 = response.data[0].合同内容 }) }, searchOfflineContactDetail(row) { // 查询离线合同明细 - window.location.hash = '#secondAnchor' + document.documentElement.scrollTop = this.$el.querySelector('#secondAnchor').offsetTop searchMateriel(row.离线合同流水号).then(response => { this.contractDetail2 = response.data }) From 8b6578f71d6956f921bc4c57b5035550467b5354 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 29 May 2019 13:32:08 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E5=8E=9F=E6=9D=90=E6=96=99=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RawMaterialsMaintenance.js | 47 +++++ .../RawMaterialsMaintenance/index.vue | 169 ++++++++++++++++++ 2 files changed, 216 insertions(+) create mode 100644 src/api/ManufacturingCenter/RawMaterialsMaintenance.js create mode 100644 src/views/ManufacturingCenter/RawMaterialsMaintenance/index.vue diff --git a/src/api/ManufacturingCenter/RawMaterialsMaintenance.js b/src/api/ManufacturingCenter/RawMaterialsMaintenance.js new file mode 100644 index 00000000..e9c8bbb3 --- /dev/null +++ b/src/api/ManufacturingCenter/RawMaterialsMaintenance.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +export function searchTableData(num, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_原材料库存管理_查询', + param: '原材料名称=' + num, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function addData(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_原材料库存管理_新增', + param: '原材料名称=' + num + } + }) +} +export function editData(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_原材料库存管理_编辑', + param: '原材料流水号=' + num1 + '&原材料名称=' + num2 + } + }) +} +export function deleteCategory(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_原材料库存管理_删除', + param: '原材料流水号=' + num + } + }) +} diff --git a/src/views/ManufacturingCenter/RawMaterialsMaintenance/index.vue b/src/views/ManufacturingCenter/RawMaterialsMaintenance/index.vue new file mode 100644 index 00000000..198186ba --- /dev/null +++ b/src/views/ManufacturingCenter/RawMaterialsMaintenance/index.vue @@ -0,0 +1,169 @@ + + + + + From 1d253e41295aa2717bec85d608a9559e41a175bc Mon Sep 17 00:00:00 2001 From: chenjianan Date: Wed, 29 May 2019 13:34:25 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E5=91=A8=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/layout/components/Navbar.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index 5cbaa94d..e9fcb8c8 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -53,7 +53,7 @@ export default { mounted() { if (this.id.toString() === '3') { this.checkApproval() - this.timer = setInterval(this.checkApproval, 1000 * 60) + this.timer = setInterval(this.checkApproval, 1000 * 60 * 5) } }, beforeDestroy() { @@ -94,7 +94,7 @@ export default { this.$router.push({ path: '/FundApproval2/index' }) setTimeout(this.noticeFund.close(), 1000) }, - duration: 1000 * 60 + duration: 1000 * 60 * 5 }) } }) @@ -108,7 +108,7 @@ export default { this.$router.push({ path: '/InvoiceSettlementApprove/index' }) setTimeout(this.noticeInvoice.close(), 1000) }, - duration: 1000 * 60 + duration: 1000 * 60 * 5 }) } }) From a799b12ecbc3454f7586523daa65a8961a61c212 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 29 May 2019 16:04:20 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E9=87=87=E8=B4=AD(?= =?UTF-8?q?=E6=9A=82=E4=B8=8D=E7=94=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/SparePartsPurchase.js | 47 +++++++ .../SparePartsPurchase/index.vue | 130 ++++++++++++++++++ 2 files changed, 177 insertions(+) create mode 100644 src/api/ManufacturingCenter/SparePartsPurchase.js create mode 100644 src/views/ManufacturingCenter/SparePartsPurchase/index.vue diff --git a/src/api/ManufacturingCenter/SparePartsPurchase.js b/src/api/ManufacturingCenter/SparePartsPurchase.js new file mode 100644 index 00000000..e9c8bbb3 --- /dev/null +++ b/src/api/ManufacturingCenter/SparePartsPurchase.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +export function searchTableData(num, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_原材料库存管理_查询', + param: '原材料名称=' + num, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +export function addData(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_原材料库存管理_新增', + param: '原材料名称=' + num + } + }) +} +export function editData(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_原材料库存管理_编辑', + param: '原材料流水号=' + num1 + '&原材料名称=' + num2 + } + }) +} +export function deleteCategory(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_原材料库存管理_删除', + param: '原材料流水号=' + num + } + }) +} diff --git a/src/views/ManufacturingCenter/SparePartsPurchase/index.vue b/src/views/ManufacturingCenter/SparePartsPurchase/index.vue new file mode 100644 index 00000000..aa335836 --- /dev/null +++ b/src/views/ManufacturingCenter/SparePartsPurchase/index.vue @@ -0,0 +1,130 @@ + + + + + From 6c858eb1e2a733f5f1de11d9a25f3bdb3598c855 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Wed, 29 May 2019 19:15:27 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E8=AF=B7=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/FundApproval2/index.vue | 83 ++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/src/views/PurchasingCenter/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue index 674bdd5e..e7454513 100644 --- a/src/views/PurchasingCenter/FundApproval2/index.vue +++ b/src/views/PurchasingCenter/FundApproval2/index.vue @@ -118,8 +118,47 @@

采购合同

-
+

离线合同

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +

离线合同

GAOJING合同名称 + 供应商 + +
合同编号 + 采购员 +
序号名称规格型号数量单价合计交货期备注
总计 + + +
+
+
+ + diff --git a/src/views/Assembly/DeliveryApplication/index.vue b/src/views/Assembly/DeliveryApplication/index.vue new file mode 100644 index 00000000..957016d1 --- /dev/null +++ b/src/views/Assembly/DeliveryApplication/index.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue new file mode 100644 index 00000000..f1616531 --- /dev/null +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue index cab4d0d6..d0cb1f1c 100644 --- a/src/views/ManufacturingCenter/GroupMatching/index.vue +++ b/src/views/ManufacturingCenter/GroupMatching/index.vue @@ -285,6 +285,13 @@ {{ scope.row.机床主管 }} + + +
- + From ab3c50f7f7c10c59538431bec611aa00a88549c5 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Thu, 30 May 2019 09:47:21 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=94=B9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessQuotaEstablishment.js | 12 ++++++ .../ProcessQuotaEstablishment/index.vue | 38 +++++++++++++++++-- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js b/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js index 7a4fa413..63742b3b 100644 --- a/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js +++ b/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js @@ -1,5 +1,17 @@ import request from '@/utils/request' +// 查询零件（包含借用件） +export function getPartnames3(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_编制工艺_按人员机床组号或图号查', + param: '工艺人员编号=' + num1 + '&机床组号或图号=' + num2 + } + }) +} // 典艺查询<高精原有数据> export function searchProcess11(num) { return request({ diff --git a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue index 03fdcf68..c070b9fc 100644 --- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue +++ b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue @@ -9,16 +9,24 @@ :label="item.label" :value="item.value"/> - 零件号: + + 机床-分组 或 零件号: + + + :value="item.value"> + {{ item.label }} + -{{ item.group }} +   {{ item.machine }} + 是否核准 在制零件工艺调整 @@ -42,7 +50,7 @@
- + 物料类型: { + for (let i = 0; i < response.data.length; i++) { + this.partNum.push({ + label: response.data[i].零件图号, + value: response.data[i].工艺计划流水号, + machine: response.data[i].机床图号, + group: response.data[i].组号 + }) + } + }) + }, searchParts() { // 根据条件查零件号 this.tableData = [] this.partNum = [] @@ -1457,6 +1486,7 @@ export default { this.spec = '' this.newNum = '' this.searchParts() + this.searchPartsByMachineGroup() this.$message.success('保存成功') }) } From 1966a1bf3f85379c5ed824e350e1e2ffaa9b65f1 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Thu, 30 May 2019 10:03:20 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/layout/components/AppMain.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue index 3d192ba5..03f99822 100644 --- a/src/views/layout/components/AppMain.vue +++ b/src/views/layout/components/AppMain.vue @@ -3,9 +3,9 @@ - - - + + + From feb2529e7e0d149975e11b682d369923058b878d Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 30 May 2019 15:42:19 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E5=A4=87=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/CreateIntakeList.js | 187 +++ .../MaterialArrivalManagement.js | 12 + src/api/ManufacturingCenter/SparePartsOut.js | 88 ++ .../CreatingPurchasingMaterials.js | 27 + .../CreateIntakeList/index.vue | 1139 +++++++++++++++++ .../MaterialArrivalManagement/index.vue | 83 +- .../SparePartsOut/index.vue | 294 +++++ .../CreatingPurchasingMaterials/index.vue | 180 +-- 8 files changed, 1876 insertions(+), 134 deletions(-) create mode 100644 src/api/ManufacturingCenter/CreateIntakeList.js create mode 100644 src/api/ManufacturingCenter/SparePartsOut.js create mode 100644 src/views/ManufacturingCenter/CreateIntakeList/index.vue create mode 100644 src/views/ManufacturingCenter/SparePartsOut/index.vue diff --git a/src/api/ManufacturingCenter/CreateIntakeList.js b/src/api/ManufacturingCenter/CreateIntakeList.js new file mode 100644 index 00000000..30f32faa --- /dev/null +++ b/src/api/ManufacturingCenter/CreateIntakeList.js @@ -0,0 +1,187 @@ +import request from '@/utils/request' + +// 初始化项目 +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据_按时间排序' + } + }) +} +// 机床查询 +export function searchmachine(check, num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_查询数据', + param: '项目流水号_check=' + check + '=int&项目流水号=' + num + } + }) +} +// 分组查询 +export function searchTeam(machineNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + machineNumber + } + }) +} +// 外购件、标准件查询 +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, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 基本件、通用件查询 +export function searchBasicPart(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, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 车间采购件查询 +export function searchHoursePart(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, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 领料单查询 +export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单_领料单查询', + param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber, + Pagination: pageCurrent + '&' + pageSize + } + }) +} + +// 领料单明细查询 +export function searchListDetail(listNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间装配管理_领料单_领料单明细查询', + param: '领料单流水号=' + listNumber + } + }) +} +// 创建领料单 +export function addList(peopleNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单_领料单增加', + param: '领料人流水号=' + peopleNumber + } + }) +} +// 删除领料单 +export function dropList(PickingListNumberx) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单_领料单删除', + param: '领料单流水号=' + PickingListNumberx + } + }) +} +// 删除领料单明细 +export function dropListDetail(DetailNumberx, isBacklog) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单_领料单明细删除', + param: '领料单明细流水号=' + DetailNumberx + '&是否是滞货=' + isBacklog + } + }) +} +// 删除领料单明细/基本件 +export function dropListDetailBasic(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单_领料单明细删除_基本件', + param: `领料单明细流水号=${params[0]}&收件信息ID=${params[1]}&返还数量=${params[2]}` + } + }) +} +// 增加领料单明细 +export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, outNumber, partType, Note, data1, data2, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间装配管理_领料单_领料单明细增加', + param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注\\=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&采购合同明细流水号=' + data4 + '&请购单明细流水号=' + data5 + '&货位流水号=' + data6 + '&出库类型=' + data7 + '&物料与货位对照流水号=' + data8 + '&名称=' + data9 + '&物料规格\\=' + data10 + '&物料型号=' + data11 + '&零件图号=' + data12 + '&材料=' + data13 + } + }) +} +// 查询滞货件 +export function searchBacklogPart(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, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 领料滞货件 +export function submitAddBacklogList(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_领料单明细_滞货件_增加数据', + param: `领料单流水号=${params[0]}&项目流水号=${params[1]}&机床流水号=${params[2]}&组件流水号=${params[3]}&出库数量=${params[4]}&备注\\=${params[5]}&货位流水号=${params[6]}&物料与货位对照流水号=${params[7]}&名称=${params[8]}&物料规格\\=${params[9]}&物料型号=${params[10]}` + } + }) +} diff --git a/src/api/ManufacturingCenter/MaterialArrivalManagement.js b/src/api/ManufacturingCenter/MaterialArrivalManagement.js index b7bb4a4f..5c7cf3b6 100644 --- a/src/api/ManufacturingCenter/MaterialArrivalManagement.js +++ b/src/api/ManufacturingCenter/MaterialArrivalManagement.js @@ -1,5 +1,17 @@ import request from '@/utils/request' +// 外购备料出库 +export function change3(Number, code, num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_自家备料到货更改', + param: '工序流水号组=' + Number + '&工作者考勤编号=' + code + '&工艺计划流水号组=' + num + } + }) +} // 查询零件 export function searchtable(num1, num2, num3, pageCurrent, pageSize) { return request({ diff --git a/src/api/ManufacturingCenter/SparePartsOut.js b/src/api/ManufacturingCenter/SparePartsOut.js new file mode 100644 index 00000000..b7bb4a4f --- /dev/null +++ b/src/api/ManufacturingCenter/SparePartsOut.js @@ -0,0 +1,88 @@ +import request from '@/utils/request' + +// 查询零件 +export function searchtable(num1, num2, num3, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_编制工艺_备料到货查询', + param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料到货_check=' + num3, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询零件工艺 +export function searchtable2(num1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_备料打印_查询工序信息', + param: '工艺计划流水号=' + num1 + } + }) +} +// 完成备料工序 +export function handlechange(Number, code) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_工作者', + param: '工序流水号=' + 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 + } + }) +} +// 外购备料出库 +export function change2(Number, code, num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_外购备料到货更改', + param: '工序流水号组=' + Number + '&工作者考勤编号=' + code + '&工艺计划流水号组=' + num + } + }) +} +export function handlechange2(Number, code) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_修改实际完成时间', + param: '工序流水号=' + Number + '&实际完成时间=' + code + } + }) +} + diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js index 198c845e..8504236a 100644 --- a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js +++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js @@ -1,5 +1,32 @@ import request from '@/utils/request' +// 查询原材料库存 +export function searchRawMaterial(num, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_原材料库存管理_查询', + param: '原材料名称=' + num, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 增加采购计划明细 +export function addMateriel2(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_采购计划明细_增加数据2', + param: `采购计划流水号=${num1}&原材料流水号组=${num2}` + } + }) +} +// ////////////////////////////////////////////////////////////////////////////////0529新加↑ + // 查询外购备料列表 export function initPartDrawing(check1, name) { return request({ diff --git a/src/views/ManufacturingCenter/CreateIntakeList/index.vue b/src/views/ManufacturingCenter/CreateIntakeList/index.vue new file mode 100644 index 00000000..b82b79d0 --- /dev/null +++ b/src/views/ManufacturingCenter/CreateIntakeList/index.vue @@ -0,0 +1,1139 @@ + + + + + diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue index e82f8c4a..9a07d8e0 100644 --- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue @@ -5,14 +5,13 @@ 零件图号: 查询 - - - + 自家备料确认 - + + - - - - - - - - -
零件图号: 查询 - 外购备料出库 + 外购备料确认 - + + + diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue index 2715c39b..59f2d570 100644 --- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue +++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue @@ -1,75 +1,69 @@ - - - -