add mold product

main
chenyuan 2 years ago
parent 34f569d747
commit 875abf306b

@ -71,5 +71,32 @@ export const MoldBrandApi = {
// 获得模具
getMold: async (id: number) => {
return await request.get({ url: `/erp/mold-brand/mold/get?id=` + id })
},
// ==================== 子表(模具产品) ====================
// 获得模具产品分页
getMoldBrandProductPage: async (params) => {
return await request.get({ url: `/erp/mold-brand/mold-brand-product/page`, params })
},
// 新增模具产品
createMoldBrandProduct: async (data) => {
return await request.post({ url: `/erp/mold-brand/mold-brand-product/create`, data })
},
// 修改模具产品
updateMoldBrandProduct: async (data) => {
return await request.put({ url: `/erp/mold-brand/mold-brand-product/update`, data })
},
// 删除模具产品
deleteMoldBrandProduct: async (id: number) => {
return await request.delete({ url: `/erp/mold-brand/mold-brand-product/delete?id=` + id })
},
// 获得模具产品
getMoldBrandProduct: async (id: number) => {
return await request.get({ url: `/erp/mold-brand/mold-brand-product/get?id=` + id })
}
}
}

@ -16,24 +16,19 @@
<el-form-item label="规格" prop="moldType">
<el-input v-model="formData.moldType" placeholder="请输入规格" />
</el-form-item>
<el-form-item label="产品" prop="productId">
<el-select
v-model="formData.productId"
clearable
filterable
placeholder="请选择产品"
class="!w-1/1"
>
<el-form-item label="工序" prop="orgType">
<el-select v-model="formData.orgType" placeholder="请选择工序">
<el-option
v-for="item in productList"
:key="item.id"
:label="item.name"
:value="item.id"
v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="模具系数" prop="moldSize">
<el-input v-model="formData.moldSize" placeholder="请输入模具系数" />
<el-form-item label="出模数" prop="moldSize">
<el-input v-model="formData.moldSize" placeholder="请输入出模数" />
</el-form-item>
<el-form-item label="预期寿命" prop="useTime">
<el-input-number
@ -75,7 +70,7 @@
</Dialog>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
import { getIntDictOptions, DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import { MoldBrandApi, MoldBrandVO } from '@/api/erp/mold'
import { ProductApi, ProductVO } from '@/api/erp/product/product'
/** 模具型号 表单 */
@ -106,7 +101,7 @@ const formRules = reactive({
name: [{ required: true, message: '型号名称不能为空', trigger: 'blur' }],
moldType: [{ required: true, message: '规格不能为空', trigger: 'blur' }],
productId: [{ required: true, message: '产品ID不能为空', trigger: 'blur' }],
moldSize: [{ required: true, message: '具系数不能为空', trigger: 'blur' }]
moldSize: [{ required: true, message: '模数不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref

@ -0,0 +1,114 @@
<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="产品" prop="productId">
<el-select
v-model="formData.productId"
clearable
filterable
placeholder="请选择产品"
class="!w-1/1"
>
<el-option
v-for="item in productList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注"/>
</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 {MoldBrandApi} from '@/api/erp/mold'
import {ProductApi, ProductVO} from "@/api/erp/product/product";
const productList = ref<ProductVO[]>([]) //
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,
brandId: undefined,
productId: undefined,
remark: undefined
})
const formRules = reactive({
brandId: [{required: true, message: '模具型号不能为空', trigger: 'blur'}],
productId: [{required: true, message: '产品不能为空', trigger: 'blur'}]
})
const formRef = ref() // Ref
/** 打开弹窗 */
const open = async (type: string, id?: number, brandId: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
formData.value.brandId = brandId
//
if (id) {
formLoading.value = true
try {
formData.value = await MoldBrandApi.getMoldBrandProduct(id)
} finally {
formLoading.value = false
}
}
//
productList.value = await ProductApi.getMesProductSimpleList()
}
defineExpose({open}) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value
if (formType.value === 'create') {
await MoldBrandApi.createMoldBrandProduct(data)
message.success(t('common.createSuccess'))
} else {
await MoldBrandApi.updateMoldBrandProduct(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
brandId: undefined,
productId: undefined,
remark: undefined
}
formRef.value?.resetFields()
}
</script>

@ -0,0 +1,129 @@
<template>
<!-- 列表 -->
<ContentWrap>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['erp:mold-brand:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="产品" align="left" prop="productName" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
disabled
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['erp:mold-brand:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['erp:mold-brand: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>
<!-- 表单弹窗添加/修改 -->
<MoldBrandProductForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import { MoldBrandApi } from '@/api/erp/mold'
import MoldBrandProductForm from './MoldBrandProductForm.vue'
const { t } = useI18n() //
const message = useMessage() //
const props = defineProps<{
brandId?: number // ID
}>()
const loading = ref(false) //
const list = ref([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
brandId: undefined as unknown
})
/** 监听主表的关联字段的变化,加载对应的子表数据 */
watch(
() => props.brandId,
(val: number) => {
if (!val) {
return
}
queryParams.brandId = val
handleQuery()
},
{ immediate: true, deep: true }
)
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await MoldBrandApi.getMoldBrandProductPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
if (!props.brandId) {
message.error('请选择一个模具型号')
return
}
formRef.value.open(type, id, props.brandId)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await MoldBrandApi.deleteMoldBrandProduct(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
</script>

@ -11,10 +11,10 @@
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="模具编码" align="center" prop="code" width="150px"/>
<el-table-column label="模具名称" align="center" prop="name" />
<el-table-column label="模具名称" align="left" prop="name" />
<el-table-column label="单位" align="center" prop="unitName" />
<el-table-column label="机台" align="center" prop="machineId" />
<el-table-column label="使用时间(小时)" align="center" prop="useTime" />
<el-table-column label="使用时间/小时" align="center" prop="useTime" />
<el-table-column
label="入库时间"
align="center"

@ -113,9 +113,13 @@
@current-change="handleCurrentChange"
>
<el-table-column label="型号编码" align="center" prop="code" width="150px" />
<el-table-column label="型号名称" align="center" prop="name" width="130px"/>
<el-table-column label="型号名称" align="left" prop="name" width="130px"/>
<el-table-column label="规格" align="center" prop="moldType" />
<el-table-column label="产品" align="center" prop="productName" />
<el-table-column label="工序" align="center" prop="orgType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.orgType" />
</template>
</el-table-column>
<el-table-column label="预期寿命/h" align="center" prop="useTime" />
<el-table-column label="维保模式" align="center" prop="maintainType">
<template #default="scope">
@ -123,7 +127,7 @@
</template>
</el-table-column>
<el-table-column label="维保周期" align="center" prop="maintainTime" />
<el-table-column label="具系数" align="center" prop="moldSize" />
<el-table-column label="模数" align="center" prop="moldSize" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column
@ -171,6 +175,9 @@
<el-tab-pane label="模具" name="mold">
<MoldList :brand-id="currentRow.id" />
</el-tab-pane>
<el-tab-pane label="产品" name="moldBrandProduct">
<MoldBrandProductList :brand-id="currentRow.id" />
</el-tab-pane>
</el-tabs>
</ContentWrap>
</template>
@ -183,6 +190,7 @@ import { MoldBrandApi, MoldBrandVO } from '@/api/erp/mold'
import MoldBrandForm from './MoldBrandForm.vue'
import MoldList from './components/MoldList.vue'
import { ProductApi, ProductVO } from '@/api/erp/product/product'
import MoldBrandProductList from './components/MoldBrandProductList.vue'
/** 模具型号 列表 */
defineOptions({ name: 'MoldBrand' })

Loading…
Cancel
Save