From d8357d96472585b4383dd998f2bd3c35bbef4ce2 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Tue, 28 May 2019 15:24:29 +0800 Subject: [PATCH 01/10] =?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/10] =?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/10] =?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/10] =?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/10] =?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/10] =?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/10] =?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/10] =?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合同名称 + 供应商 + +
合同编号 + 采购员 +
序号名称规格型号数量单价合计交货期备注
总计 + + +
+
+