Compare commits
3 Commits
f34167b876
...
4f0b5cca6a
| Author | SHA1 | Date | |
|---|---|---|---|
| 4f0b5cca6a | |||
| ee04fad814 | |||
| ac0035172c |
@ -68,6 +68,7 @@ flowable:
|
|||||||
mybatis-plus:
|
mybatis-plus:
|
||||||
configuration:
|
configuration:
|
||||||
map-underscore-to-camel-case: true # 虽然默认为 true ,但是还是显示去指定下。
|
map-underscore-to-camel-case: true # 虽然默认为 true ,但是还是显示去指定下。
|
||||||
|
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
|
||||||
global-config:
|
global-config:
|
||||||
db-config:
|
db-config:
|
||||||
id-type: NONE # “智能”模式,基于 IdTypeEnvironmentPostProcessor + 数据源的类型,自动适配成 AUTO、INPUT 模式。
|
id-type: NONE # “智能”模式,基于 IdTypeEnvironmentPostProcessor + 数据源的类型,自动适配成 AUTO、INPUT 模式。
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<Dialog :title="dialogTitle" v-model="dialogVisible">
|
<Dialog :title="dialogTitle" v-model="dialogVisible" @close="emits">
|
||||||
<el-form
|
<el-form
|
||||||
ref="formRef"
|
ref="formRef"
|
||||||
:model="formData"
|
:model="formData"
|
||||||
@ -19,7 +19,7 @@
|
|||||||
</el-form>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
||||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
<el-button @click="emits">取 消</el-button>
|
||||||
</template>
|
</template>
|
||||||
</Dialog>
|
</Dialog>
|
||||||
</template>
|
</template>
|
||||||
@ -70,6 +70,11 @@ const open = async (type: string, id?: number) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
const emits = async () => {
|
||||||
|
dialogVisible.value = false
|
||||||
|
emit('success')
|
||||||
|
}
|
||||||
|
|
||||||
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
|
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
|
||||||
|
|
||||||
/** 提交表单 */
|
/** 提交表单 */
|
||||||
|
|||||||
@ -105,10 +105,6 @@
|
|||||||
<el-table-column label="零件名称" align="center" prop="materialName" width="180" />
|
<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="spec" width="160" />-->
|
||||||
<el-table-column label="报工人" align="center" prop="ownerName" />
|
<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">
|
<el-table-column label="报工进度" align="center" prop="reportProcess" width="160">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-tag v-if="scope.row.procedureStatus === '1'" type="warning">已报工</el-tag>
|
<el-tag v-if="scope.row.procedureStatus === '1'" type="warning">已报工</el-tag>
|
||||||
@ -116,6 +112,9 @@
|
|||||||
<el-tag v-else>未报工</el-tag>
|
<el-tag v-else>未报工</el-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</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-->
|
<!-- <el-table-column-->
|
||||||
<!-- label="生产起止时间"-->
|
<!-- label="生产起止时间"-->
|
||||||
<!-- align="center"-->
|
<!-- align="center"-->
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user