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

Compare commits

base: licq:4dadedc6a68d0c6f4b16743d5fdebcc7514aa141
Branches Tags
licq:main
..
compare: licq:a1bcb1976cab1097acb3adaec5b7526a356fcd9c
Branches Tags
licq:main

2 Commits
4dadedc6a6 ... a1bcb1976c

Author SHA1 Message Date
Ledo
a1bcb1976c 按新要求修改 2025-06-06 08:42:21 +08:00
Ledo
74db1306cd 按新要求修改 2025-06-06 08:40:13 +08:00
3 changed files with 53 additions and 43 deletions
Show Stats Expand all files Collapse all files

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

@ -201,7 +201,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
<el-col :span="6" >
<el-button v-if="formData.isOverProcess == null || formData.isOverProcess == 0" style="margin-left: 10%;" type="warning" @click="openDelay">延期</el-button>
</el-col>
<el-col :span="12" v-if="delayDialog || formData.isDelay">
<el-col :span="12">
<el-form-item label="延期原因" prop="delayReason">
<el-input
v-model="formData.delayReason"
@ -209,7 +209,7 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
:disabled="!delayDialog"
@blur="(e) => delaySubmit(e)"
type="textarea"
placeholder="延期原因"
placeholder="输入延期原因后，鼠标点击空白区域自动保存。"
/>
</el-form-item>
</el-col>
@ -256,21 +256,21 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
<el-form ref="processDesignProgressFormRef" :model="formData.processDesignProgressList" :rules="subFormRules" v-loading="subFormLoading" label-width="0">
<el-table :data="formData.processDesignProgressList" class="hl-table">
<el-table-column label="序号" align="center" type="index" width="80" fixed />
<el-table-column label="开始时间" align="center" prop="beginTime" :formatter="dateFormatter" min-width="200">
<el-table-column label="开始时间" align="center" prop="beginTime" :formatter="dateFormatter" min-width="230">
<template #header>开始时间</template>
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.beginTime`" class="mb-0px!">
<!-- <el-input-number min="0" max="100" class="!w-240px" :disabled="detailDisabled || row.id" v-model="row.progress" placeholder="请输入进度百分比" @change="verify1($index)"/>-->
<el-date-picker :disabled-date="(date) => disabledDate1(date, row)" @change="(e) => beginTimeChange(e,row)" :disabled=" row.isOver == 1 || formData.isOverProcess == 1" :formatter="dateFormatter" v-model="row.beginTime" type="datetime" placeholder="选择开始日期"/>
<el-date-picker class="!w-230px" :disabled-date="(date) => disabledDate1(date, row)" @change="(e) => beginTimeChange(e,row)" :disabled=" row.isOver == 1 || formData.isOverProcess == 1" :formatter="dateFormatter" v-model="row.beginTime" type="datetime" placeholder="选择开始日期"/>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="结束时间" align="center" prop="endTime" :formatter="dateFormatter" min-width="200">
<el-table-column label="结束时间" align="center" prop="endTime" :formatter="dateFormatter" min-width="230">
<template #header>结束时间</template>
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.endTime`" class="mb-0px!">
<!-- <el-input-number min="0" max="100" class="!w-240px" :disabled="detailDisabled || row.id" v-model="row.progress" placeholder="请输入进度百分比" @change="verify1($index)"/>-->
<el-date-picker :disabled-date="(date) => disabledDate(date, row)" @change="(e) => endTimeChange(e,row)" :disabled=" row.isOver == 1 || formData.isOverProcess == 1" :formatter="dateFormatter" v-model="row.endTime" type="datetime" placeholder="选择结束日期"/>
<el-date-picker class="!w-230px" :disabled-date="(date) => disabledDate(date, row)" @change="(e) => endTimeChange(e,row)" :disabled=" row.isOver == 1 || formData.isOverProcess == 1" :formatter="dateFormatter" v-model="row.endTime" type="datetime" placeholder="选择结束日期"/>
</el-form-item>
</template>
</el-table-column>
@ -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);

6
mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue
View File

@ -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 @@
<!-- <view class="product-item" v-else-if="item.processDesignType == 'BLUEPRINT_FOUNDRY_TECHNOLOGY'">工艺起止日期：{{item.twoDimDate}} ～ {{item.threeDimDate}} </view> -->
<view class="product-item">最新进度：{{item.progress}}%</view>
<!-- <view class="product-item">最新进度：{{item.progress}}%</view> -->
<!-- <view class="product-item">预计生产日期：{{ item.startTime }} ～ {{ item.entTime }}</view> -->
</view>
<view class="statusText" @click="handleDetail(item)">{{ statusText }}</view>

23
mes-ui/mini-app/src/pages/moJuSheJiReport/moJuSheJiReport-detail.vue
View File

@ -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: '已做时间不能为空!请确认!' })
@ -260,7 +265,9 @@
})
row.isOver = 1;
popup.value?.close()
await submitForm('SAVE', 'OVER');
//更新一下这条数据的状态
}
const handOver = () => {
@ -585,7 +592,7 @@
</view>
</template>
<view class="loading-text" v-else>加载中..</view>
<uni-popup class="popup" ref="popup" :show="showPopup" type="bottom" background-color="#fff">
<uni-popup class="popup" ref="popup" :mask-click="false" type="bottom" background-color="#fff">
<view class="title">
<view class="text">填写信息</view>
<!-- <view class="close" @click="handleClose">X</view> -->