From 41e0df8413624e6034c967f3afae30da59370879 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 十二月 2023 16:20:15 +0800
Subject: [PATCH] modified: src/components/verifition/Verify/VerifyPoints.vue modified: src/const/crud/admin/sys-public-param.js modified: src/page/full-screen/fullScreenPlus.vue modified: src/page/index/logo.vue modified: src/page/index/sidebar/sidebarItem.vue modified: src/page/login/index.vue modified: src/page/login/thirdpartylogin.vue modified: src/util/elAttr.js modified: src/views/accounting/unitworkfactor/unitworkfactor-form.vue modified: src/views/accounting/unitworkfactor/updateQuota-form.vue modified: src/views/basic/discmaintenance/discmaintenance-form.vue modified: src/views/basic/log/index.vue modified: src/views/basic/part/part-form.vue modified: src/views/basic/part/print-label-form.vue modified: src/views/basic/poc/index.vue modified: src/views/basic/tabletest/index.vue modified: src/views/basic/template/index.vue modified: src/views/basic/template/template-form.vue modified: src/views/basic/workstation/workstation-form.vue modified: src/views/common/custom-table.vue modified: src/views/common/documentDetail.vue modified: src/views/common/operationParamTemplate.vue modified: src/views/common/rawMaterial-part.vue modified: src/views/common/search-select.vue modified: src/views/common/ztt-table.vue modified: src/views/huawei/code19bind/list.vue modified: src/views/huawei/code19gen/form.vue modified: src/views/huawei/grossweightcode/list.vue modified: src/views/huawei/grossweightcode/task-secret-form.vue modified: src/views/oa/JiegouModal.vue modified: src/views/oa/PeizhiModal.vue modified: src/views/oa/technology-document-new.vue modified: src/views/oa/technology-document.vue modified: src/views/plan/customer/index.vue modified: src/views/plan/customerorder/confirm-pull-customerorder.vue modified: src/views/plan/customerorder/customerorder-config-history.vue modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/customerorder-return.vue modified: src/views/plan/customerorder/customerorder-ztt-table.vue modified: src/views/plan/customerorder/index.vue modified: src/views/plan/customerorder/other-customer-order-line.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue modified: src/views/plan/customerorder/schedule-table.vue modified: src/views/plan/manufacturingorder/auto-operationtask.vue modified: src/views/plan/manufacturingorder/customerorder.vue modified: src/views/plan/manufacturingorder/customize-param-template.vue modified: src/views/plan/manufacturingorder/order-operation-form.vue modified: src/views/plan/manufacturingorder/productorder-form.vue modified: src/views/plan/manufacturingorderapply/index.vue modified: src/views/plan/masterproductionschedule/auto-manufacturingorder.vue modified: src/views/plan/operationtask/gantt.vue modified: src/views/plan/operationtask/operationtask-form.vue modified: src/views/plan/operationtask/task-material.vue modified: src/views/plan/productionschedul/index.vue modified: src/views/plan/productionschedul/template-form.vue modified: src/views/plan/schedule/gantt.vue modified: src/views/plan/schedulelookover/ganttview.vue modified: src/views/plan/segmentmerge/index.vue modified: src/views/plan/segmentmerge/operate-dialog.vue modified: src/views/plan/segmentmerge/operation-technology-form.vue modified: src/views/product/dutyrecord/index.vue modified: src/views/product/producttraceability/index.vue modified: src/views/product/producttraceability/traceability-diagram.vue modified: src/views/product/workbench/batchproductout-form-new.vue modified: src/views/product/workbench/batchproductout-form.vue modified: src/views/product/workbench/feed-form.vue modified: src/views/product/workbench/feed-pane.vue modified: src/views/product/workbench/feed-tab.vue modified: src/views/product/workbench/handymantype.vue modified: src/views/product/workbench/index.vue modified: src/views/product/workbench/mould-pane.vue modified: src/views/product/workbench/operation-task-pane.vue modified: src/views/product/workbench/product-record-form.vue modified: src/views/product/workbench/productout-form-by-batch.vue modified: src/views/product/workbench/productout-form.vue modified: src/views/product/workbench/productrecord-tab.vue modified: src/views/product/workbench/producttracking-tab.vue modified: src/views/product/workbench/shift-productout-form.vue modified: src/views/product/workbench/splitTaskForm.vue modified: src/views/product/workbench/taskinfo-pane.vue modified: src/views/quality/Packaging_ledger/pack-from.vue modified: src/views/quality/apply/index.vue modified: src/views/quality/exception/exception.vue modified: src/views/quality/exception/index.vue modified: src/views/quality/finishedProductInspection/finishedProduct-form.vue modified: src/views/quality/finishedProductInspection/finishedProduct-print.vue modified: src/views/quality/finishedProductInspection/finishedProducter-print.vue modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/newReport/ReportForm.vue modified: src/views/quality/processInspect/index.vue modified: src/views/quality/processInspect/processInspect-form.vue modified: src/views/quality/processconfiguration/index.vue modified: src/views/quality/processconfiguration/table-form.vue modified: src/views/quality/rawMaterial/QrcodeReader.vue modified: src/views/quality/rawMaterial/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue modified: src/views/quality/report/index.vue modified: src/views/quality/standardbind/standardbind-form.vue modified: src/views/quality/statistics/rateChart.vue modified: src/views/quality/testitemlayout/index.vue modified: src/views/quality/testplan/testplan-form.vue modified: src/views/quality/unqualifiedprocess/examineApproveform.vue modified: src/views/quality/unqualifiedprocess/index.vue modified: src/views/quality/unqualifiedprocess/loaction-form.vue modified: src/views/quality/unqualifiedprocess/unqualifiedprocessform.vue modified: src/views/technology/completeproductstructure/completeproductstructure-form.vue modified: src/views/technology/document/checkStandardTable.vue modified: src/views/technology/document/document-form.vue modified: src/views/technology/document/extendsOperation.vue modified: src/views/technology/document/extendsTestStandard.vue modified: src/views/technology/document/extendsTestStandardParam.vue modified: src/views/technology/document/teststandard.vue modified: src/views/technology/structure/single-structure-form.vue modified: src/views/warehouse/changestock/index.vue modified: src/views/warehouse/check/check-detail.vue modified: src/views/warehouse/pallettransports/ifslocation-form.vue modified: src/views/warehouse/pallettransports/ifsstock-form.vue modified: src/views/warehouse/pallettransports/index.vue modified: src/views/warehouse/returnstock/ifslocation-form.vue modified: src/views/warehouse/returnstock/index.vue modified: src/views/warehouse/returnstock/returnstock-form.vue modified: src/views/warehouse/returnstock/stock-part.vue modified: src/views/warehouse/stock/print-label-form.vue modified: src/views/warehouse/stock/small-print-label-form.vue modified: src/views/warehouse/stock/small-warehousing-label-form.vue modified: src/views/warehouse/stock/stock-table.vue modified: src/views/warehouse/stock/warehousing-label-form.vue modified: src/views/zte/pkgidbind/index.vue
---
src/views/product/workbench/index.vue | 270 +++++++++++++++++++++++++++++------------------------
1 files changed, 148 insertions(+), 122 deletions(-)
diff --git a/src/views/product/workbench/index.vue b/src/views/product/workbench/index.vue
index 026fcfe..ea1a613 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,37 @@
</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>
+ <!-- :style="{ backgroundColor: taskStatusColor() }" -->
+ <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>
</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
@@ -1485,7 +1487,8 @@
.warning-info {
margin-left: 20px;
- font-size: 16px;
+ font-size: 13px;
+ font-weight: bold;
color: red;
letter-spacing: 3px;
}
@@ -1560,6 +1563,10 @@
},
data() {
return {
+ dutyForm: {},
+ operateTaskForm: {},
+ isShowNormalTracking: false,
+ // taskStatusColor: '',
showBan: false,
dutyCanEdit: false,
saveButton: false,
@@ -1666,96 +1673,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()
@@ -1791,7 +1711,6 @@
customerOrderNo: this.operateTaskForm.orderNumber
}).then((res) => {
const result = res.data.data
- console.log(result)
result.forEach(function(item) {
const obj = {
key: item,
@@ -1799,7 +1718,6 @@
}
that.partNames.push(obj)
})
- console.log(that.partNames)
})
}, 500)
} else {
@@ -2297,7 +2215,6 @@
(e) => e.id === this.dutyForm.workstationId
).workCenter
}
- console.log(this.paramObj_StationSave)
this.visible_StationSave = true
},
Select_StationSave() {
@@ -2597,6 +2514,115 @@
beforeDestroy() {
clearInterval(this.timer)
}
- }
+ },
+ 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);
+
+// if (halfMonthAgo <= date && date <= threeDaysAgo) {
+// return 'yellow';
+// } else if (today <= date && date <= threeDaysAgo) {
+// return 'red';
+// } else {
+// return 'blue';
+// }
+// };
+// }
+
+ },
+ 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