diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue
index e7fd7b9..b327a99 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue
@@ -260,7 +260,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
开始时间
-
+
@@ -269,7 +269,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
结束时间
-
+
@@ -315,7 +315,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
v-if="scope.row.isOver == 0 && active != 'detail'"
link
type="danger"
-
+
@click="overRow(scope.row)"
>
结束
@@ -400,7 +400,7 @@ const disabledDate = (time: Date,row : any) => {
const today = new Date();
const tomorrow = new Date(today);
tomorrow.setDate(tomorrow.getDate() + 1); // 设置为明天
- tomorrow.setHours(23, 59, 59, 999);
+ tomorrow.setHours(23, 59, 59, 999);
if(row.beginTime != null){
const beginDate = new Date(row.beginTime);
@@ -411,7 +411,7 @@ const disabledDate = (time: Date,row : any) => {
}
const disabledDate1 = (time: Date,row : any) => {
const today = new Date();
- today.setHours(23, 59, 59, 999);
+ today.setHours(23, 59, 59, 999);
return time.getTime() > today.getTime();
}
@@ -429,28 +429,28 @@ const getWorkTime = (type) =>{
if(processDesignType.value == 'BLUEPRINT_WORKBLANK'){
if(formData.value.blankDate != null && formData.value.startBlankDate ){
beginTime = formData.value.startBlankDate;
- endTime = formData.value.blankDate
+ endTime = formData.value.blankDate
}
}
if(processDesignType.value == 'BLUEPRINT_2D'){
if(formData.value.twoDimDate != null && formData.value.startTwoDimDate ){
beginTime = formData.value.startTwoDimDate;
- endTime = formData.value.twoDimDate
+ endTime = formData.value.twoDimDate
}
}
if(processDesignType.value == 'BLUEPRINT_3D'){
if(formData.value.threeDimDate != null && formData.value.startThreeDimDate != null){
beginTime = formData.value.startThreeDimDate;
- endTime = formData.value.threeDimDate;
+ endTime = formData.value.threeDimDate;
}
}
if(processDesignType.value == 'BLUEPRINT_FOUNDRY_TECHNOLOGY'){
if(formData.value.craftStartDate != null && formData.value.craftEndDate != null ){
beginTime = formData.value.craftStartDate;
- endTime = formData.value.craftEndDate
-
+ endTime = formData.value.craftEndDate
+
}
}
@@ -460,7 +460,10 @@ const getWorkTime = (type) =>{
const end = new Date(endTime).getTime();
const diffTime = Math.abs(end - start);
var day = Math.floor(diffTime / (1000 * 60 * 60 * 24));
- if(type == 1){
+ if(day == 0){
+ day += 1
+ }
+ if(type == 1){
return day * 8 + '小时';
}else{
@@ -578,7 +581,7 @@ const overRow = async( row :any) =>{
}
if(row.endTime == null ){
row.endTime = new Date().getTime()
- var timeDiff = row.endTime -row.beginTime;
+ var timeDiff = row.endTime -row.beginTime;
// 将毫秒转换为小时
row.workTime = timeDiff / (1000 * 60 * 60);
@@ -589,7 +592,7 @@ const overRow = async( row :any) =>{
message.error("开始时间不能大于结束时间!请确认!")
return
}
- if(row.workTime == null
+ if(row.workTime == null
){
message.error("已做时间不能为空!请确认")
return
@@ -612,7 +615,7 @@ const overProcess = () =>{
return
}
}
- item.isOver = 1;
+ item.isOver = 1;
}
}else{
message.error("至少进行一次进度汇报！")
@@ -661,7 +664,7 @@ const sendItem = async() =>{
return
}
}
- item.isOver = 1
+ item.isOver = 1
}
//先保存
await submitForm('SAVE');
@@ -710,11 +713,11 @@ const queryData = async (id?: number) => {
}else{
item.hasNext = true;
}
- }
-
+ }
+
}
- }
- }
+ }
+ }
} finally {
formLoading.value = false
}
@@ -779,7 +782,7 @@ const onAddItem = async() => {
message.error("当前任务已超期,请延期后重试!")
return
}
-
+
}
}else{
// message.error("2D结束时间为空!请确认!")
@@ -828,7 +831,7 @@ const onAddItem = async() => {
// message.error("结束时间不能为空!请确认!")
// return
// }
- // if(item.workTime == null
+ // if(item.workTime == null
// ){
// message.error("已做时间不能为空!请确认")
// return
diff --git a/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue b/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue
index 227e33d..15441c3 100644
--- a/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue
+++ b/mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue
@@ -247,10 +247,10 @@
// } else {
const url = `/pages/moJuSheJiReport/moJuSheJiReport-detail?id=${item.id}&jd=${item.progress}`
uni.navigateTo({ url })
- // }
+ }
// 为 selectedId 赋值
/* */
- }
+
/* const viewClick = (item) => {
const params = {
@@ -558,7 +558,7 @@
- 最新进度：{{item.progress}}%
+
{{ statusText }}
diff --git a/mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue b/mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue
index e3e5496..cbda1cc 100644
--- a/mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue
+++ b/mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue
@@ -213,11 +213,11 @@
// }else{
// item.hasNext = true;
// }
- // }
+ // }
// }
- // }
- // }
+ // }
+ // }
isLoading.value = false
} finally {
@@ -227,24 +227,29 @@
}
const overRow = async (row : any) => {
- if (row.endTime == null) {
- row.endTime = new Date().getTime()
- var timeDiff = row.endTime - row.beginTime;
- // 将毫秒转换为小时
- row.workTime = timeDiff / (1000 * 60 * 60);
- row.maxTime = row.workTime;
// row.workTime = row.endTime - row.
- }
if (row.beginTime == null) {
uni.showToast({ icon: 'none', title: '开始时间不能为空!请确认!' })
return
}
+ if (row.endTime == null) {
+ uni.showToast({ icon: 'none', title: '结束时间不能为空!请确认!' })
+ return
+ }
+
if (new Date(row.beginTime).getTime() > new Date(row.endTime).getTime()) {
uni.showToast({ icon: 'none', title: '开始时间不能大于结束时间!请确认!' })
return
}
+ if(row.workTime == null){
+ var timeDiff = new Date(row.endTime).getTime() - new Date(row.beginTime).getTime();
+
+ // 将毫秒转换为小时
+ row.workTime = timeDiff / (1000 * 60 * 60);
+ row.maxTime = row.workTime;
+ }
if (row.workTime == null
) {
uni.showToast({ icon: 'none', title: '已做时间不能为空!请确认!' })
@@ -262,7 +267,7 @@
row.isOver = 1;
popup.value?.close()
await submitForm('SAVE', 'OVER');
-
+
//更新一下这条数据的状态
}
const handOver = () => {
@@ -342,7 +347,7 @@
// message.error("结束时间不能为空!请确认!")
// return
// }
- // if(item.workTime == null
+ // if(item.workTime == null
// ){
// message.error("已做时间不能为空!请确认")
// return
@@ -994,4 +999,4 @@
}
}
}
-
\ No newline at end of file
+