From 3b9e6b8cbf2b8ae6315bf3beea7ba3f705b29341 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 28 Dec 2018 17:22:53 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/icons/svg/CreatePreparationBill.svg | 1 + src/icons/svg/MachiningSequenceAdjustment.svg | 1 + src/icons/svg/MaterialArrivalManagement.svg | 1 + 3 files changed, 3 insertions(+) create mode 100644 src/icons/svg/CreatePreparationBill.svg create mode 100644 src/icons/svg/MachiningSequenceAdjustment.svg create mode 100644 src/icons/svg/MaterialArrivalManagement.svg diff --git a/src/icons/svg/CreatePreparationBill.svg b/src/icons/svg/CreatePreparationBill.svg new file mode 100644 index 00000000..82524232 --- /dev/null +++ b/src/icons/svg/CreatePreparationBill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MachiningSequenceAdjustment.svg b/src/icons/svg/MachiningSequenceAdjustment.svg new file mode 100644 index 00000000..399e3967 --- /dev/null +++ b/src/icons/svg/MachiningSequenceAdjustment.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/MaterialArrivalManagement.svg b/src/icons/svg/MaterialArrivalManagement.svg new file mode 100644 index 00000000..6366a880 --- /dev/null +++ b/src/icons/svg/MaterialArrivalManagement.svg @@ -0,0 +1 @@ + \ No newline at end of file From 344fe94622ce30e8ecd40ed1441267884b07dd50 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 28 Dec 2018 20:41:42 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E5=88=B6=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/ProcessPlanning.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js index 72d253a9..6f0f26fc 100644 --- a/src/api/ManufacturingCenter/ProcessPlanning.js +++ b/src/api/ManufacturingCenter/ProcessPlanning.js @@ -115,7 +115,7 @@ export function processNameClick() { method: 'post', data: { type: '1', - name: '车间生产管理工艺_基础表_工艺分类名称_查询数据' + name: '车间生产管理工艺_基础表_工艺分类名称_查询数据_零件工艺制定专用' } }) } From 61ce0ae9bf89404cc9f8dd30012138d96ddb7fba Mon Sep 17 00:00:00 2001 From: liushuai Date: Fri, 28 Dec 2018 20:45:08 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/WorkshopProcurement/AccountingPrice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/WorkshopProcurement/AccountingPrice.js b/src/api/WorkshopProcurement/AccountingPrice.js index 175fd598..2f1c25a8 100644 --- a/src/api/WorkshopProcurement/AccountingPrice.js +++ b/src/api/WorkshopProcurement/AccountingPrice.js @@ -18,7 +18,7 @@ export function searchParts(pageCurrent, pageSize, check1, num, check2, name) { method: 'post', data: { type: '1', - name: '车间管理_基本件外购质检_查询数据', + name: '车间管理_核算价格_查询数据', param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, Pagination: pageCurrent + '&' + pageSize } From e1ed93556e2bfd646ebe96816aa111b9713e9136 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Fri, 28 Dec 2018 21:22:48 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/PurchasingCenter/OfflineContract/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 3f0cf9ea..194ffaac 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -143,7 +143,7 @@ @@ -973,7 +973,7 @@ export default { const printNode = $(htmlNode) body.append(printNode) window.print() - body.children().show() + body.children().not('script').show() printNode.remove() }).catch(res => { console.log(res) From 544db2c61387009dbc8b6f54a7a2f0c5d196a8a1 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sat, 29 Dec 2018 08:48:32 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/PurchasingCenter/OfflineContract/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 194ffaac..59856b28 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -755,6 +755,7 @@ export default { if (response.data[0].result === '1') { this.$message.success('删除成功') this.searchTable2() + this.disable = truegit searchMateriel(this.offlineContractNum).then(response => { this.tableData3 = response.data }) From 9f8ed21221fa33771d90e32fef60df516c90fd32 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sat, 29 Dec 2018 08:49:18 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/PurchasingCenter/OfflineContract/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 59856b28..604b0e38 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -755,7 +755,7 @@ export default { if (response.data[0].result === '1') { this.$message.success('删除成功') this.searchTable2() - this.disable = truegit + this.disable = true searchMateriel(this.offlineContractNum).then(response => { this.tableData3 = response.data }) From 2d69c5e2887d3451a276ecc2f575add504fd2a14 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sat, 29 Dec 2018 09:12:38 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/PurchasingCenter/PurchaseContractSearch/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue index 65d15320..e4a58ea5 100644 --- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue @@ -254,7 +254,7 @@ export default { const printNode = $(htmlNode) body.append(printNode) window.print() - body.children().show() + body.children().not('script').show() printNode.remove() } else { this.$message.error('请选择合同') From 679a6d3c908a016d19d38929961538457582e32b Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Sat, 29 Dec 2018 09:34:42 +0800 Subject: [PATCH 08/17] bug --- src/views/MarketingCenter/DeliveryManagement/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue index cd3b38dc..44e1d23b 100644 --- a/src/views/MarketingCenter/DeliveryManagement/index.vue +++ b/src/views/MarketingCenter/DeliveryManagement/index.vue @@ -1276,6 +1276,7 @@ export default { this.invoiceNum = row.发货单编号 this.DeliveryVisiable = true selectDelivery(this.invoiceNum).then(response => { + console.log(response) this.table = response.data this.装箱单名称 = response.data[0].装箱单名称 this.发货单号 = response.data[0].发货单号 @@ -1315,7 +1316,7 @@ export default { const printNode = $(htmlNode) body.append(printNode) window.print() - body.children().show() + body.children().not('script').show() printNode.remove() }, callOffDownLoadDelivery() { From 654e9b7527a306329daf0412d5a709ef45161720 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sat, 29 Dec 2018 10:06:32 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E5=A4=87=E6=96=99=E5=88=B0=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MaterialArrivalManagement/index.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue index 0f256c41..b8f4377f 100644 --- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue @@ -59,6 +59,7 @@ import { searchtable, searchtable2, edit, handlechange } from '@/api/Manufacturi export default { data() { return { + num: 0, arrest: [], all: false, partName: '', @@ -114,9 +115,12 @@ export default { this.$message.warning('请选择零件') } else { for (let i = 0; i < this.arrest.length; i++) { - edit(this.arrest[i].工艺计划流水号) - handlechange(this.arrest[i].工序流水号, '0000') - if (i === this.arrest.length - 1) { + edit(this.arrest[i].工艺计划流水号).then(() => { + handlechange(this.arrest[i].工序流水号, '0000').then(response => { + this.num = this.num + response.data[0].result + }) + }) + if (this.num === this.arrest.length) { this.searchTable() } } From 29ab3b42804d6ad837c49b24c853ada0238de690 Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Sat, 29 Dec 2018 10:58:08 +0800 Subject: [PATCH 10/17] bug --- src/views/MarketingCenter/DeliveryManagement/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue index 68d47390..b6523571 100644 --- a/src/views/MarketingCenter/DeliveryManagement/index.vue +++ b/src/views/MarketingCenter/DeliveryManagement/index.vue @@ -255,7 +255,7 @@ - + Date: Sat, 29 Dec 2018 11:10:15 +0800 Subject: [PATCH 11/17] console --- index.html | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/index.html b/index.html index 7d978087..c727e55c 100644 --- a/index.html +++ b/index.html @@ -8,6 +8,31 @@
+ From d441411fa9f0d7b1aaada1d09b083cf6144ec0c7 Mon Sep 17 00:00:00 2001 From: liushuai Date: Sat, 29 Dec 2018 12:11:59 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkshopProcurement/AccountingPrice.js | 6 ++--- .../ProcurementContractApproval.js | 2 +- .../PurchaseContractChange.js | 2 +- .../PurchasingQualityInspection.js | 2 +- .../QualityInspectionQuery.js | 17 +++----------- .../CreatePackingList/index.vue | 1 - .../TechnologyCenter/ImportParts/index.vue | 1 + .../CreatingProcurementContracts/index.vue | 5 ++++ .../QualityInspectionQuery/index.vue | 23 ++----------------- 9 files changed, 17 insertions(+), 42 deletions(-) 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..0116c33e 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: '车间采购管理_采购合同_未审批查询' } }) } 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/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/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/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index 961ce743..6c5ecb89 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -543,6 +543,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 }) }, diff --git a/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue b/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue index 0b9a71e2..107e8184 100644 --- a/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue +++ b/src/views/WorkshopProcurement/QualityInspectionQuery/index.vue @@ -15,14 +15,6 @@ 供应商: - 零件名称: - - - 查询 @@ -102,7 +94,7 @@