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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
z 2025-06-06 16:00:37 +08:00
commit ad3d01a10a
8 changed files with 84 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/2d.vue
View File

@ -188,17 +188,27 @@ const getDetailMsg = (row) =>{
if(row.isOverProcess){ if(row.isOverProcess){
//完结的，按计划完成了还是没按计划完成 //完结的，按计划完成了还是没按计划完成
if(row.twoDimDate != null && row.lastDate != null ){ if(row.twoDimDate != null && row.lastDate != null ){
const start = new Date(row.twoDimDate).getTime(); const starttemp = new Date(row.twoDimDate);
starttemp.setHours(23,59,59,999);
const start =starttemp.getTime()
const end = new Date(row.lastDate).getTime(); const end = new Date(row.lastDate).getTime();
const diffTime = Math.abs(end - start); const diffTime = Math.abs(end - start);
var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); var day = Math.floor(diffTime / (1000 * 60 * 60 * 24));
if(row.lastDate > row.twoDimDate){ if(day == 0){
if(row.isDelay == 1 && row.lastDate > row.blankDate){
return '延后' + (day+1) +'天';
}
return '按时完成'
}else{
if(row.lastDate > row.blankDate){
return '延后' + day +'天'; return '延后' + day +'天';
}else if (row.lastDate < row.twoDimDate){ }else if (row.lastDate < row.blankDate){
return '提前' + day +'天'; return '提前' + day +'天';
}else{ }else{
return '按时完成' return '按时完成'
} }
}
}else{ }else{
return '实施中'; return '实施中';
} }

15
mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/3d.vue
View File

@ -238,17 +238,26 @@ const getDetailMsg = (row) =>{
if(row.isOverProcess){ if(row.isOverProcess){
//完结的，按计划完成了还是没按计划完成 //完结的，按计划完成了还是没按计划完成
if(row.threeDimDate != null && row.lastDate != null ){ if(row.threeDimDate != null && row.lastDate != null ){
const start = new Date(row.threeDimDate).getTime(); const starttemp = new Date(row.threeDimDate);
starttemp.setHours(23,59,59,999);
const start =starttemp.getTime()
const end = new Date(row.lastDate).getTime(); const end = new Date(row.lastDate).getTime();
const diffTime = Math.abs(end - start); const diffTime = Math.abs(end - start);
var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); var day = Math.floor(diffTime / (1000 * 60 * 60 * 24));
if(row.lastDate > row.threeDimDate){ if(day == 0){
if(row.isDelay == 1 && row.lastDate > row.blankDate){
return '延后' + (day+1) +'天';
}
return '按时完成'
}else{
if(row.lastDate > row.blankDate){
return '延后' + day +'天'; return '延后' + day +'天';
}else if (row.lastDate < row.threeDimDate){ }else if (row.lastDate < row.blankDate){
return '提前' + day +'天'; return '提前' + day +'天';
}else{ }else{
return '按时完成' return '按时完成'
} }
}
}else{ }else{
return '实施中'; return '实施中';
} }

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

@ -206,10 +206,9 @@ v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)" :key="dict
<el-input <el-input
v-model="formData.delayReason" v-model="formData.delayReason"
:rows="2" :rows="2"
:disabled="!delayDialog" :disabled="!(formData.isOverProcess == null || formData.isOverProcess == 0)"
@blur="(e) => delaySubmit(e)"
type="textarea" type="textarea"
placeholder="输入延期原因后，鼠标点击空白区域自动保存。"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -515,7 +514,7 @@ const beginTimeChange = (e , row) =>{
} }
} }
} }
const delaySubmit = async(event) =>{ const delaySubmit = async() =>{
if(formData.value.delayReason == null || formData.value.delayReason.replaceAll(' ','') == ''){ if(formData.value.delayReason == null || formData.value.delayReason.replaceAll(' ','') == ''){
message.error("延期原因不得为空,请确认!") message.error("延期原因不得为空,请确认!")
return; return;
@ -524,11 +523,14 @@ const delaySubmit = async(event) =>{
formData.value.delayTime = (new Date()).getTime() formData.value.delayTime = (new Date()).getTime()
await submitForm('SAVE'); await submitForm('SAVE');
} }
const openDelay = () =>{ const openDelay = async() =>{
var date = new Date(); var date = new Date();
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 dateT = new Date(formData.value.blankDate)
dateT.setHours(23,59,59,999)
if( dateT.getTime() > date.getTime()){
message.error("当前日期为正常生产周期,未达到延期条件,请确认!") message.error("当前日期为正常生产周期,未达到延期条件,请确认!")
return return
} }
@ -539,7 +541,9 @@ const openDelay = () =>{
} }
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 dateT = new Date(formData.value.blankDate)
dateT.setHours(23,59,59,999)
if(dateT.getTime() > date.getTime()){
message.error("当前日期为正常生产周期,未达到延期条件,请确认!") message.error("当前日期为正常生产周期,未达到延期条件,请确认!")
return return
} }
@ -550,7 +554,9 @@ const openDelay = () =>{
} }
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 dateT = new Date(formData.value.blankDate)
dateT.setHours(23,59,59,999)
if(dateT.getTime() > date.getTime()){
message.error("当前日期为正常生产周期,未达到延期条件,请确认!") message.error("当前日期为正常生产周期,未达到延期条件,请确认!")
return return
} }
@ -562,7 +568,9 @@ const openDelay = () =>{
if(processDesignType.value == 'BLUEPRINT_FOUNDRY_TECHNOLOGY'){ if(processDesignType.value == 'BLUEPRINT_FOUNDRY_TECHNOLOGY'){
if(formData.value.craftEndDate != null ){ if(formData.value.craftEndDate != null ){
if(formData.value.craftEndDate > date.getTime()){ var dateT = new Date(formData.value.blankDate)
dateT.setHours(23,59,59,999)
if(dateT.getTime() > date.getTime()){
message.error("当前日期为正常生产周期,未达到延期条件,请确认!") message.error("当前日期为正常生产周期,未达到延期条件,请确认!")
return return
} }
@ -571,7 +579,7 @@ const openDelay = () =>{
return return
} }
} }
delayDialog.value = true; await delaySubmit()
} }
const overRow = async( row :any) =>{ const overRow = async( row :any) =>{

17
mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/index.vue
View File

@ -206,17 +206,26 @@ const getDetailMsg = (row) =>{
if(row.isOverProcess){ if(row.isOverProcess){
//完结的，按计划完成了还是没按计划完成 //完结的，按计划完成了还是没按计划完成
if(row.craftEndDate != null && row.lastDate != null ){ if(row.craftEndDate != null && row.lastDate != null ){
const start = new Date(row.craftEndDate).getTime(); const starttemp = new Date(row.craftEndDate);
starttemp.setHours(23,59,59,999);
const start =starttemp.getTime()
const end = new Date(row.lastDate).getTime(); const end = new Date(row.lastDate).getTime();
const diffTime = Math.abs(end - start); const diffTime = end - start
var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); var day = Math.floor(diffTime / (1000 * 60 * 60 * 24));
if(row.lastDate > row.craftEndDate){ if(day == 0){
if(row.isDelay == 1 && row.lastDate > row.blankDate){
return '延后' + (day+1) +'天';
}
return '按时完成'
}else{
if(row.lastDate > row.blankDate){
return '延后' + day +'天'; return '延后' + day +'天';
}else if (row.lastDate < row.craftEndDate){ }else if (row.lastDate < row.blankDate){
return '提前' + day +'天'; return '提前' + day +'天';
}else{ }else{
return '按时完成' return '按时完成'
} }
}
}else{ }else{
// return '已完成'; // return '已完成';
} }

11
mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/workblank.vue
View File

@ -187,10 +187,18 @@ const getDetailMsg = (row) =>{
if(row.isOverProcess){ if(row.isOverProcess){
//完结的，按计划完成了还是没按计划完成 //完结的，按计划完成了还是没按计划完成
if(row.blankDate != null && row.lastDate != null ){ if(row.blankDate != null && row.lastDate != null ){
const start = new Date(row.blankDate).getTime(); const starttemp = new Date(row.blankDate);
starttemp.setHours(23,59,59,999);
const start =starttemp.getTime()
const end = new Date(row.lastDate).getTime(); const end = new Date(row.lastDate).getTime();
const diffTime = Math.abs(end - start); const diffTime = Math.abs(end - start);
var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); var day = Math.floor(diffTime / (1000 * 60 * 60 * 24));
if(day == 0){
if(row.isDelay == 1 && row.lastDate > row.blankDate){
return '延后' + (day+1) +'天';
}
return '按时完成'
}else{
if(row.lastDate > row.blankDate){ if(row.lastDate > row.blankDate){
return '延后' + day +'天'; return '延后' + day +'天';
}else if (row.lastDate < row.blankDate){ }else if (row.lastDate < row.blankDate){
@ -198,6 +206,7 @@ const getDetailMsg = (row) =>{
}else{ }else{
return '按时完成' return '按时完成'
} }
}
}else{ }else{
return '实施中'; return '实施中';
} }

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

@ -218,7 +218,7 @@ class="!w-260px" v-model="formData.createTime" type="date" value-format="x"
v-loading="subFormLoading" label-width="0"> v-loading="subFormLoading" label-width="0">
<el-table :data="formData.taskDispatchDetails" height="250" > <el-table :data="formData.taskDispatchDetails" height="250" >
<el-table-column fixed label="外协" align="center" width="100"> <el-table-column fixed label="外协" align="center" width="60">
<template #default="{ row }"> <template #default="{ row }">
<el-checkbox v-model="row.isOutsourcing" @change="handleOutsourcingChange(row)" :disabled="detailDisabled||row.beginProduce != 0 || row.procedureStatus != 0"/> <el-checkbox v-model="row.isOutsourcing" @change="handleOutsourcingChange(row)" :disabled="detailDisabled||row.beginProduce != 0 || row.procedureStatus != 0"/>
</template> </template>
@ -262,15 +262,17 @@ class="!w-260px" v-model="formData.createTime" type="date" value-format="x"
<!-- </el-form-item> --> <!-- </el-form-item> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed label="过程检" align="center" prop="testYn" width="120px" > <el-table-column fixed label="过程检" align="center" prop="testYn" width="78px" >
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<el-form-item :prop="`${$index}.testYns`" class="mb-0px!"> <el-form-item :prop="`${$index}.testYns`" class="mb-0px!">
<el-checkbox v-model="row.checkYns" @change="changeChange(row)" :disabled="detailDisabled||row.beginProduce != 0 || row.procedureStatus != 0" /> <div
style=" display: flex;
justify-content: center;
align-items: center;
width: 100%;">
<el-checkbox v-model="row.checkYns" @change="changeChange(row)" :disabled="detailDisabled||row.beginProduce != 0 || row.procedureStatus != 0" />
<!-- <el-radio-group size="small" :disabled="detailDisabled||row.beginProduce != 0 || row.procedureStatus != 0" v-model="row.testYn" > </div>
<el-radio-button label="N">是</el-radio-button>
<el-radio-button label="Y">否</el-radio-button>
</el-radio-group> -->
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>

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

@ -550,11 +550,11 @@
<view class="product-item">子项目：{{ item.projectSubCode || "" }}</view> <view class="product-item">子项目：{{ item.projectSubCode || "" }}</view>
<view class="product-item">客户名称：{{ item.customerName }}</view> <view class="product-item">客户名称：{{ item.customerName }}</view>
<view class="product-item" v-if="item.processDesignType == 'BLUEPRINT_2D'"> <view class="product-item" v-if="item.processDesignType == 'BLUEPRINT_2D'">
工艺起止日期：{{item.startTwoDimDate}} ～ {{item.twoDimDate}} </view> 工艺起止日期：{{item.startTwoDimDate == null ? '':item.startTwoDimDate.substring(0,10)}} ～ {{item.twoDimDate== null ? '':item.twoDimDate.substring(0,10)}} </view>
<view class="product-item" v-else-if="item.processDesignType == 'BLUEPRINT_3D'"> <view class="product-item" v-else-if="item.processDesignType == 'BLUEPRINT_3D'">
工艺起止日期：{{item.startThreeDimDate}} ～ {{item.threeDimDate}} </view> 工艺起止日期：{{item.startThreeDimDate== null ? '':item.startThreeDimDate.substring(0,10)}} ～ {{item.threeDimDate== null ? '':item.threeDimDate.substring(0,10)}} </view>
<view class="product-item" v-else-if="item.processDesignType == 'BLUEPRINT_WORKBLANK'"> <view class="product-item" v-else-if="item.processDesignType == 'BLUEPRINT_WORKBLANK'">
工艺起止日期：{{item.startBlankDate}} ～ {{item.blankDate}} </view> 工艺起止日期：{{item.startBlankDate== null ? '':item.startBlankDate.substring(0,10)}} ～ {{item.blankDate== null ? '':item.blankDate.substring(0,10)}} </view>
<!-- <view class="product-item" v-else-if="item.processDesignType == 'BLUEPRINT_FOUNDRY_TECHNOLOGY'">工艺起止日期：{{item.twoDimDate}} ～ {{item.threeDimDate}} </view> --> <!-- <view class="product-item" v-else-if="item.processDesignType == 'BLUEPRINT_FOUNDRY_TECHNOLOGY'">工艺起止日期：{{item.twoDimDate}} ～ {{item.threeDimDate}} </view> -->

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

@ -529,14 +529,14 @@
</view> </view>
<view class="product-item">客户名称：{{detailInfo.customerName}}</view> <view class="product-item">客户名称：{{detailInfo.customerName}}</view>
<view class="product-item" v-if="detailInfo.processDesignType== 'BLUEPRINT_2D'"> <view class="product-item" v-if="detailInfo.processDesignType== 'BLUEPRINT_2D'">
工艺起止日期：{{formatDate(detailInfo.startTwoDimDate)}} ～ {{formatDate(detailInfo.twoDimDate)}} 工艺起止日期：{{formatDate(detailInfo.startTwoDimDate) == ''?'':formatDate(detailInfo.startTwoDimDate).substring(0,10)}} ～ {{formatDate(detailInfo.twoDimDate)== ''?'':formatDate(detailInfo.twoDimDate).substring(0,10)}}
</view> </view>
<view class="product-item" v-else-if="detailInfo.processDesignType== 'BLUEPRINT_3D'"> <view class="product-item" v-else-if="detailInfo.processDesignType== 'BLUEPRINT_3D'">
工艺起止日期：{{formatDate(detailInfo.startThreeDimDate)}} ～ 工艺起止日期：{{formatDate(detailInfo.startThreeDimDate)== ''?'':formatDate(detailInfo.startThreeDimDate).substring(0,10)}} ～
{{formatDate(detailInfo.threeDimDate)}} {{formatDate(detailInfo.threeDimDate)== ''?'':formatDate(detailInfo.threeDimDate).substring(0,10)}}
</view> </view>
<view class="product-item" v-else-if="detailInfo.processDesignType== 'BLUEPRINT_WORKBLANK'"> <view class="product-item" v-else-if="detailInfo.processDesignType== 'BLUEPRINT_WORKBLANK'">
工艺起止日期：{{formatDate(detailInfo.startBlankDate)}} ～ {{formatDate(detailInfo.blankDate)}} 工艺起止日期：{{formatDate(detailInfo.startBlankDate)== ''?'':formatDate(detailInfo.startBlankDate).substring(0,10)}} ～ {{formatDate(detailInfo.blankDate)== ''?'':formatDate(detailInfo.blankDate).substring(0,10)}}
</view> </view>
</view> </view>
</view> </view>