调整物料需求列表UI

调整物料需求列表UI
pull/4/head
siontion 8 months ago
parent a972cf272a
commit 9bc78d239f

@ -1,46 +0,0 @@
import request from '@/config/axios'
export interface PlanSubVO {
id: number
projectPlanId: number
projectId: number
projectSubId: number
mouldId: number
equipId: number
blankDate: Date
blankOwner: string
twoDimDate: Date
twoDimOwner: string
threeDimDate: Date
threeDimOwner: string
}
// 查询生产计划子项目分页
export const getPlanSubPage = async (params) => {
return await request.get({ url: `/heli/plan-sub/page`, params })
}
// 查询生产计划子项目详情
export const getPlanSub = async (id: number) => {
return await request.get({ url: `/heli/plan-sub/get?id=` + id })
}
// 新增生产计划子项目
export const createPlanSub = async (data: PlanSubVO) => {
return await request.post({ url: `/heli/plan-sub/create`, data })
}
// 修改生产计划子项目
export const updatePlanSub = async (data: PlanSubVO) => {
return await request.put({ url: `/heli/plan-sub/update`, data })
}
// 删除生产计划子项目
export const deletePlanSub = async (id: number) => {
return await request.delete({ url: `/heli/plan-sub/delete?id=` + id })
}
// 导出生产计划子项目 Excel
export const exportPlanSub = async (params) => {
return await request.download({ url: `/heli/plan-sub/export-excel`, params })
}

