From dcae2acc22b20550e6d7bef0584758c0f0c6d3db Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 28 Feb 2019 20:59:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=88=B6=E5=AE=9A?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ManufacturingCenter/ProcessPlanning/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue index d986a464..136a33b1 100644 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue @@ -402,6 +402,7 @@ v-model="tuhaoValue" placeholder="零件图号" size="small" + filterable style="width:150px" @change="numChange1()"> Date: Fri, 1 Mar 2019 12:02:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=BB=98=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OutsourcingPaymentPlanManagement.js | 2 +- .../OutsourcingPaymentPlanManagement/index.vue | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js index b3cbc855..afa0a20c 100644 --- a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js +++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js @@ -68,7 +68,7 @@ export function getParts(Number, pageCurrent, pageSize) { data: { type: '1', name: '车间生产管理工艺_外协发票管理_查询数据', - param: '外协加工任务单流水号=' + Number + '=int', + param: '外协厂家流水号=' + Number + '=int', Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue index 40a0e54a..18707c81 100644 --- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue +++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue @@ -575,12 +575,16 @@ export default { this.zhongjianbianliang = row.外协加工任务单流水号 this.fukuanshijian = row.实际付款时间 getParts(row.外协加工任务单流水号, this.pageCurrent2, this.pageSize2).then(response => { - for (let i = 0; i < response.data.rows.length; i++) { - response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' ')) - response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' ')) + if (response.data.rows.length === 0) { + this.loading2 = false + } else { + for (let i = 0; i < response.data.rows.length; i++) { + response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' ')) + response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' ')) + } + this.tableData2 = response.data.rows + this.total2 = response.data.total } - this.tableData2 = response.data.rows - this.total2 = response.data.total }).then(() => { this.loading2 = false }) From ab04bdc1cf72a2d51603da426c9697fc6ef0e298 Mon Sep 17 00:00:00 2001 From: chenjianan Date: Sat, 2 Mar 2019 08:31:24 +0800 Subject: [PATCH 3/3] request --- debug.log | 1 + src/utils/request.js | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 debug.log diff --git a/debug.log b/debug.log new file mode 100644 index 00000000..ed97f861 --- /dev/null +++ b/debug.log @@ -0,0 +1 @@ +[0301/083149.303:ERROR:http_transport_win.cc(273)] WinHttpSendRequest: ɹɡ (0x0) diff --git a/src/utils/request.js b/src/utils/request.js index 38aeec07..908de161 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,13 +7,13 @@ export const wsuri = `ws://192.168.1.231:61101//WebMoudule//websocket` export const name = `OP8888` // 创建axios实例 -export const readFile = `192.168.1.231:8411/webpage/file/` // invoice -export const readImg = `192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond -export const upload = `192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement -export const upload2 = `192.168.1.231:8411/submit/upload2.ashx` // delivery -export const upload3 = `192.168.1.231:8411/submit/upload3.ashx` // performancebond -export const uploadInvoiceScan = `192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice -export const download = `192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement +export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice +export const readImg = `http://192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond +export const upload = `http://192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement +export const upload2 = `http://192.168.1.231:8411/submit/upload2.ashx` // delivery +export const upload3 = `http://192.168.1.231:8411/submit/upload3.ashx` // performancebond +export const uploadInvoiceScan = `http://192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice +export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,