From e1ed93556e2bfd646ebe96816aa111b9713e9136 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Fri, 28 Dec 2018 21:22:48 +0800 Subject: [PATCH 1/8] =?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 2/8] =?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 3/8] =?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 4/8] =?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 5/8] 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 6/8] =?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 7/8] 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 8/8] 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 @@
+