Compare commits

...

3 Commits

Author SHA1 Message Date
zxy
4f0b5cca6a 抛异常代码改造 2026-01-15 09:58:39 +08:00
zxy
ee04fad814 刷新刷新 2026-01-15 09:58:39 +08:00
zxy
ac0035172c 调整自动顺序 2026-01-15 09:58:39 +08:00
3 changed files with 11 additions and 6 deletions

View File

@ -68,6 +68,7 @@ flowable:
mybatis-plus:
configuration:
map-underscore-to-camel-case: true # 虽然默认为 true ,但是还是显示去指定下。
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
global-config:
db-config:
id-type: NONE # “智能”模式,基于 IdTypeEnvironmentPostProcessor + 数据源的类型,自动适配成 AUTO、INPUT 模式。

View File

@ -1,5 +1,5 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<Dialog :title="dialogTitle" v-model="dialogVisible" @close="emits">
<el-form
ref="formRef"
:model="formData"
@ -19,7 +19,7 @@
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
<el-button @click="emits"> </el-button>
</template>
</Dialog>
</template>
@ -70,6 +70,11 @@ const open = async (type: string, id?: number) => {
}
}
}
const emits = async () => {
dialogVisible.value = false
emit('success')
}
defineExpose({ open }) // open
/** 提交表单 */

View File

@ -105,10 +105,6 @@
<el-table-column label="零件名称" align="center" prop="materialName" width="180" />
<!-- <el-table-column label="规格型号" align="center" prop="spec" width="160" />-->
<el-table-column label="报工人" align="center" prop="ownerName" />
<el-table-column label="报工工序" align="center" prop="procedureName" width="160" />
<el-table-column label="报工工时" align="center" prop="workTime" width="160" />
<el-table-column label="报工数量" align="center" prop="amount" width="120" />
<el-table-column label="报工进度" align="center" prop="reportProcess" width="160">
<template #default="scope">
<el-tag v-if="scope.row.procedureStatus === '1'" type="warning">已报工</el-tag>
@ -116,6 +112,9 @@
<el-tag v-else>未报工</el-tag>
</template>
</el-table-column>
<el-table-column label="报工工序" align="center" prop="procedureName" width="160" />
<el-table-column label="报工工时" align="center" prop="workTime" width="160" />
<el-table-column label="报工数量" align="center" prop="amount" width="120" />
<!-- <el-table-column-->
<!-- label="生产起止时间"-->
<!-- align="center"-->