From 63a4e70419b434f837127a63be62697a2f232d15 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Wed, 21 Nov 2018 08:41:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=B8=81=E7=A7=8D?= =?UTF-8?q?=E5=BF=85=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- src/views/PurchasingCenter/CreateContract/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 1aed1d9b..cb2fbbc0 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -10,7 +10,7 @@ export const name = `OP8888` export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx` export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx` const service = axios.create({ - baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.111:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/PurchasingCenter/CreateContract/index.vue b/src/views/PurchasingCenter/CreateContract/index.vue index 5c85a1a3..af596aef 100644 --- a/src/views/PurchasingCenter/CreateContract/index.vue +++ b/src/views/PurchasingCenter/CreateContract/index.vue @@ -118,7 +118,7 @@ - + Date: Wed, 21 Nov 2018 08:42:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=9A=E9=87=87=E8=B4=AD=E5=91=98=E5=8F=AF?= =?UTF-8?q?=E6=B8=85?= 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 2a033176..c5e902bc 100644 --- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue @@ -23,7 +23,7 @@ 采购员: - + Date: Wed, 21 Nov 2018 08:46:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=EF=BC=9A=E5=AE=A1=E6=89=B9=E5=AF=B9=E8=AF=9D?= =?UTF-8?q?=E6=A1=86=E9=BB=98=E8=AE=A4=E9=80=89=E6=98=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/PurchasingCenter/PurchaseContractApproval/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue index 6f3a868c..e15dbcf4 100644 --- a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue @@ -215,7 +215,7 @@ export default { ], disabled: true, form2: { - 审批是否通过: '', + 审批是否通过: 1, 未通过原因: '' }, rules2: {}, From 0da80da1890eefc541dd1b900bafc2dd9054bdd6 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Thu, 22 Nov 2018 14:14:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E8=BD=AE=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=87=87=E8=B4=ADbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/PurchaseTaskAllocate.js | 11 ++ .../BuyerRequestFund/index.vue | 79 +++++++----- .../PurchasingCenter/CreateContract/index.vue | 36 +++--- .../InvoiceStateSearch/index.vue | 2 +- .../PurchaseTaskAllocate/index.vue | 122 ++++++++++++------ .../ReceiptConnectionSheet/index.vue | 2 +- 6 files changed, 157 insertions(+), 95 deletions(-) diff --git a/src/api/PurchasingCenter/PurchaseTaskAllocate.js b/src/api/PurchasingCenter/PurchaseTaskAllocate.js index f9a5dd9c..a3ff15f7 100644 --- a/src/api/PurchasingCenter/PurchaseTaskAllocate.js +++ b/src/api/PurchasingCenter/PurchaseTaskAllocate.js @@ -47,4 +47,15 @@ export function allocateTask(group, person) { param: `标准件和外购件流水号组=${group}&人员编号=${person}` } }) +}// 执行退回 +export function executeReturn(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购部采购_退回物料', + param: `标准件和外购件流水号组=${params[0]}&组件零件流水号组=${params[1]}` + } + }) } diff --git a/src/views/PurchasingCenter/BuyerRequestFund/index.vue b/src/views/PurchasingCenter/BuyerRequestFund/index.vue index 300f5fe0..34ac1431 100644 --- a/src/views/PurchasingCenter/BuyerRequestFund/index.vue +++ b/src/views/PurchasingCenter/BuyerRequestFund/index.vue @@ -43,7 +43,16 @@ - + + + + - + - + @@ -74,7 +83,7 @@ {{ scope.row.付款方式内容 }} - + @@ -91,7 +100,16 @@ - - -
- 请款开始时间: + 请款时间区间: - 请款结束时间: + placeholder="开始日期"/> + ～ + placeholder="结束日期"/> { - for (let i = 0; i < response0.data.length; i++) { - this.tableData11[j].push(response0.data[i]) + if (response0.data.length === 0) { + this.tableData11[j].push(response0.data) + document.getElementById(j).setAttribute('style', 'display:none') + } else { + for (let i = 0; i < response0.data.length; i++) { + this.tableData11[j].push(response0.data[i]) + } } }) } this.tableData1 = response.data.rows this.total1 = response.data.total - }).then(() => { - this.loading1 = false }) }, handleSizeChange1(val) { @@ -356,6 +358,7 @@ export default { }) }, cancelRequestFund(row) { // 取消请款 + console.log(row) this.$confirm('确认取消请款吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -383,9 +386,15 @@ export default { }, searchRequestTable() { // 查询请款表 this.loading2 = true - if (this.startRequestDate === '' || this.startRequestDate === null || this.endRequestDate === '' || this.endRequestDate === null) { + if ((this.startRequestDate === '' || this.startRequestDate === null) && (this.endRequestDate === '' || this.endRequestDate === null)) { this.checkRequest = 0 - } else { this.checkRequest = 1 } + } else if (this.startRequestDate !== '' && this.startRequestDate !== null && this.endRequestDate !== '' && this.endRequestDate !== null) { + this.checkRequest = 1 + } else { + this.$message.error('请款时间区间有误') + this.loading2 = false + return + } searchRequestTable(this.checkRequest, this.startRequestDate, this.endRequestDate).then(response => { for (let j = 0; j < response.data.length; j++) { if (response.data[j].请款时间 !== null) { diff --git a/src/views/PurchasingCenter/CreateContract/index.vue b/src/views/PurchasingCenter/CreateContract/index.vue index af596aef..788a34fd 100644 --- a/src/views/PurchasingCenter/CreateContract/index.vue +++ b/src/views/PurchasingCenter/CreateContract/index.vue @@ -51,7 +51,7 @@ - + - + - + - + - + { for (let i = 0; i < response.data.length; i++) { - this.payTime.push({ - label: response.data[i].付款时间节点名称, - value: response.data[i].付款时间节点流水号 - }) + if (parseInt(response.data[i].付款时间节点流水号) !== 0) { + this.payTime.push({ + label: response.data[i].付款时间节点名称, + value: response.data[i].付款时间节点流水号 + }) + } } }) }, diff --git a/src/views/PurchasingCenter/InvoiceStateSearch/index.vue b/src/views/PurchasingCenter/InvoiceStateSearch/index.vue index 4ffe69eb..c997aafd 100644 --- a/src/views/PurchasingCenter/InvoiceStateSearch/index.vue +++ b/src/views/PurchasingCenter/InvoiceStateSearch/index.vue @@ -51,7 +51,7 @@ diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue index 479c80d4..c01c138d 100644 --- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue +++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue @@ -1,45 +1,59 @@