From 835593aefe1d17a6f37d3d82aa31a895bcd7f98f Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 30 Nov 2018 14:25:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/icons/svg/OutsourcingTaskQuery.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/icons/svg/OutsourcingTaskQuery.svg diff --git a/src/icons/svg/OutsourcingTaskQuery.svg b/src/icons/svg/OutsourcingTaskQuery.svg new file mode 100644 index 00000000..fc3107f5 --- /dev/null +++ b/src/icons/svg/OutsourcingTaskQuery.svg @@ -0,0 +1 @@ + \ No newline at end of file From deb01386547f40d1230c1ad57ff08f7fb9f6e61c Mon Sep 17 00:00:00 2001 From: chenjianan Date: Tue, 4 Dec 2018 09:30:45 +0800 Subject: [PATCH 2/3] request --- src/utils/request.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index a9554197..66f14a6d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -14,8 +14,8 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + // baseURL: `http://192.168.137.85:8411/submit/MESCommonBase.ashx`, // 李鑫 // baseURL: `http://192.168.1.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) From 9533aa69bdd360768f5f28684694256094483603 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 4 Dec 2018 09:36:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E5=BA=8F=E9=97=B4=E5=A4=96=E5=8D=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- src/views/MarketingCenter/DeliveryManagement/index.vue | 1 + src/views/Outsourcing/InterBudgetaryBudgets/index.vue | 1 + src/views/Outsourcing/PreorderAssociation/index.vue | 10 +++++++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index a9554197..432ec366 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -15,7 +15,7 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue index fad2122d..446578e3 100644 --- a/src/views/MarketingCenter/DeliveryManagement/index.vue +++ b/src/views/MarketingCenter/DeliveryManagement/index.vue @@ -1046,6 +1046,7 @@ export default { this.form3.数量 = '' if (response.data[0].result === '1') { this.searchCargoBoxDetailed() + this.searchPackingListDetails() searchParts(this.code).then(response => { this.tableData4 = response.data }) diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue index 5595bd25..999b803b 100644 --- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue +++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue @@ -281,6 +281,7 @@ export default { this.tableData = [] if (this.radio === 1) { searchPartNum1(this.check_entryNameValue, this.entryNameValue, this.check_toolNumValue, this.toolNumValue, this.check_NumValue, this.NumValue, this.check_partName, this.partName, 0, this.pageCurrent2, this.pageSize2).then(response => { + console.log(response.data) this.tableData2 = response.data.rows this.total2 = response.data.total }).then(() => { diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue index f0e7284f..6da8b560 100644 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ b/src/views/Outsourcing/PreorderAssociation/index.vue @@ -85,9 +85,16 @@ type="index" align="center" width="50"/> + + + @@ -235,6 +242,7 @@ export default { this.checkBox = [] this.tableData2 = [] searchTable2(row.工艺计划流水号).then(response => { + console.log(response.data) this.num1 = row.工艺计划流水号 if (response.data.length === 0) { this.loading0 = false