From 2788beeb20d8056da56f31662b4257824b385788 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 04 一月 2024 09:56:21 +0800
Subject: [PATCH] 包装台账修改
---
src/views/product/workbench/index.vue | 57 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/src/views/product/workbench/index.vue b/src/views/product/workbench/index.vue
index fd3b46e..aa7d640 100644
--- a/src/views/product/workbench/index.vue
+++ b/src/views/product/workbench/index.vue
@@ -528,10 +528,11 @@
</el-form-item>
</el-form>
</div>
+ <!-- :style="{ backgroundColor: taskStatusColor() }" -->
<div class="task-div-content" >
<div v-if="!isShowNormalTracking" class="task-list-div" >
<operationTaskPane
- ref="operateTaskDiv" :style="{ backgroundColor: taskStatusColor() }"
+ ref="operateTaskDiv"
:workstationId="dutyForm.workstationId"
:productSn="operateTaskForm.SN"
:orderNumber="operateTaskForm.orderNumber"
@@ -544,7 +545,7 @@
</div>
<div v-if="isShowNormalTracking" class="task-list-div" >
<operationTaskTable
- ref="operateTaskTableDiv" :style="{ backgroundColor: taskStatusColor() }"
+ ref="operateTaskTableDiv"
:workstationId="dutyForm.workstationId"
:productSn="operateTaskForm.SN"
:orderNumber="operateTaskForm.orderNumber"
@@ -733,7 +734,6 @@
<staffDialog
:currshowlist.sync="showStaff"
:selCol="selCol"
- :selColValArr="selColValArr"
:multiSelect="true"
:dutyRecord="dutyForm"
@handleSelectionChange="selectStaff"
@@ -1438,7 +1438,6 @@
box-sizing: border-box;
overflow-y: auto;
margin-bottom: 10px;
-
}
.task-list-div {
@@ -1487,7 +1486,8 @@
.warning-info {
margin-left: 20px;
- font-size: 16px;
+ font-size: 13px;
+ font-weight: bold;
color: red;
letter-spacing: 3px;
}
@@ -1673,8 +1673,8 @@
}
},
methods: {
- changeCurrOperateTask() {},
- refreshWorkReportPageData() {},
+ // changeCurrOperateTask() {},
+ // refreshWorkReportPageData() {},
refreshOperateTasksByConditions() {
this.$nextTick(() => {
this.refreshOperateTasks()
@@ -1710,7 +1710,6 @@
customerOrderNo: this.operateTaskForm.orderNumber
}).then((res) => {
const result = res.data.data
- console.log(result)
result.forEach(function(item) {
const obj = {
key: item,
@@ -1718,7 +1717,6 @@
}
that.partNames.push(obj)
})
- console.log(that.partNames)
})
}, 500)
} else {
@@ -2216,7 +2214,6 @@
(e) => e.id === this.dutyForm.workstationId
).workCenter
}
- console.log(this.paramObj_StationSave)
this.visible_StationSave = true
},
Select_StationSave() {
@@ -2380,10 +2377,10 @@
} else if (this.status) {
this.$message.warning('璇ョ彮娆″凡缁忕‘璁わ紝涓嶅彲淇敼')
} else {
- this.selCol = 'staffNo'
- for (let i = 0; i < this.personBoardList.length; i++) {
- this.selColValArr.push(this.personBoardList[i].staffNo)
- }
+ // this.selCol = 'staffNo'
+ // for (let i = 0; i < this.personBoardList.length; i++) {
+ // this.selColValArr.push(this.personBoardList[i].staffNo)
+ // }
this.showStaff = true
}
},
@@ -2519,23 +2516,25 @@
},
computed: {
...mapGetters(['userInfo', 'tagWel', 'permissions']),
+// 鍗婁釜鏈堜箣鍓嶆槸榛勮壊 褰撳ぉ鍜屼笁澶╀箣鍐呭氨鏄孩鑹� 涓夊ぉ涔嬪悗灏辨槸钃濊壊
+// taskStatusColor() {
+// return function(date) {
+// const now = new Date();
+// const halfMonthAgo = new Date(now - 15 * 24 * 60 * 60 * 1000);
+// const threeDaysAgo = new Date(now - 3 * 24 * 60 * 60 * 1000);
+// const oneDayAgo = new Date(now - 24 * 60 * 60 * 1000);
+// const today = new Date(now);
- taskStatusColor() {
- return function() {
- const now = new Date();
- const threeDaysAgo = new Date(now - 3 * 24 * 60 * 60 * 1000);
- const oneDayAgo = new Date(now - 24 * 60 * 60 * 1000);
- const today = new Date(now);
+// if (halfMonthAgo <= date && date <= threeDaysAgo) {
+// return 'yellow';
+// } else if (today <= date && date <= threeDaysAgo) {
+// return 'red';
+// } else {
+// return 'blue';
+// }
+// };
+// }
- if (threeDaysAgo <= today && today <= oneDayAgo) {
- return 'yellow';
- } else if (today <= threeDaysAgo) {
- return 'blue';
- } else {
- return 'red';
- }
- };
- }
},
created() {
document.title = '宸ヤ綔鍙扳�斺�擬ES'
--
Gitblit v1.9.3