From 5dfd96e774316fa258917d14657bf9970e30601e Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 22 Jan 2019 10:23:19 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=AE=9A=E9=A2=9D?=
=?UTF-8?q?=E5=88=B6=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/request.js | 2 +-
src/views/ManufacturingCenter/QuotaFormulation/index.vue | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index f11fbd58..e3cc882a 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -20,7 +20,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://localhost:8411/submit/MESCommonBase.ashx`,
+ baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
diff --git a/src/views/ManufacturingCenter/QuotaFormulation/index.vue b/src/views/ManufacturingCenter/QuotaFormulation/index.vue
index ed354aa0..22dac643 100644
--- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue
+++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue
@@ -273,7 +273,6 @@ export default {
}
}).then(() => {
mainTable(this.num0).then(response => {
- console.log(response.data)
if (response.data.length === 0) {
this.listLoading = false
} else {
From 20bb241f7834dc2ed692e5a2f9608ecd67008a98 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 22 Jan 2019 10:45:09 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=83=BD=E5=8A=9B?=
=?UTF-8?q?=E5=B9=B3=E8=A1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ManufacturingCenter/ProductionCapacityBalance/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index 38eba64d..2369f17c 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -52,7 +52,7 @@
value-format="yyyy-MM-dd"
style="top: 1px;"
placeholder="选择开始日期"/>
- 制定零件计划
+ 零件计划变更
导出Excel
Date: Wed, 23 Jan 2019 14:47:37 +0800
Subject: [PATCH 3/4] =?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
---
.../ManufacturingCenter/MaterialArrivalManagement.js | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/src/api/ManufacturingCenter/MaterialArrivalManagement.js b/src/api/ManufacturingCenter/MaterialArrivalManagement.js
index 622f59fc..3379898b 100644
--- a/src/api/ManufacturingCenter/MaterialArrivalManagement.js
+++ b/src/api/ManufacturingCenter/MaterialArrivalManagement.js
@@ -25,18 +25,6 @@ export function searchtable2(num1) {
}
})
}
-// 更改打印状态
-export function edit(num1) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '2',
- name: '车间生产管理工艺_备料到货_状态更改',
- param: '工艺计划流水号=' + num1
- }
- })
-}
export function handlechange(Number, code) {
return request({
From ab57170f03e7927a405ff41ec3423882d271588f Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 23 Jan 2019 17:13:06 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E9=A2=84=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Outsourcing/InterBudgetaryBudgets/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
index 099172ed..1f04e907 100644
--- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
+++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue
@@ -40,7 +40,7 @@
-
+