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:
think 2025-01-16 15:20:55 +08:00
commit 9c22d84942
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java
View File

@ -50,9 +50,6 @@ public class OrderYsServiceImpl implements OrderYsService {
public void updateOrderYs(OrderYsSaveReqVO updateReqVO) {
// 校验存在
validateOrderYsExists(updateReqVO.getId());
if (updateReqVO.getCgYishou().compareTo(updateReqVO.getCgYs())>=0){
updateReqVO.setCgTypee(2);
}
// 更新
OrderYsDO updateObj = BeanUtils.toBean(updateReqVO, OrderYsDO.class);
orderYsMapper.updateById(updateObj);

8
mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue
View File

@ -36,7 +36,6 @@
placeholder="请选择"
clearable
class="!w-240px"
disabled
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.HELI_YINGFU_MONEY)"
@ -105,6 +104,13 @@ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成
const submitForm = async () => {
// 校验表单
await formRef.value.validate()
if (formData.value.cgYishou<formData.value.cgYs&&formData.value.cgTypee==2){
message.error("已收金额小于应收金额,回款未完成,请确认")
return
}else if (formData.value.cgYishou>=formData.value.cgYs&&formData.value.cgTypee==1){
message.error("已收金额大于等于应收金额,回款已完成,请确认")
return
}
// 提交请求
formLoading.value = true
try {

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>
<el-button link type="primary" @click="complete(scope.row.id)" v-if="scope.row.status=='2'">
<el-button link type="primary" @click="complete(scope.row.id)" v-if="scope.row.status=='2'||scope.row.status=='1'">
生产完成
</el-button>
<el-dropdown @command="(command) => handleCommand(command, scope.row.id, scope.row.code)">

4
mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue
View File

@ -255,8 +255,8 @@ ref="subFormRef" :model="formData.taskDispatchDetails" :rules="subFormRules"
v-loading="subFormLoading" label-width="0">
<el-table :data="formData.taskDispatchDetails" class="hl-table">
<el-table-column fixed label="序号" align="center" type="index" width="80" />
<el-table-column fixed label="序号名称" align="center" prop="procedureId" width="180">
<template #header> <span class="hl-table_header">*</span>序号名称</template>
<el-table-column fixed label="工序名称" align="center" prop="procedureId" width="180">
<template #header> <span class="hl-table_header">*</span>工序名称</template>
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.procedureId`" :rules="subFormRules.procedureId" class="mb-0px!">
<ProcedureSelect