yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改部分不合理的设定

pull/744/head
没钱 2025-03-07 14:59:54 +08:00
parent 6cb2ea9645
commit 96f2291263
7 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/dict.ts
View File

@ -219,6 +219,8 @@ export enum DICT_TYPE {
ERP_PRODUCT_FAULT_PART = 'erp_product_fault_part', // 产品的故障部位 ERP_PRODUCT_FAULT_PART = 'erp_product_fault_part', // 产品的故障部位
ERP_FILE_ORDER_TYPE = 'erp_file_order_type', // 文件单据类型 ERP_FILE_ORDER_TYPE = 'erp_file_order_type', // 文件单据类型
ERP_ORDER_PRE_STATUS = 'erp_order_pre_status', // 订单预报价单状态 ERP_ORDER_PRE_STATUS = 'erp_order_pre_status', // 订单预报价单状态
ERP_PRODUCT_PROPERTIES_CATEGORY = 'erp_product_properties_category', // 产品属性的分类
// ========== AI - 人工智能模块 ========== // ========== AI - 人工智能模块 ==========
AI_PLATFORM = 'ai_platform', // AI 平台 AI_PLATFORM = 'ai_platform', // AI 平台

8
src/views/erp/product/category/erpproductcategoryfault/ProductCategoryFaultForm.vue
View File

@ -7,9 +7,9 @@
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="类别" prop="productCategoryId"> <el-form-item label="产品分类" prop="productCategoryId">
<!-- 普通显示 --> <!-- 普通显示 -->
<el-select v-model="formData.productCategoryId" placeholder="请选择类别" @change="limitFaultPart" disabled filterable clearable> <el-select v-model="formData.productCategoryId" placeholder="请选择产品分类" @change="limitFaultPart" disabled filterable clearable>
<el-option v-for="item in productCategoryList" :key="item.id" :label="item.name" :value="item.id" /> <el-option v-for="item in productCategoryList" :key="item.id" :label="item.name" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -110,7 +110,7 @@ const formData = ref({
affectRecycleMoney: undefined affectRecycleMoney: undefined
}) })
const formRules = reactive({ const formRules = reactive({
productCategoryId: [{ required: true, message: '类别不能为空', trigger: 'blur' }], productCategoryId: [{ required: true, message: '产品分类不能为空', trigger: 'blur' }],
productFaultPart: [{ required: true, message: '故障部位不能为空', trigger: 'change' }], productFaultPart: [{ required: true, message: '故障部位不能为空', trigger: 'change' }],
productFault: [{ required: true, message: '具体故障不能为空', trigger: 'blur' }] productFault: [{ required: true, message: '具体故障不能为空', trigger: 'blur' }]
}) })
@ -184,7 +184,7 @@ const resetForm = () => {
formRef.value?.resetFields() formRef.value?.resetFields()
} }
/** 获取现在的类别id，通过类别id查询类别部位数组 */ /** 获取现在的产品分类id，通过产品分类id查询产品分类部位数组 */
const limitFaultPart = (productCategoryId: number) => { const limitFaultPart = (productCategoryId: number) => {
if (productCategoryId) { if (productCategoryId) {
// 清空故障部位 // 清空故障部位

12
src/views/erp/product/category/erpproductcategoryfault/index.vue
View File

@ -8,10 +8,10 @@
:inline="true" :inline="true"
label-width="68px" label-width="68px"
> >
<el-form-item label="类别" prop="productCategoryId"> <el-form-item label="产品分类" prop="productCategoryId">
<el-select <el-select
v-model="queryParams.productCategoryId" v-model="queryParams.productCategoryId"
placeholder="请选择类别" placeholder="请选择产品分类"
disabled disabled
clearable clearable
class="!w-240px" class="!w-240px"
@ -153,7 +153,7 @@
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <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="id" />
<el-table-column label="类别" align="center" prop="productCategoryId"> <el-table-column label="产品分类" align="center" prop="productCategoryId">
<template #default="scope"> <template #default="scope">
{{ getCategoryName(scope.row.productCategoryId) }} {{ getCategoryName(scope.row.productCategoryId) }}
</template> </template>
@ -323,7 +323,7 @@ const handleExport = async () => {
} }
} }
/** 根据用户输入搜索类别 */ /** 根据用户输入搜索产品分类 */
const searchProductCategory = async () => { const searchProductCategory = async () => {
//构建param对象 //构建param对象
const params = { const params = {
@ -336,11 +336,11 @@ const searchProductCategory = async () => {
} }
} }
/** 根据 productCategoryId 获取类别名称 */ /** 根据 productCategoryId 获取产品分类名称 */
const getCategoryName = (id: number | undefined) => { const getCategoryName = (id: number | undefined) => {
if (!id) return '' if (!id) return ''
const category = productCategoryList.value.find(item => item.id === id) const category = productCategoryList.value.find(item => item.id === id)
return category ? category.name : '' // 假设类别名称字段为 name return category ? category.name : '' // 假设产品分类名称字段为 name
} }
/** 初始化 **/ /** 初始化 **/

6
src/views/erp/product/category/productcategorypart/ProductCategoryPartForm.vue
View File

@ -7,8 +7,8 @@
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="类别" prop="productCategoryId"> <el-form-item label="产品分类" prop="productCategoryId">
<el-select v-model="formData.productCategoryId" placeholder="请选择类别" disabled filterable clearable> <el-select v-model="formData.productCategoryId" placeholder="请选择产品分类" disabled filterable clearable>
<el-option <el-option
v-for="item in productCategoryList" v-for="item in productCategoryList"
:key="item.id" :key="item.id"
@ -64,7 +64,7 @@ const formData = ref({
productFaultPart: undefined productFaultPart: undefined
}) })
const formRules = reactive({ const formRules = reactive({
productCategoryId: [{ required: true, message: '类别不能为空', trigger: 'change' }], productCategoryId: [{ required: true, message: '产品分类不能为空', trigger: 'change' }],
productFaultPart: [{ required: true, message: '部位不能为空', trigger: 'change' }] productFaultPart: [{ required: true, message: '部位不能为空', trigger: 'change' }]
}) })
const formRef = ref() // 表单 Ref const formRef = ref() // 表单 Ref

