From e9c423b2bb2ffae3dab2130fab9f11f3c7d8bece Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 17 十一月 2023 10:49:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/product/workbench/index.vue | 260 ++++++++++++++++++++++++++++-----------------------
1 files changed, 143 insertions(+), 117 deletions(-)
diff --git a/src/views/product/workbench/index.vue b/src/views/product/workbench/index.vue
index 026fcfe..fd3b46e 100644
--- a/src/views/product/workbench/index.vue
+++ b/src/views/product/workbench/index.vue
@@ -256,7 +256,7 @@
>
</div>
</div>
- <div class="start-end-div">
+ <div class="start-end-div" >
<div>
<span
style="margin-left:8px;font-size:12px;line-height:32px;"
@@ -528,35 +528,36 @@
</el-form-item>
</el-form>
</div>
- <div class="task-div-content">
- <div v-if="!isShowNormalTracking" class="task-list-div">
- <operationTaskPane
- ref="operateTaskDiv"
- :workstationId="dutyForm.workstationId"
- :productSn="operateTaskForm.SN"
- :orderNumber="operateTaskForm.orderNumber"
- :spec="operateTaskForm.spec"
- :outBatchNo="operateTaskForm.outBatchNo"
- :mpsNo="operateTaskForm.mpsNo"
- @changeCurrOperateTask="changeCurrOperateTask"
- @refreshReport="refreshWorkReportPageData"
- />
- </div>
- <div v-if="isShowNormalTracking" class="task-list-div">
- <operationTaskTable
- ref="operateTaskTableDiv"
- :workstationId="dutyForm.workstationId"
- :productSn="operateTaskForm.SN"
- :orderNumber="operateTaskForm.orderNumber"
- :spec="operateTaskForm.spec"
- :mpsNo="operateTaskForm.mpsNo"
- @changeCurrOperateTask="changeCurrOperateTask"
- />
- </div>
- </div>
+ <div class="task-div-content" >
+ <div v-if="!isShowNormalTracking" class="task-list-div" >
+ <operationTaskPane
+ ref="operateTaskDiv" :style="{ backgroundColor: taskStatusColor() }"
+ :workstationId="dutyForm.workstationId"
+ :productSn="operateTaskForm.SN"
+ :orderNumber="operateTaskForm.orderNumber"
+ :spec="operateTaskForm.spec"
+ :outBatchNo="operateTaskForm.outBatchNo"
+ :mpsNo="operateTaskForm.mpsNo"
+ @changeCurrOperateTask="changeCurrOperateTask"
+ @refreshReport="refreshWorkReportPageData"
+ />
+ </div>
+ <div v-if="isShowNormalTracking" class="task-list-div" >
+ <operationTaskTable
+ ref="operateTaskTableDiv" :style="{ backgroundColor: taskStatusColor() }"
+ :workstationId="dutyForm.workstationId"
+ :productSn="operateTaskForm.SN"
+ :orderNumber="operateTaskForm.orderNumber"
+ :spec="operateTaskForm.spec"
+ :mpsNo="operateTaskForm.mpsNo"
+ @changeCurrOperateTask="changeCurrOperateTask"
+ />
+ </div>
+
+ </div>
</div>
</div>
- <div :style="{ width: mainMiddleWidth }" v-show="mainMiddleShow">
+ <div :style="{ width: mainMiddleWidth } " v-show="mainMiddleShow">
<div style="height:86px;width:14px;position: absolute;top:50%">
<el-tooltip effect="dark" content="鏀剁缉" placement="left">
<img
@@ -1437,6 +1438,7 @@
box-sizing: border-box;
overflow-y: auto;
margin-bottom: 10px;
+
}
.task-list-div {
@@ -1560,6 +1562,10 @@
},
data() {
return {
+ dutyForm: {},
+ operateTaskForm: {},
+ isShowNormalTracking: false,
+ // taskStatusColor: '',
showBan: false,
dutyCanEdit: false,
saveButton: false,
@@ -1666,96 +1672,9 @@
currItem: 'task'
}
},
- computed: {
- ...mapGetters(['userInfo', 'tagWel', 'permissions'])
- },
- created() {
- document.title = '宸ヤ綔鍙扳�斺�擬ES'
- if (!this.dutyForm.workstationId) {
- const k = localStorage.getItem(storage_key)
- if (k) {
- this.dutyForm.workstationId = parseInt(k)
- }
- }
- this.initOptions()
- this.getSysParam(sysParam.SHOW_STEP_BUSINESS)
- this.getTrackingParam(sysParam.SHOW_TRACKING_TYPE)
- this.timer = setInterval(this.clockTimer, 1000)
- },
- watch: {
- 'dutyForm.workstationId'(val) {
- if (val) {
- localStorage.setItem(storage_key, val)
- }
- // 宸ヤ綔绔欐敼鍙樻椂锛屾暣涓〉闈㈢殑鍔ㄦ�佹暟鎹渶瀹炴椂鍔犺浇銆侀〉闈㈢紦瀛樻暟鎹渶 鍒濆鍖�
- this.initPageVariable()
- this.loadInfoByWorkstation()
- },
- 'dutyForm.startTime'(val, oldval) {
- if (val) {
- this.checkTime()
- } else {
- this.warningShow = false
- }
- },
- 'dutyForm.endTime'(val, oldval) {
- if (val) {
- this.checkTime()
- } else {
- this.warningShow = false
- }
- },
- 'operateTaskForm.orderNumber'(val) {
- /* this.$nextTick(() => {
- this.queryInfoForOrderNumber()
- }) */
- },
- 'operateTaskForm.spec'(val) {
- if (val == '' || val == null) {
- this.SNs = []
- this.operateTaskForm.SN = ''
- } else {
- const that = this
- that.SNs = []
- getProductSnByCustomerNoAndPartName({
- customerOrderNo: this.operateTaskForm.orderNumber,
- partName: val
- }).then((res) => {
- const result = res.data.data
- result.forEach(function(item) {
- const obj = {
- key: item,
- value: item
- }
- that.SNs.push(obj)
- })
- })
- }
- this.$nextTick(() => {
- if (this.partNames.length !== 0) {
- this.refreshOperateTasks()
- }
- })
- },
- 'operateTaskForm.SN'(val) {
- this.$nextTick(() => {
- if (this.SNs.length !== 0) {
- this.refreshOperateTasks()
- }
- })
- },
- 'operateTaskForm.outBatchNo'(val) {
- /* this.$nextTick(() => {
- this.refreshOperateTasks()
- }) */
- },
- 'operateTaskForm.mpsNo'(val) {
- /* this.$nextTick(() => {
- this.refreshOperateTasks()
- }) */
- }
- },
methods: {
+ changeCurrOperateTask() {},
+ refreshWorkReportPageData() {},
refreshOperateTasksByConditions() {
this.$nextTick(() => {
this.refreshOperateTasks()
@@ -2597,6 +2516,113 @@
beforeDestroy() {
clearInterval(this.timer)
}
+ },
+ computed: {
+ ...mapGetters(['userInfo', 'tagWel', 'permissions']),
+
+ 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 (threeDaysAgo <= today && today <= oneDayAgo) {
+ return 'yellow';
+ } else if (today <= threeDaysAgo) {
+ return 'blue';
+ } else {
+ return 'red';
+ }
+ };
}
+ },
+ created() {
+ document.title = '宸ヤ綔鍙扳�斺�擬ES'
+ if (!this.dutyForm.workstationId) {
+ const k = localStorage.getItem(storage_key)
+ if (k) {
+ this.dutyForm.workstationId = parseInt(k)
+ }
+ }
+ this.initOptions()
+ this.getSysParam(sysParam.SHOW_STEP_BUSINESS)
+ this.getTrackingParam(sysParam.SHOW_TRACKING_TYPE)
+ this.timer = setInterval(this.clockTimer, 1000)
+ },
+ watch: {
+ 'dutyForm.workstationId'(val) {
+ if (val) {
+ localStorage.setItem(storage_key, val)
+ }
+ // 宸ヤ綔绔欐敼鍙樻椂锛屾暣涓〉闈㈢殑鍔ㄦ�佹暟鎹渶瀹炴椂鍔犺浇銆侀〉闈㈢紦瀛樻暟鎹渶 鍒濆鍖�
+ this.initPageVariable()
+ this.loadInfoByWorkstation()
+ },
+ 'dutyForm.startTime'(val, oldval) {
+ if (val) {
+ this.checkTime()
+ } else {
+ this.warningShow = false
+ }
+ },
+ 'dutyForm.endTime'(val, oldval) {
+ if (val) {
+ this.checkTime()
+ } else {
+ this.warningShow = false
+ }
+ },
+ 'operateTaskForm.orderNumber'(val) {
+ /* this.$nextTick(() => {
+ this.queryInfoForOrderNumber()
+ }) */
+ },
+ 'operateTaskForm.spec'(val) {
+ if (val == '' || val == null) {
+ this.SNs = []
+ this.operateTaskForm.SN = ''
+ } else {
+ const that = this
+ that.SNs = []
+ getProductSnByCustomerNoAndPartName({
+ customerOrderNo: this.operateTaskForm.orderNumber,
+ partName: val
+ }).then((res) => {
+ const result = res.data.data
+ result.forEach(function(item) {
+ const obj = {
+ key: item,
+ value: item
+ }
+ that.SNs.push(obj)
+ })
+ })
+ }
+ this.$nextTick(() => {
+ if (this.partNames.length !== 0) {
+ this.refreshOperateTasks()
+ }
+ })
+ },
+ 'operateTaskForm.SN'(val) {
+ this.$nextTick(() => {
+ if (this.SNs.length !== 0) {
+ this.refreshOperateTasks()
+ }
+ })
+ },
+ 'operateTaskForm.outBatchNo'(val) {
+ /* this.$nextTick(() => {
+ this.refreshOperateTasks()
+ }) */
+ },
+ 'operateTaskForm.mpsNo'(val) {
+ /* this.$nextTick(() => {
+ this.refreshOperateTasks()
+ }) */
+ }
+ },
+
}
</script>
--
Gitblit v1.9.3