From 6f173e5723d3504d8ccb6cd843100364b4cfdd02 Mon Sep 17 00:00:00 2001 From: liushuai Date: Tue, 25 Dec 2018 20:05:49 +0800 Subject: [PATCH 1/3] =?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/ReceiptConnectionSheet.js | 4 ++-- src/views/WorkshopProcurement/ArrivalStateSearch/index.vue | 2 +- src/views/WorkshopProcurement/InvoiceStateSearch/index.vue | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/api/WorkshopProcurement/ReceiptConnectionSheet.js b/src/api/WorkshopProcurement/ReceiptConnectionSheet.js index 48ec53bc..dfb3b616 100644 --- a/src/api/WorkshopProcurement/ReceiptConnectionSheet.js +++ b/src/api/WorkshopProcurement/ReceiptConnectionSheet.js @@ -49,7 +49,7 @@ export function deleteInvoice(num1, num2) { } }) } -// 传送人接收人初始化 采购科改16 +// 传送人接收人初始化 export function initPerson() { return request({ url: '', @@ -57,7 +57,7 @@ export function initPerson() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=16' + param: '考核部门编号=9' } }) } diff --git a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue index 7ad264e5..868be3ec 100644 --- a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue +++ b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue @@ -73,7 +73,7 @@ diff --git a/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue b/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue index f675b5e7..5fda01d6 100644 --- a/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue +++ b/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue @@ -56,7 +56,7 @@ @@ -178,6 +178,7 @@ export default { }) }, searchTable1() { + this.tableData2 = [] this.contractNum ? this.check1 = 1 : this.check1 = 0 this.supplierName ? this.check2 = 1 : this.check2 = 0 searchContractInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.contractNum, this.check2, this.supplierName).then(response => { From 86afdead2ffc6ac4a1127ebe60e548f463561c48 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 26 Dec 2018 14:11:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ManufacturingCenter/ProcessingStatus/index.vue | 2 +- src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue index 6b52fb71..9574c768 100644 --- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue @@ -554,7 +554,7 @@ export default { background-color: transparent; border: 0px solid white; } - .green{ + .lightgreen{ background-color: lightgreen; border: 1px solid #1f2d3d; } diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue index 8debe709..1587bcb9 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue @@ -565,6 +565,7 @@ export default { if (this.零件图号.length !== 0) { for (let i = 0; i < this.零件图号.length; i++) { getTable2(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.零件图号[i]).then(response => { + console.log(response.data) this.liushuihao = response.data[0].工艺计划流水号 for (let k = 0; k < response.data.length; k++) { if (response.data[k].工艺计划流水号 === this.liushuihao) { @@ -724,7 +725,7 @@ export default { background-color: transparent; border: 0px solid white; } - .green{ + .lightgreen{ background-color: lightgreen; border: 1px solid #1f2d3d; } From 7e182b8cf45deae88c103d1e2d215026f3d01472 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 26 Dec 2018 14:13:41 +0800 Subject: [PATCH 3/3] =?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 --- src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue index 1587bcb9..a8a83d71 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue @@ -565,7 +565,6 @@ export default { if (this.零件图号.length !== 0) { for (let i = 0; i < this.零件图号.length; i++) { getTable2(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.零件图号[i]).then(response => { - console.log(response.data) this.liushuihao = response.data[0].工艺计划流水号 for (let k = 0; k < response.data.length; k++) { if (response.data[k].工艺计划流水号 === this.liushuihao) {