@ -1,155 +0,0 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="计划id" prop="projectPlanId">
<el-input v-model="formData.projectPlanId" placeholder="请输入计划id" />
</el-form-item>
<el-form-item label="项目id" prop="projectId">
<el-input v-model="formData.projectId" placeholder="请输入项目id" />
</el-form-item>
<el-form-item label="子项目id" prop="projectSubId">
<el-input v-model="formData.projectSubId" placeholder="请输入子项目id" />
</el-form-item>
<el-form-item label="模具类型id" prop="mouldId">
<el-input v-model="formData.mouldId" placeholder="请输入模具类型id" />
</el-form-item>
<el-form-item label="设备id" prop="equipId">
<el-input v-model="formData.equipId" placeholder="请输入设备id" />
</el-form-item>
<el-form-item label="毛坯结束日期" prop="blankDate">
<el-date-picker
v-model="formData.blankDate"
type="date"
value-format="x"
placeholder="选择毛坯结束日期"
/>
</el-form-item>
<el-form-item label="毛坯负责人" prop="blankOwner">
<el-input v-model="formData.blankOwner" placeholder="请输入毛坯负责人" />
</el-form-item>
<el-form-item label="2D结束日期" prop="twoDimDate">
<el-date-picker
v-model="formData.twoDimDate"
type="date"
value-format="x"
placeholder="选择2D结束日期"
/>
</el-form-item>
<el-form-item label="2D负责人" prop="twoDimOwner">
<el-input v-model="formData.twoDimOwner" placeholder="请输入2D负责人" />
</el-form-item>
<el-form-item label="3D结束日期" prop="threeDimDate">
<el-date-picker
v-model="formData.threeDimDate"
type="date"
value-format="x"
placeholder="选择3D结束日期"
/>
</el-form-item>
<el-form-item label="3D负责人" prop="threeDimOwner">
<el-input v-model="formData.threeDimOwner" placeholder="请输入3D负责人" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import * as PlanSubApi from '@/api/heli/plansub'
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
projectPlanId: undefined,
projectId: undefined,
projectSubId: undefined,
mouldId: undefined,
equipId: undefined,
blankDate: undefined,
blankOwner: undefined,
twoDimDate: undefined,
twoDimOwner: undefined,
threeDimDate: undefined,
threeDimOwner: undefined,
})
const formRules = reactive({
projectPlanId: [{ required: true, message: '计划id不能为空', trigger: 'blur' }],
projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }],
})
const formRef = ref() // Ref
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
//
if (id) {
formLoading.value = true
try {
formData.value = await PlanSubApi.getPlanSub(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as PlanSubApi.PlanSubVO
if (formType.value === 'create') {
await PlanSubApi.createPlanSub(data)
message.success(t('common.createSuccess'))
} else {
await PlanSubApi.updatePlanSub(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
projectPlanId: undefined,
projectId: undefined,
projectSubId: undefined,
mouldId: undefined,
equipId: undefined,
blankDate: undefined,
blankOwner: undefined,
twoDimDate: undefined,
twoDimOwner: undefined,
threeDimDate: undefined,
threeDimOwner: undefined,
}
formRef.value?.resetFields()
}
</script>

@ -1,330 +0,0 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="自增字段,唯一" prop="id">
<el-input
v-model="queryParams.id"
placeholder="请输入自增字段,唯一"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="计划id" prop="projectPlanId">
<el-input
v-model="queryParams.projectPlanId"
placeholder="请输入计划id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="项目id" prop="projectId">
<el-input
v-model="queryParams.projectId"
placeholder="请输入项目id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="子项目id" prop="projectSubId">
<el-input
v-model="queryParams.projectSubId"
placeholder="请输入子项目id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="模具类型id" prop="mouldId">
<el-input
v-model="queryParams.mouldId"
placeholder="请输入模具类型id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="设备id" prop="equipId">
<el-input
v-model="queryParams.equipId"
placeholder="请输入设备id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="毛坯结束日期" prop="blankDate">
<el-date-picker
v-model="queryParams.blankDate"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="毛坯负责人" prop="blankOwner">
<el-input
v-model="queryParams.blankOwner"
placeholder="请输入毛坯负责人"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="2D结束日期" prop="twoDimDate">
<el-date-picker
v-model="queryParams.twoDimDate"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="2D负责人" prop="twoDimOwner">
<el-input
v-model="queryParams.twoDimOwner"
placeholder="请输入2D负责人"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="3D结束日期" prop="threeDimDate">
<el-date-picker
v-model="queryParams.threeDimDate"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="3D负责人" prop="threeDimOwner">
<el-input
v-model="queryParams.threeDimOwner"
placeholder="请输入3D负责人"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['heli:plan-sub:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['heli:plan-sub:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="自增字段,唯一" align="center" prop="id" />
<el-table-column label="计划id" align="center" prop="projectPlanId" />
<el-table-column label="项目id" align="center" prop="projectId" />
<el-table-column label="子项目id" align="center" prop="projectSubId" />
<el-table-column label="模具类型id" align="center" prop="mouldId" />
<el-table-column label="设备id" align="center" prop="equipId" />
<el-table-column
label="毛坯结束日期"
align="center"
prop="blankDate"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="毛坯负责人" align="center" prop="blankOwner" />
<el-table-column
label="2D结束日期"
align="center"
prop="twoDimDate"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="2D负责人" align="center" prop="twoDimOwner" />
<el-table-column
label="3D结束日期"
align="center"
prop="threeDimDate"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="3D负责人" align="center" prop="threeDimOwner" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['heli:plan-sub:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['heli:plan-sub:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<PlanSubForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import * as PlanSubApi from '@/api/heli/plansub'
import PlanSubForm from './PlanSubForm.vue'
defineOptions({ name: 'PlanSub' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
id: undefined,
projectPlanId: undefined,
projectId: undefined,
projectSubId: undefined,
mouldId: undefined,
equipId: undefined,
blankDate: [],
blankOwner: undefined,
twoDimDate: [],
twoDimOwner: undefined,
threeDimDate: [],
threeDimOwner: undefined,
createTime: [],
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await PlanSubApi.getPlanSubPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await PlanSubApi.deletePlanSub(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await PlanSubApi.exportPlanSub(queryParams)
download.excel(data, '生产计划子项目.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>

@ -1,134 +1,37 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="自增字段,唯一" prop="id">
<el-input
v-model="queryParams.id"
placeholder="请输入自增字段,唯一"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<el-form-item label="物料计划单号" prop="projectMaterialPlanNo">
<el-input
v-model="queryParams.projectMaterialPlanNo"
placeholder="请输入物料计划单号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="订单id" prop="projectId">
<el-input
v-model="queryParams.projectId"
placeholder="请输入订单id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="生产计划id" prop="projectPlanId">
<el-input
v-model="queryParams.projectPlanId"
placeholder="请输入生产计划id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-input v-model="queryParams.projectMaterialPlanNo" placeholder="物料计划单号" clearable @keyup.enter="handleQuery"
class="!w-240px" />
</el-form-item>
<el-form-item label="送审人" prop="submitUserId">
<el-input
v-model="queryParams.submitUserId"
placeholder="请输入送审人"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-form-item label="单据日期" prop="createTime">
<el-date-picker class="!w-265px" v-model="queryParams.createTime" type="date" value-format="x"
placeholder="单据日期" />
</el-form-item>
<el-form-item label="送审时间" prop="submitTime">
<el-date-picker
v-model="queryParams.submitTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
<el-form-item label="生产计划单号" prop="planNo">
<el-input v-model="queryParams.planNo" placeholder="生产计划单号" clearable @keyup.enter="handleQuery"
class="!w-240px" />
</el-form-item>
<el-form-item label="审核人" prop="auditor">
<el-input
v-model="queryParams.auditor"
placeholder="请输入审核人"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="queryParams.projectName" placeholder="项目名称" clearable @keyup.enter="handleQuery" class="!w-250px" />
</el-form-item>
<el-form-item label="审核时间" prop="auditTime">
<el-date-picker
v-model="queryParams.auditTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态,1已保存2已送审3已审核4已打回 默认是1" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态,1已保存2已送审3已审核4已打回 默认是1"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_MATERIAL_PLAN_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="下拉选择" clearable class="!w-240px">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_MATERIAL_PLAN_STATUS)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['heli:material-plan:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
<el-button @click="handleQuery">
<Icon icon="ep:search" class="mr-5px" /> 搜索
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['heli:material-plan:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
<el-button @click="resetQuery">
<Icon icon="ep:refresh" class="mr-5px" /> 重置
</el-button>
<el-button type="primary" plain @click="openForm('create')">
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
</el-form-item>
</el-form>
@ -137,67 +40,38 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="自增字段,唯一" align="center" prop="id" />
<el-table-column label="物料计划单号" align="center" prop="projectMaterialPlanNo" />
<el-table-column label="订单id" align="center" prop="projectId" />
<el-table-column label="生产计划id" align="center" prop="projectPlanId" />
<el-table-column label="物料需求计划单号" align="center" prop="projectMaterialPlanNo" />
<el-table-column label="单据日期" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
<el-table-column label="生产计划单号" align="center" prop="planNo" />
<el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="备注" align="center" prop="description" />
<el-table-column label="创建人" align="center" prop="creator" />
<el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
<el-table-column label="送审人" align="center" prop="submitUserId" />
<el-table-column
label="送审时间"
align="center"
prop="submitTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="送审时间" align="center" prop="submitTime" :formatter="dateFormatter" width="180px" />
<el-table-column label="审核人" align="center" prop="auditor" />
<el-table-column
label="审核时间"
align="center"
prop="auditTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="状态,1已保存2已送审3已审核4已打回 默认是1" align="center" prop="status">
<el-table-column label="审核时间" align="center" prop="auditTime" :formatter="dateFormatter" width="180px" />
<el-table-column label="单据状态" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_PROJECT_MATERIAL_PLAN_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="description" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['heli:material-plan:update']"
>
<el-button link type="primary" @click="openForm('update', scope.row.id)">
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['heli:material-plan:delete']"
>
删除
<el-button link type="primary" @click="openForm('review',scope.row.id)" >
查看详情
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" />
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
@ -277,7 +151,7 @@ const handleDelete = async (id: number) => {
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
} catch { }
}
/** 导出按钮操作 */

Loading…
Cancel
Save