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

文档问题修改

Browse Source
This commit is contained in:
z 2025-01-15 15:37:11 +08:00
parent 61a6a66650
commit e67446e0b0
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plan/PlanServiceImpl.java
View File

@ -317,7 +317,7 @@ private TaskReportMapper taskReportMapper;
return false; return false;
} }
for (TaskDispatchDetailDO detailDO : detailDOS) { for (TaskDispatchDetailDO detailDO : detailDOS) {
if (!"2".equals(detailDO.getProcedureStatus())){ if (detailDO.getProcedureStatus()!=2){
return false; return false;
} }
} }

2
mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue
View File

@ -121,7 +121,7 @@
> >
编辑 编辑
</el-button> </el-button>
<el-button <el-button v-if=" scope.row.cgYishou==null"
link link
type="danger" type="danger"
@click="handleDelete(scope.row.id)" @click="handleDelete(scope.row.id)"

8
mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/edit.vue
View File

@ -305,9 +305,9 @@ ref="subBoomPlanFormRef" :model="formData.boomItemDOList" :rules="subBoomPlanFor
<el-table-column prop="currentCount" min-width="180" align="center"> <el-table-column prop="currentCount" min-width="180" align="center">
<template #header><span class="hl-table_header">*</span>本次到货数量</template> <template #header><span class="hl-table_header">*</span>本次到货数量</template>
<template #default="scope"> <template #default="scope">
<el-form-item :prop="`${scope.$index}.currentCount`" class="mb-0px!"> <el-form-item :prop="`${scope.$index}.currentCount`" class="mb-0px!" :rules="subOutSourceMatFormRules.currentCount">
<el-input-number <el-input-number
style="width: 100%" v-model="scope.row.currentCount" placeholder="本次到货数量" :rules="subOutSourceMatFormRules.currentCount" style="width: 100%" v-model="scope.row.currentCount" placeholder="本次到货数量"
@change="handleEstimatedPrice" :min="0" :precision="2" /> @change="handleEstimatedPrice" :min="0" :precision="2" />
</el-form-item> </el-form-item>
</template> </template>
@ -317,9 +317,9 @@ style="width: 100%" v-model="scope.row.currentCount" placeholder="本次到货
<template #header><span class="hl-table_header">*</span>不合格数量</template> <template #header><span class="hl-table_header">*</span>不合格数量</template>
<template #default="scope"> <template #default="scope">
<el-form-item :prop="`${scope.$index}.unqualifiedCount`" class="mb-0px!"> <el-form-item :prop="`${scope.$index}.unqualifiedCount`" class="mb-0px!" :rules="subOutSourceMatFormRules.unqualifiedCount">
<el-input-number <el-input-number
style="width: 100%" v-model="scope.row.unqualifiedCount" placeholder="不合格数量" :rules="subOutSourceMatFormRules.unqualifiedCount" style="width: 100%" v-model="scope.row.unqualifiedCount" placeholder="不合格数量"
@change="handleEstimatedPrice" :min="0" :precision="2" /> @change="handleEstimatedPrice" :min="0" :precision="2" />
</el-form-item> </el-form-item>
</template> </template>

2
mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue
View File

@ -134,7 +134,7 @@
<el-button link type="primary" @click="openForm(scope.row.id)" v-if="scope.row.status!='3'"> <el-button link type="primary" @click="openForm(scope.row.id)" v-if="scope.row.status!='3'">
编辑 编辑
</el-button> </el-button>
<el-button link type="primary" @click="complete(scope.row.id)" v-if="scope.row.status!='3'&& scope.row.status!='4'"> <el-button link type="primary" @click="complete(scope.row.id)" v-if="scope.row.status=='2'">
生产完成 生产完成
</el-button> </el-button>
<el-dropdown @command="(command) => handleCommand(command, scope.row.id, scope.row.code)"> <el-dropdown @command="(command) => handleCommand(command, scope.row.id, scope.row.code)">

10
mes-ui/mes-ui-admin-vue3/src/views/heli/plan/planSchedule.vue
View File

@ -204,7 +204,15 @@ const getList = async () => {
} }
} }
const tableRowClassName = ({ row }) => { const tableRowClassName = ({ row }) => {
if (row.wgType!=2&&row.endTime<new Date()){ var endTime = new Date(row.endTime);
// 获取当前时间的 Date 对象
var currentTime = new Date();
// 将 endTime 和 currentTime 的时间部分设置为零
endTime.setHours(0, 0, 0, 0);
currentTime.setHours(0, 0, 0, 0);
if (row.wgType!=2&&endTime < currentTime){
return 'warning-row'; return 'warning-row';
}else { }else {
return '' return ''