From b4608082a90e0b193850679ece23e64a6ffafa1e Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 20 Mar 2020 10:50:28 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=8E=92=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Inventory/Inboundscanning/index.vue | 20 ++++---------------
.../ShopScheduling/index.vue | 8 ++++----
2 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue
index 6be72ee7..2ae8fa20 100644
--- a/src/views/Inventory/Inboundscanning/index.vue
+++ b/src/views/Inventory/Inboundscanning/index.vue
@@ -15,20 +15,8 @@
-
-
+
+
{{ scope.row.项目名称 }}
@@ -56,7 +44,7 @@
-
+
{
- if (this.locateNumber === '') {
+ if (!this.locateNumber) {
this.$message.error('请选择货位')
} else {
for (let i = 0; i < this.tableDataNum.length; i++) {
diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue
index 881b4e8f..84c9b1b9 100644
--- a/src/views/ManufacturingCenter/ShopScheduling/index.vue
+++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue
@@ -4,7 +4,7 @@
-
+
From da438ea36a7c36ddedd0a43ae44bab8dfcba91f8 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 20 Mar 2020 11:51:04 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=8E=92=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ManufacturingCenter/ShopScheduling/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue
index 84c9b1b9..0d1e49bd 100644
--- a/src/views/ManufacturingCenter/ShopScheduling/index.vue
+++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue
@@ -87,7 +87,7 @@
-
+
{{ scope.row.工序顺序 }}
From 6e87ab71397e2b36eaf9196120f6d9d6dfadef6a Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 20 Mar 2020 13:49:41 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=8E=92=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ShopScheduling/index.vue | 40 ++++++++++---------
1 file changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue
index 0d1e49bd..27a52032 100644
--- a/src/views/ManufacturingCenter/ShopScheduling/index.vue
+++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue
@@ -60,7 +60,7 @@
-
+
{{ scope.row.零件图号 }}
@@ -87,7 +87,7 @@
-
+
{{ scope.row.工序顺序 }}
@@ -181,25 +181,27 @@ export default {
})
},
getGongxu(row) {
- this.loading3 = true
- this.tableData3 = []
- this.index = row.index
- this.工艺计划流水号 = row.工艺计划流水号
- getGongxu(row.工艺计划流水号).then(response => {
- response.data.map(v => {
- this.tableData3.push({
- 工序流水号: v.工序流水号,
- 工序状态: v.工序状态,
- 工序顺序: v.工序顺序,
- 工艺名称: v.工艺名称,
- 姓名: parseInt(v.工序间是否外协) === 2 ? '外协' : v.姓名,
- 排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
- 完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '',
- 工序间是否外协: v.工序间是否外协
+ if (!this.loading3) {
+ this.loading3 = true
+ this.tableData3 = []
+ this.index = row.index
+ this.工艺计划流水号 = row.工艺计划流水号
+ getGongxu(row.工艺计划流水号).then(response => {
+ response.data.map(v => {
+ this.tableData3.push({
+ 工序流水号: v.工序流水号,
+ 工序状态: v.工序状态,
+ 工序顺序: v.工序顺序,
+ 工艺名称: v.工艺名称,
+ 姓名: parseInt(v.工序间是否外协) === 2 ? '外协' : v.姓名,
+ 排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
+ 完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '',
+ 工序间是否外协: v.工序间是否外协
+ })
})
+ this.loading3 = false
})
- this.loading3 = false
- })
+ }
},
tableData1ClassName({ row, rowIndex }) {
row.index = rowIndex
From 69381f031147696264ad093f4e8e9b281897f406 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 20 Mar 2020 14:08:08 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E8=87=AA=E5=88=B6=E4=BB=B6=E5=85=A5?=
=?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Inventory/Inboundscanning/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue
index 2ae8fa20..35c7b04a 100644
--- a/src/views/Inventory/Inboundscanning/index.vue
+++ b/src/views/Inventory/Inboundscanning/index.vue
@@ -44,7 +44,7 @@
-
+
Date: Fri, 20 Mar 2020 14:40:02 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E5=8A=A0=E5=B7=A5?=
=?UTF-8?q?=E8=BF=87=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index eae41a51..167a22a4 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -59,7 +59,7 @@
{{ scope.row.操作者 }}
-
+
{{ scope.row.加工开始时间 }}
From 4d29873a9521e524829a41b553e69bef162bb625 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 20 Mar 2020 14:59:00 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ManufacturingCenter/ContractApprovalQuery/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
index ae856b55..1705567f 100644
--- a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
+++ b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
@@ -97,7 +97,7 @@
-
+
From f8d00ec5c42fb9b4d46b5caf6ba5e6a1fc95506a Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 20 Mar 2020 15:09:13 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/icons/svg/ContractApprovalQuery.svg | 1 +
src/icons/svg/RequestApprovalQuery.svg | 1 +
src/views/ManufacturingCenter/RequestApprovalQuery/index.vue | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
create mode 100644 src/icons/svg/ContractApprovalQuery.svg
create mode 100644 src/icons/svg/RequestApprovalQuery.svg
diff --git a/src/icons/svg/ContractApprovalQuery.svg b/src/icons/svg/ContractApprovalQuery.svg
new file mode 100644
index 00000000..2c63ae80
--- /dev/null
+++ b/src/icons/svg/ContractApprovalQuery.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/RequestApprovalQuery.svg b/src/icons/svg/RequestApprovalQuery.svg
new file mode 100644
index 00000000..c498df81
--- /dev/null
+++ b/src/icons/svg/RequestApprovalQuery.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
index 1a4e0788..0061305a 100644
--- a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
+++ b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
@@ -83,7 +83,7 @@
-
+
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
From 7dd96d4d4aee5ce8f20b2e21728aabe2f39b99f5 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 20 Mar 2020 15:15:55 +0800
Subject: [PATCH 08/10] a
---
src/views/ManufacturingCenter/ContractApprovalQuery/index.vue | 2 +-
src/views/ManufacturingCenter/RequestApprovalQuery/index.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
index 1705567f..9a70162c 100644
--- a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
+++ b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
@@ -28,7 +28,7 @@
导出
-
+
{{ scope.row.采购合同编号 }}
diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
index 0061305a..c0967360 100644
--- a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
+++ b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
@@ -28,7 +28,7 @@
导出
-
+
{{ scope.row.供应商名称 }}
From ec37f876960ff42df8c00c05ff8df53d4937832d Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 20 Mar 2020 16:00:10 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=A4=87=E6=96=99=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ManufacturingCenter/MaterialArrival/index.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/ManufacturingCenter/MaterialArrival/index.vue b/src/views/ManufacturingCenter/MaterialArrival/index.vue
index 9d8bd9b5..ac5e39ab 100644
--- a/src/views/ManufacturingCenter/MaterialArrival/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrival/index.vue
@@ -2,7 +2,7 @@
-
+
完成
-
+
-
+
Date: Fri, 20 Mar 2020 16:41:52 +0800
Subject: [PATCH 10/10] a
---
src/views/layout/components/Navbar.vue | 1 +
src/views/layout/components/TagsView.vue | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index 0e28b773..57e2369f 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -291,6 +291,7 @@ export default {