12
src/views/erp/product/category/productcategorypart/index.vue
View File

@ -8,10 +8,10 @@
:inline="true" :inline="true"
label-width="68px" label-width="68px"
> >
<el-form-item label="类别" prop="productCategoryId"> <el-form-item label="产品分类" prop="productCategoryId">
<el-select <el-select
v-model="queryParams.productCategoryId" v-model="queryParams.productCategoryId"
placeholder="请选择类别" placeholder="请选择产品分类"
disabled disabled
clearable clearable
class="!w-240px" class="!w-240px"
@ -78,7 +78,7 @@
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <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="id" />
<el-table-column label="类别" align="center" prop="productCategoryId"> <el-table-column label="产品分类" align="center" prop="productCategoryId">
<template #default="scope"> <template #default="scope">
{{ getCategoryName(scope.row.productCategoryId) }} {{ getCategoryName(scope.row.productCategoryId) }}
</template> </template>
@ -224,7 +224,7 @@ const handleExport = async () => {
} }
} }
/** 根据用户输入搜索类别 */ /** 根据用户输入搜索产品分类 */
const searchProductCategory = async () => { const searchProductCategory = async () => {
//构建param对象 //构建param对象
const params = { const params = {
@ -237,11 +237,11 @@ const searchProductCategory = async () => {
} }
} }
/** 根据 productCategoryId 获取类别名称 */ /** 根据 productCategoryId 获取产品分类名称 */
const getCategoryName = (id: number | undefined) => { const getCategoryName = (id: number | undefined) => {
if (!id) return '' if (!id) return ''
const category = productCategoryList.value.find(item => item.id === id) const category = productCategoryList.value.find(item => item.id === id)
return category ? category.name : '' // 假设类别名称字段为 name return category ? category.name : '' // 假设产品分类名称字段为 name
} }
/** 初始化 **/ /** 初始化 **/
onMounted(() => { onMounted(() => {

16
src/views/erp/product/category/productcategoryproperties/ProductCategoryPropertiesForm.vue
View File

@ -7,8 +7,8 @@
label-width="100px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="所属分类" prop="productCategoryId"> <el-form-item label="产品分类" prop="productCategoryId">
<el-select v-model="formData.productCategoryId" disabled placeholder="请选择所属分类"> <el-select v-model="formData.productCategoryId" disabled placeholder="请选择产品分类">
<el-option <el-option
v-for="dict in productCategoryList" v-for="dict in productCategoryList"
@ -45,10 +45,10 @@
/> />
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="配件" prop="ifAttachment"> <el-form-item label="属性分类" prop="productPropertiesCategory">
<el-radio-group v-model="formData.ifAttachment"> <el-radio-group v-model="formData.productPropertiesCategory">
<el-radio <el-radio
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" v-for="dict in getBoolDictOptions(DICT_TYPE.ERP_PRODUCT_PROPERTIES_CATEGORY)"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
@ -101,14 +101,14 @@ const formData = ref({
productPropertiesEn: undefined, productPropertiesEn: undefined,
productPropertiesCn: undefined, productPropertiesCn: undefined,
ifRequired: undefined, ifRequired: undefined,
ifAttachment: undefined, productPropertiesCategory: undefined,
ifSn: undefined ifSn: undefined
}) })
const formRules = reactive({ const formRules = reactive({
productCategoryId: [{ required: true, message: '类别属性不能为空', trigger: 'change' }], productCategoryId: [{ required: true, message: '类别属性不能为空', trigger: 'change' }],
ifSingleProperty: [{ required: true, message: '单数属性不能为空', trigger: 'blur' }], ifSingleProperty: [{ required: true, message: '单数属性不能为空', trigger: 'blur' }],
ifRequired: [{ required: true, message: '必填不能为空', trigger: 'change' }], ifRequired: [{ required: true, message: '必填不能为空', trigger: 'change' }],
ifAttachment: [{ required: true, message: '配件不能为空', trigger: 'change' }], productPropertiesCategory: [{ required: true, message: '属性分类不能为空', trigger: 'change' }],
ifSn: [{ required: true, message: '记录sn不能为空', trigger: 'blur' }], ifSn: [{ required: true, message: '记录sn不能为空', trigger: 'blur' }],
productPropertiesCn : [{ required: true, message: '属性中文不能为空', trigger: 'blur' }], productPropertiesCn : [{ required: true, message: '属性中文不能为空', trigger: 'blur' }],
productPropertiesEn : [{ required: true, message: '属性英文不能为空', trigger: 'blur' }] productPropertiesEn : [{ required: true, message: '属性英文不能为空', trigger: 'blur' }]
@ -169,7 +169,7 @@ const resetForm = () => {
productPropertiesEn: undefined, productPropertiesEn: undefined,
productPropertiesCn: undefined, productPropertiesCn: undefined,
ifRequired: undefined, ifRequired: undefined,
ifAttachment: undefined, productPropertiesCategory: undefined,
ifSn: undefined ifSn: undefined
} }
formRef.value?.resetFields() formRef.value?.resetFields()

16
src/views/erp/product/category/productcategoryproperties/index.vue
View File

@ -72,15 +72,15 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="配件" prop="ifAttachment"> <el-form-item label="属性分类" prop="productPropertiesCategory">
<el-select <el-select
v-model="queryParams.ifAttachment" v-model="queryParams.productPropertiesCategory"
placeholder="请选择配件" placeholder="请选择属性分类"
clearable clearable
class="!w-240px" class="!w-240px"
> >
<el-option <el-option
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" v-for="dict in getBoolDictOptions(DICT_TYPE.ERP_PRODUCT_PROPERTIES_CATEGORY)"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
@ -141,7 +141,7 @@
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <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="id" />
<el-table-column label="所属分类" align="center" prop="productCategoryId"> <el-table-column label="产品分类" align="center" prop="productCategoryId">
<template #default="scope"> <template #default="scope">
{{ getCategoryName(scope.row.productCategoryId) }} {{ getCategoryName(scope.row.productCategoryId) }}
</template> </template>
@ -158,9 +158,9 @@
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.ifRequired" /> <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.ifRequired" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="配件" align="center" prop="ifAttachment"> <el-table-column label="属性分类" align="center" prop="productPropertiesCategory">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.ifAttachment" /> <dict-tag :type="DICT_TYPE.ERP_PRODUCT_PROPERTIES_CATEGORY" :value="scope.row.productPropertiesCategory" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="记录sn" align="center" prop="ifSn"> <el-table-column label="记录sn" align="center" prop="ifSn">
@ -241,7 +241,7 @@ const queryParams = reactive({
productPropertiesEn: undefined, productPropertiesEn: undefined,
productPropertiesCn: undefined, productPropertiesCn: undefined,
ifRequired: undefined, ifRequired: undefined,
ifAttachment: undefined, productPropertiesCategory: undefined,
ifSn: undefined, ifSn: undefined,
createTime: [] createTime: []
}) })