licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

时间超时问题

Browse Source
This commit is contained in:
Ledo 2025-06-30 11:16:05 +08:00
parent cc17ba1b42
commit 6aed54f04e
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue
View File

@ -807,9 +807,12 @@ const submitForm = async (operate) => {
const onAddItem = async() => { const onAddItem = async() => {
//条件修改：没有时间就不填 //条件修改：没有时间就不填
var date = new Date(); var date = new Date();
date.setHours(0,0,0,0)
if(processDesignType.value == 'BLUEPRINT_WORKBLANK'){ if(processDesignType.value == 'BLUEPRINT_WORKBLANK'){
if(formData.value.blankDate != null ){ if(formData.value.blankDate != null ){
if(formData.value.blankDate < date.getTime()){ var date1 = new Date(formData.value.blankDate);
date1.setHours(0,0,0,0)
if(date1.getTime()< date.getTime()){
if(formData.value.isDelay == null || formData.value.isDelay == 0){ if(formData.value.isDelay == null || formData.value.isDelay == 0){
message.error("当前任务已超期,请延期后重试!") message.error("当前任务已超期,请延期后重试!")
return return
@ -822,7 +825,9 @@ const onAddItem = async() => {
} }
if(processDesignType.value == 'BLUEPRINT_2D'){ if(processDesignType.value == 'BLUEPRINT_2D'){
if(formData.value.twoDimDate != null ){ if(formData.value.twoDimDate != null ){
if(formData.value.twoDimDate < date.getTime()){ var date1 = new Date(formData.value.twoDimDate);
date1.setHours(0,0,0,0)
if(date1.getTime()< date.getTime()){
if(formData.value.isDelay == null || formData.value.isDelay == 0){ if(formData.value.isDelay == null || formData.value.isDelay == 0){
message.error("当前任务已超期,请延期后重试!") message.error("当前任务已超期,请延期后重试!")
return return
@ -836,7 +841,9 @@ const onAddItem = async() => {
} }
if(processDesignType.value == 'BLUEPRINT_3D'){ if(processDesignType.value == 'BLUEPRINT_3D'){
if(formData.value.threeDimDate != null ){ if(formData.value.threeDimDate != null ){
if(formData.value.threeDimDate < date.getTime()){ var date1 = new Date(formData.value.threeDimDate);
date1.setHours(0,0,0,0)
if(date1.getTime()< date.getTime()){
if(formData.value.isDelay == null || formData.value.isDelay == 0){ if(formData.value.isDelay == null || formData.value.isDelay == 0){
message.error("当前任务已超期,请延期后重试!") message.error("当前任务已超期,请延期后重试!")
return return
@ -850,9 +857,9 @@ const onAddItem = async() => {
if(processDesignType.value == 'BLUEPRINT_FOUNDRY_TECHNOLOGY'){ if(processDesignType.value == 'BLUEPRINT_FOUNDRY_TECHNOLOGY'){
console.log(formData.value.craftEndDate) console.log(formData.value.craftEndDate)
if(formData.value.craftEndDate != null ){ if(formData.value.craftEndDate != null ){
console.log(date.getTime()) var date1 = new Date(formData.value.craftEndDate);
console.log(formData.value.craftEndDate) date1.setHours(0,0,0,0)
if(formData.value.craftEndDate < date.getTime()){ if(date1.getTime()< date.getTime()){
if(formData.value.isDelay == null || formData.value.isDelay == 0){ if(formData.value.isDelay == null || formData.value.isDelay == 0){
message.error("当前任务已超期,请延期后重试!") message.error("当前任务已超期,请延期后重试!")
return return

3
mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue
View File

@ -1353,7 +1353,8 @@ const submitForm = async (operate) => {
d1.setHours(0, 0, 0, 0); d1.setHours(0, 0, 0, 0);
d2.setHours(0, 0, 0, 0); d2.setHours(0, 0, 0, 0);
console.log(d1)
console.log(d2)
if (d1 > d2) { if (d1 > d2) {
let name; let name;
procedureList.value.forEach((items) => { procedureList.value.forEach((items) => {