From 506b7821cc4cb30db62deecd0829dbb835d9aa52 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 22 Aug 2023 13:27:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E8=B5=8B?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PDA/pages/store/receipt.vue | 5 +++-- fe/PDA/pages/store/recycle.vue | 5 +++-- fe/PDA/pages/store/tjReceipt.vue | 5 +++-- fe/PDA/pages/store/tjRecycle.vue | 5 +++-- fe/PDA/pages/task/count_detail.vue | 5 +++-- fe/PDA/pages/task/issue_detail.vue | 5 +++-- fe/PDA/pages/task/receipt_result.vue | 5 +++-- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/fe/PDA/pages/store/receipt.vue b/fe/PDA/pages/store/receipt.vue index daf10315f..954b70d91 100644 --- a/fe/PDA/pages/store/receipt.vue +++ b/fe/PDA/pages/store/receipt.vue @@ -46,7 +46,8 @@ import { showConfirmMsg, goHome, - getRemoveOption + getRemoveOption, + getCurrDateTime } from '@/common/basic.js'; import winBlankView from '@/mycomponents/wincom/winBlankView.vue' @@ -381,7 +382,7 @@ number: "", productionPlanNumber: "", jobNumber: "", - completeTime: new Date(), + completeTime: getCurrDateTime(), Company: localStorage.company, WorkShop: 'Assemble', //车间 details: [] //子表 diff --git a/fe/PDA/pages/store/recycle.vue b/fe/PDA/pages/store/recycle.vue index 4b52e024f..38a86dc14 100644 --- a/fe/PDA/pages/store/recycle.vue +++ b/fe/PDA/pages/store/recycle.vue @@ -49,7 +49,8 @@ import { showConfirmMsg, goHome, - getRemoveOption + getRemoveOption, + getCurrDateTime } from '@/common/basic.js'; import winBlankView from '@/mycomponents/wincom/winBlankView.vue' @@ -323,7 +324,7 @@ number: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, productionPlanNumber: "", jobNumber: "", - completeTime: new Date(), + completeTime: getCurrDateTime(), Company: localStorage.company, WorkShop: 'Assemble', //车间 details: [] //子表 diff --git a/fe/PDA/pages/store/tjReceipt.vue b/fe/PDA/pages/store/tjReceipt.vue index cc3aa9c39..43b7ab0fe 100644 --- a/fe/PDA/pages/store/tjReceipt.vue +++ b/fe/PDA/pages/store/tjReceipt.vue @@ -73,7 +73,8 @@ } from '@/api/index.js'; import { showConfirmMsg, - goHome + goHome, + getCurrDateTime } from '@/common/basic.js'; import winBlankView from '@/mycomponents/wincom/winBlankView.vue' @@ -190,7 +191,7 @@ number: "", productionPlanNumber: "", jobNumber: "", - completeTime: new Date(), + completeTime: getCurrDateTime(), Company: localStorage.company, // WorkShop: 'a', //车间 WorkShop: that.prodLine.workShop, //车间 diff --git a/fe/PDA/pages/store/tjRecycle.vue b/fe/PDA/pages/store/tjRecycle.vue index f107f79c1..ea78816e9 100644 --- a/fe/PDA/pages/store/tjRecycle.vue +++ b/fe/PDA/pages/store/tjRecycle.vue @@ -36,7 +36,8 @@ import { showConfirmMsg, goHome, - getRemoveOption + getRemoveOption, + getCurrDateTime } from '@/common/basic.js'; import winBlankView from '@/mycomponents/wincom/winBlankView.vue' @@ -303,7 +304,7 @@ number: localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN, productionPlanNumber: "", jobNumber: "", - completeTime: new Date(), + completeTime: getCurrDateTime(), Company: localStorage.company, WorkShop: 'Assemble', //车间 details: [] //子表 diff --git a/fe/PDA/pages/task/count_detail.vue b/fe/PDA/pages/task/count_detail.vue index 77cd9bfad..65d0301f1 100644 --- a/fe/PDA/pages/task/count_detail.vue +++ b/fe/PDA/pages/task/count_detail.vue @@ -160,7 +160,8 @@ goHome, getISODateTime, compare, - getRemoveOption + getRemoveOption, + getCurrDateTime } from '@/common/basic.js'; import { @@ -667,7 +668,7 @@ this.datacontent.details = this.allDetails; that.datacontent.completeUserId = localStorage.getItem('userId') that.datacontent.completeUserName = localStorage.getItem('userName_CN') - that.datacontent.completeTime = new Date() + that.datacontent.completeTime = getCurrDateTime() let params = JSON.stringify(this.datacontent); finishCountJob(this.id, params) .then(res => { diff --git a/fe/PDA/pages/task/issue_detail.vue b/fe/PDA/pages/task/issue_detail.vue index 504f9e992..708486e9d 100644 --- a/fe/PDA/pages/task/issue_detail.vue +++ b/fe/PDA/pages/task/issue_detail.vue @@ -118,7 +118,8 @@ showConfirmMsg, goHome, compareDesc, - compareStr + compareStr, + getCurrDateTime } from '@/common/basic.js'; import comMessage from '@/mycomponents/common/comMessage.vue' import winScanButton from '@/mycomponents/wincom/winScanButton.vue' @@ -625,7 +626,7 @@ }); that.datacontent.completeUserId = localStorage.getItem('userId') that.datacontent.completeUserName = localStorage.getItem('userName_CN') - that.datacontent.completeTime = new Date(); + that.datacontent.completeTime = getCurrDateTime(); that.datacontent.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN; that.datacontent.details = that.details; let params = JSON.stringify(that.datacontent); diff --git a/fe/PDA/pages/task/receipt_result.vue b/fe/PDA/pages/task/receipt_result.vue index 5c7b575ae..fe34012e0 100644 --- a/fe/PDA/pages/task/receipt_result.vue +++ b/fe/PDA/pages/task/receipt_result.vue @@ -81,6 +81,7 @@ import { showConfirmMsg, goHome, + getCurrDateTime } from '@/common/basic.js'; import { @@ -204,13 +205,13 @@ //赋值 that.receiptJob.completeUserId = localStorage.getItem('userId') that.receiptJob.completeUserName = localStorage.getItem('userName_CN') - that.receiptJob.completeTime = new Date() + that.receiptJob.completeTime = getCurrDateTime() that.receiptJob.details.forEach(r => { r.handledToLocationCode = r.recommendToLocationCode; r.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN if (r.purchaseReceiptInspectStatus == 1) { - r.handledArriveDate = new Date(); // + r.handledArriveDate = getCurrDateTime(); // r.purchaseReceiptInspectStatus = 4; //未收货 r.handledQty = 0; // r.handledUom = r.recommendUom;