From a398554f264e986ea9ebc58f8af159d832225743 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 26 Oct 2019 18:23:40 +0800
Subject: [PATCH] =?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/icons/svg/ShopScheduling.svg | 1 +
src/styles/element-ui.scss | 11 ++-
.../ShopScheduling/index.vue | 99 ++++++++++---------
3 files changed, 61 insertions(+), 50 deletions(-)
create mode 100644 src/icons/svg/ShopScheduling.svg
diff --git a/src/icons/svg/ShopScheduling.svg b/src/icons/svg/ShopScheduling.svg
new file mode 100644
index 00000000..399e3967
--- /dev/null
+++ b/src/icons/svg/ShopScheduling.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index cc10a203..b6a6d57b 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -48,11 +48,12 @@
.hover-row td{
background: RGB(236 245 255)!important;
}
- .el-table td, .is-leaf{
- background-color: rgb(255, 255, 255);
- color: black;
- font-weight:400
- }
+ //表格行颜色9745
+ //.el-table td, .is-leaf{
+ // background-color: rgb(255, 255, 255);
+ // color: black;
+ // font-weight:400
+ //}
.el-table--striped .el-table__body tr.el-table__row--striped td{
background-color: #d8dde6;/*修改斑马线表格背景*/
}
diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue
index 72443dc2..3468285d 100644
--- a/src/views/ManufacturingCenter/ShopScheduling/index.vue
+++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue
@@ -4,7 +4,7 @@
-
+
移除-->
-
+
-
+
{{ scope.row.图号及规格 }}
@@ -30,7 +30,7 @@
{{ scope.row.零件名称 }}
-
+
{{ scope.row.投产数量 }}
@@ -62,12 +62,7 @@
-
-
- {{ scope.row.姓名 }}
-
-
-
+
{{ scope.row.零件图号 }}
@@ -77,19 +72,24 @@
{{ scope.row.零件名称 }}
-
+
{{ scope.row.工艺名称 }}
-
+
{{ scope.row.投产数量 }}
+
+
+ {{ scope.row.姓名 }}
+
+
-
-
+
+
{{ scope.row.工序顺序 }}
@@ -99,17 +99,17 @@
{{ scope.row.工艺名称 }}
-
+
{{ scope.row.姓名 }}
-
+
{{ scope.row.排产时间 }}
-
+
{{ scope.row.完成日期 }}
@@ -169,7 +169,8 @@ export default {
零件名称: v.零件名称,
投产数量: v.投产数量,
计划开始时间: v.计划开始时间 ? v.计划开始时间.split(' ')[0] : '',
- 计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : ''
+ 计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : '',
+ 状态: v.状态
})
})
this.total = response.data.total
@@ -196,11 +197,14 @@ export default {
this.loading3 = false
})
},
- // ??
- tableRowClassName({ row, rowIndex }) {
+ tableData1ClassName({ row, rowIndex }) {
+ if (row.状态 === '1') {
+ return 'CJPClingjianjinxing'
+ }
+ },
+ tableData3ClassName({ row, rowIndex }) {
if (row.工序状态 === 4) {
- console.log(row.工序状态)
- return 'successsss'
+ return 'CJPCgongxuwancheng'
}
},
searchTableData2() {
@@ -212,29 +216,31 @@ export default {
})
},
XuanRu(row) {
- XuanRu(this.PersonValue, row.工序流水号).then(response => {
- if (response.data[0].result === '1') {
- this.getParts()
- this.loading3 = true
- this.tableData3 = []
- getGongxu(this.工艺计划流水号).then(response => {
- response.data.map(v => {
- this.tableData3.push({
- 工序流水号: v.工序流水号,
- 工序状态: v.工序状态,
- 工序顺序: v.工序顺序,
- 工艺名称: v.工艺名称,
- 排产人员: v.排产人员,
- 姓名: v.姓名,
- 排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
- 完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : ''
+ if (row.工序状态 !== 4) {
+ XuanRu(this.PersonValue, row.工序流水号).then(response => {
+ if (response.data[0].result === '1') {
+ this.getParts()
+ this.loading3 = true
+ this.tableData3 = []
+ getGongxu(this.工艺计划流水号).then(response => {
+ response.data.map(v => {
+ this.tableData3.push({
+ 工序流水号: v.工序流水号,
+ 工序状态: v.工序状态,
+ 工序顺序: v.工序顺序,
+ 工艺名称: v.工艺名称,
+ 排产人员: v.排产人员,
+ 姓名: v.姓名,
+ 排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '',
+ 完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : ''
+ })
})
+ this.loading3 = false
})
- this.loading3 = false
- })
- this.searchTableData2()
- }
- })
+ this.searchTableData2()
+ }
+ })
+ }
},
XuanChu(row) {
XuanChu(row.工序流水号).then(response => {
@@ -274,7 +280,10 @@ export default {