zhouy/chem_mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(biz): 修复供应商模块数据类型和界面显示问题

Browse Source
This commit is contained in:
zxy 2026-05-06 16:58:45 +08:00
parent 79f612b789
commit 75ce38875c
14 changed files with 267 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/supplier/vo/SupplierRespVO.java
View File

@ -1,14 +1,13 @@
package com.ningxia.yunxi.chemmes.module.biz.controller.admin.supplier.vo; package com.ningxia.yunxi.chemmes.module.biz.controller.admin.supplier.vo;
import io.swagger.v3.oas.annotations.media.Schema; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import lombok.*; import com.alibaba.excel.annotation.ExcelProperty;
import java.util.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
import com.ningxia.yunxi.chemmes.framework.excel.core.annotations.DictFormat; import com.ningxia.yunxi.chemmes.framework.excel.core.annotations.DictFormat;
import com.ningxia.yunxi.chemmes.framework.excel.core.convert.DictConvert; import com.ningxia.yunxi.chemmes.framework.excel.core.convert.DictConvert;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 供应商主数据 Response VO") @Schema(description = "管理后台 - 供应商主数据 Response VO")
@Data @Data
@ -91,16 +90,16 @@ public class SupplierRespVO {
@Schema(description = "启用状态（1：启用2：未启用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @Schema(description = "启用状态（1：启用2：未启用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty(value = "启用状态（1：启用2：未启用）", converter = DictConvert.class) @ExcelProperty(value = "启用状态（1：启用2：未启用）", converter = DictConvert.class)
@DictFormat("system_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 @DictFormat("system_status")
private String enabledStatus; private Integer enabledStatus;
@Schema(description = "供应商状态(1 正常 2 暂停供货 3 淘汰)", example = "2") @Schema(description = "供应商状态(1 正常 2 暂停供货 3 淘汰)", example = "2")
@ExcelProperty(value = "供应商状态(1 正常 2 暂停供货 3 淘汰)", converter = DictConvert.class) @ExcelProperty(value = "供应商状态(1 正常 2 暂停供货 3 淘汰)", converter = DictConvert.class)
@DictFormat("supplier_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 @DictFormat("supplier_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
private String status; private Integer status;
@Schema(description = "是否黑名单(0 是 1否)") @Schema(description = "是否黑名单(0 是 1否)")
@ExcelProperty("是否黑名单(0 是 1否)") @ExcelProperty("是否黑名单(0 是 1否)")
private String isBlacklist; private Integer isBlacklist;
} }

21
mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/supplier/SupplierDO.java
View File

@ -1,11 +1,10 @@
package com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.supplier; package com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.supplier;
import lombok.*; import com.baomidou.mybatisplus.annotation.KeySequence;
import java.util.*; import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.ningxia.yunxi.chemmes.framework.mybatis.core.dataobject.BaseDO; import com.ningxia.yunxi.chemmes.framework.mybatis.core.dataobject.BaseDO;
import lombok.*;
/** /**
* 供应商主数据 DO * 供应商主数据 DO
@ -97,19 +96,15 @@ public class SupplierDO extends BaseDO {
private String remark; private String remark;
/** /**
* 启用状态（1：启用2：未启用） * 启用状态（1：启用2：未启用）
*
* 枚举 {@link TODO system_status 对应的类}
*/ */
private String enabledStatus; private Integer enabledStatus;
/** /**
* 供应商状态(1 正常 2 暂停供货 3 淘汰) * 供应商状态(1 正常 2 暂停供货 3 淘汰)
*
* 枚举 {@link TODO supplier_status 对应的类}
*/ */
private String status; private Integer status;
/** /**
* 是否黑名单(0 是 1否) * 是否黑名单(0 是 1否)
*/ */
private String isBlacklist; private Integer isBlacklist;
} }

4
mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/supplier/SupplierServiceImpl.java
View File

@ -11,6 +11,8 @@ import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource; import javax.annotation.Resource;
import static com.ningxia.yunxi.chemmes.framework.common.exception.util.ServiceExceptionUtil.exception;
/** /**
* 供应商主数据 Service 实现类 * 供应商主数据 Service 实现类
* *
@ -51,7 +53,7 @@ public class SupplierServiceImpl implements SupplierService {
private void validateSupplierExists(Integer id) { private void validateSupplierExists(Integer id) {
if (supplierMapper.selectById(id) == null) { if (supplierMapper.selectById(id) == null) {
// throw exception(SUPPLIER_NOT_EXISTS); throw exception("数据不存在");
} }
} }

2
mes-ui/mes-ui-admin-vue3/src/views/biz/customer/index.vue
View File

@ -155,7 +155,7 @@ import * as CustomerApi from '@/api/biz/customer'
import CustomerForm from './CustomerForm.vue' import CustomerForm from './CustomerForm.vue'
import CustomerDetail from './CustomerDetail.vue' import CustomerDetail from './CustomerDetail.vue'
defineOptions({ name: 'Customer' }) defineOptions({ name: 'customer' })
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化

4
mes-ui/mes-ui-admin-vue3/src/views/biz/machine/MachineForm.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="600px" <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px"
> >
<el-form <el-form
ref="formRef" ref="formRef"
@ -45,7 +45,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" /> <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea" :rows="2" />
</el-form-item> </el-form-item>
</el-form> </el-form>

4
mes-ui/mes-ui-admin-vue3/src/views/biz/machine/index.vue
View File

@ -102,7 +102,7 @@ import * as ProLineApi from '@/api/biz/proline'
import * as ProcApi from '@/api/biz/proc' import * as ProcApi from '@/api/biz/proc'
import MachineForm from './MachineForm.vue' import MachineForm from './MachineForm.vue'
defineOptions({ name: 'Machine' }) defineOptions({ name: 'machine' })
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
@ -218,4 +218,4 @@ onMounted(() => {
loadProcMap() loadProcMap()
getList() getList()
}) })
</script> </script>

2
mes-ui/mes-ui-admin-vue3/src/views/biz/material/MaterialForm.vue
View File

@ -56,7 +56,7 @@
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" /> <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea" :rows="2" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>

6
mes-ui/mes-ui-admin-vue3/src/views/biz/material/index.vue
View File

@ -82,7 +82,7 @@
<dict-tag :type="DICT_TYPE.MAT_TYPE" :value="scope.row.matType" /> <dict-tag :type="DICT_TYPE.MAT_TYPE" :value="scope.row.matType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单位" align="center" prop="unit" /> <el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="规格型号" align="center" prop="spec" /> <el-table-column label="规格型号" align="center" prop="spec" />
<el-table-column label="品牌" align="center" prop="brand" /> <el-table-column label="品牌" align="center" prop="brand" />
@ -136,7 +136,7 @@ import download from '@/utils/download'
import * as MaterialApi from '@/api/biz/material' import * as MaterialApi from '@/api/biz/material'
import MaterialForm from './MaterialForm.vue' import MaterialForm from './MaterialForm.vue'
defineOptions({ name: 'Material' }) defineOptions({ name: 'material' })
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
@ -217,4 +217,4 @@ const handleExport = async () => {
onMounted(() => { onMounted(() => {
getList() getList()
}) })
</script> </script>

2
mes-ui/mes-ui-admin-vue3/src/views/biz/proc/ProcForm.vue
View File

@ -24,7 +24,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" /> <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea" :rows="2" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>

6
mes-ui/mes-ui-admin-vue3/src/views/biz/proc/index.vue
View File

@ -42,7 +42,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" type="index" width="60px" /> <el-table-column label="序号" align="center" type="index" width="60px" />
<el-table-column label="工序编码" align="center" prop="procCd" /> <el-table-column label="工序编码" align="center" prop="procCd" />
<el-table-column label="工序名称" align="center" prop="procName" /> <el-table-column label="工序名称" align="center" prop="procName" />
<el-table-column label="状态" align="center" prop="enabledStatus"> <el-table-column label="状态" align="center" prop="enabledStatus">
@ -98,7 +98,7 @@ import { dateFormatter } from '@/utils/formatTime'
import * as ProcApi from '@/api/biz/proc' import * as ProcApi from '@/api/biz/proc'
import ProcForm from './ProcForm.vue' import ProcForm from './ProcForm.vue'
defineOptions({ name: 'Proc' }) defineOptions({ name: 'proc' })
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
@ -161,4 +161,4 @@ const handleDelete = async (id: number) => {
onMounted(() => { onMounted(() => {
getList() getList()
}) })
</script> </script>

2
mes-ui/mes-ui-admin-vue3/src/views/biz/proline/ProLineForm.vue
View File

@ -24,7 +24,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" /> <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea" :rows="2" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>

7
mes-ui/mes-ui-admin-vue3/src/views/biz/proline/index.vue
View File

@ -42,7 +42,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" type="index" width="60px" /> <el-table-column label="序号" align="center" type="index" width="60px" />
<el-table-column label="产线编码" align="center" prop="proLineCd" /> <el-table-column label="产线编码" align="center" prop="proLineCd" />
<el-table-column label="产线名称" align="center" prop="proLineName" /> <el-table-column label="产线名称" align="center" prop="proLineName" />
<el-table-column label="状态" align="center" prop="enabledStatus"> <el-table-column label="状态" align="center" prop="enabledStatus">
@ -95,11 +95,10 @@
<script setup lang="ts"> <script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import * as ProLineApi from '@/api/biz/proline' import * as ProLineApi from '@/api/biz/proline'
import ProLineForm from './ProLineForm.vue' import ProLineForm from './ProLineForm.vue'
defineOptions({ name: 'ProLine' }) defineOptions({ name: 'Proline' })
const message = useMessage() // 消息弹窗 const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
@ -162,4 +161,4 @@ const handleDelete = async (id: number) => {
onMounted(() => { onMounted(() => {
getList() getList()
}) })
</script> </script>

308
mes-ui/mes-ui-admin-vue3/src/views/biz/supplier/SupplierForm.vue
View File

@ -1,110 +1,180 @@
<template> <template>
<Dialog :title="dialogTitle" v-model="dialogVisible"> <Dialog :title="dialogTitle" v-model="dialogVisible" width="1200px">
<el-form <el-form
ref="formRef" ref="formRef"
:model="formData" :model="formData"
:rules="formRules" :rules="formRules"
label-width="100px" label-width="110px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="供应商编码" prop="supplierNo"> <!-- 基础信息 -->
<el-input v-model="formData.supplierNo" placeholder="请输入供应商编码" /> <div class="form-section">
</el-form-item> <div class="section-title">基础信息</div>
<el-form-item label="供应商名称" prop="supplierName"> <el-row :gutter="20">
<el-input v-model="formData.supplierName" placeholder="请输入供应商名称" /> <el-col :span="8">
</el-form-item> <el-form-item label="供应商编码" prop="supplierNo">
<el-form-item label="简称" prop="supplierSimName"> <el-input v-model="formData.supplierNo" placeholder="请输入供应商编码" :disabled="formType === 'update'" />
<el-input v-model="formData.supplierSimName" placeholder="请输入简称" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="供应商类型（1原料 2 辅料 3 设备 4 外协 5 服务 9其它）" prop="supplierType"> <el-col :span="8">
<el-select v-model="formData.supplierType" placeholder="请选择供应商类型（1原料 2 辅料 3 设备 4 外协 5 服务 9其它）"> <el-form-item label="供应商名称" prop="supplierName">
<el-option <el-input v-model="formData.supplierName" placeholder="请输入供应商名称" />
v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)" </el-form-item>
:key="dict.value" </el-col>
:label="dict.label" <el-col :span="8">
:value="dict.value" <el-form-item label="简称" prop="supplierSimName">
/> <el-input v-model="formData.supplierSimName" placeholder="请输入简称" />
</el-select> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="供应商等级（1 A 2 B 3 C 4D）" prop="supplierReg"> </el-row>
<el-input v-model="formData.supplierReg" placeholder="请输入供应商等级（1 A 2 B 3 C 4D）" /> <el-row :gutter="20">
</el-form-item> <el-col :span="8">
<el-form-item label="联系人1" prop="contact1"> <el-form-item label="供应商类型" prop="supplierType">
<el-input v-model="formData.contact1" placeholder="请输入联系人1" /> <el-select v-model="formData.supplierType" placeholder="请选择供应商类型">
</el-form-item> <el-option
<el-form-item label="联系电话1" prop="conPhone1"> v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_TYPE)"
<el-input v-model="formData.conPhone1" placeholder="请输入联系电话1" /> :key="dict.value"
</el-form-item> :label="dict.label"
<el-form-item label="联系地址1" prop="conAddress1"> :value="dict.value"
<el-input v-model="formData.conAddress1" placeholder="请输入联系地址1" /> />
</el-form-item> </el-select>
<el-form-item label="联系人2" prop="contact2"> </el-form-item>
<el-input v-model="formData.contact2" placeholder="请输入联系人2" /> </el-col>
</el-form-item> <el-col :span="8">
<el-form-item label="联系电话2" prop="conPhone2"> <el-form-item label="供应商等级" prop="supplierReg">
<el-input v-model="formData.conPhone2" placeholder="请输入联系电话2" /> <el-select v-model="formData.supplierReg" placeholder="请选择供应商等级">
</el-form-item> <el-option
<el-form-item label="联系地址2" prop="conAddress2"> v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_GRADE)"
<el-input v-model="formData.conAddress2" placeholder="请输入联系地址2" /> :key="dict.value"
</el-form-item> :label="dict.label"
<el-form-item label="公司税号" prop="comTaxNumber"> :value="dict.value"
<el-input v-model="formData.comTaxNumber" placeholder="请输入公司税号" /> />
</el-form-item> </el-select>
<el-form-item label="开户地区" prop="accountRegion"> </el-form-item>
<el-input v-model="formData.accountRegion" placeholder="请输入开户地区" /> </el-col>
</el-form-item> <el-col :span="8">
<el-form-item label="开户银行" prop="accountBank"> <el-form-item label="公司税号" prop="comTaxNumber">
<el-input v-model="formData.accountBank" placeholder="请输入开户银行" /> <el-input v-model="formData.comTaxNumber" placeholder="请输入公司税号" />
</el-form-item> </el-form-item>
<el-form-item label="开户账号" prop="accountNo"> </el-col>
<el-input v-model="formData.accountNo" placeholder="请输入开户账号" /> </el-row>
</el-form-item> <el-row :gutter="20">
<el-form-item label="备注" prop="remark"> <el-col :span="8">
<el-input v-model="formData.remark" placeholder="请输入备注" /> <el-form-item label="启用状态" prop="enabledStatus">
</el-form-item> <el-select v-model="formData.enabledStatus" placeholder="请选择启用状态">
<el-form-item label="启用状态（1：启用2：未启用）" prop="enabledStatus"> <el-option
<el-radio-group v-model="formData.enabledStatus"> v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_STATUS)"
<el-radio :key="dict.value"
v-for="dict in getStrDictOptions(DICT_TYPE.SYSTEM_STATUS)" :label="dict.label"
:key="dict.value" :value="dict.value"
:label="dict.value" />
> </el-select>
{{ dict.label }} </el-form-item>
</el-radio> </el-col>
</el-radio-group> <el-col :span="8">
</el-form-item> <el-form-item label="供应商状态" prop="status">
<el-form-item label="供应商状态(1 正常 2 暂停供货 3 淘汰)" prop="status"> <el-select v-model="formData.status" placeholder="请选择供应商状态">
<el-radio-group v-model="formData.status"> <el-option
<el-radio v-for="dict in getIntDictOptions(DICT_TYPE.SUPPLIER_STATUS)"
v-for="dict in getStrDictOptions(DICT_TYPE.SUPPLIER_STATUS)" :key="dict.value"
:key="dict.value" :label="dict.label"
:label="dict.value" :value="dict.value"
> />
{{ dict.label }} </el-select>
</el-radio> </el-form-item>
</el-radio-group> </el-col>
</el-form-item> <el-col :span="8">
<el-form-item label="是否黑名单(0 是 1否)" prop="isBlacklist"> <el-form-item label="是否黑名单" prop="isBlacklist">
<el-input v-model="formData.isBlacklist" placeholder="请输入是否黑名单(0 是 1否)" /> <el-select v-model="formData.isBlacklist" placeholder="请选择是否黑名单">
</el-form-item> <el-option label="是" :value="1" />
<el-option label="否" :value="0" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" type="textarea" :rows="2" />
</el-form-item>
</div>
<!-- 联系方式 -->
<div class="form-section">
<div class="section-title">联系方式</div>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="联系人1" prop="contact1">
<el-input v-model="formData.contact1" placeholder="请输入联系人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系电话1" prop="conPhone1">
<el-input v-model="formData.conPhone1" placeholder="请输入联系电话" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系地址1" prop="conAddress1">
<el-input v-model="formData.conAddress1" placeholder="请输入联系地址" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="联系人2" prop="contact2">
<el-input v-model="formData.contact2" placeholder="请输入联系人" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系电话2" prop="conPhone2">
<el-input v-model="formData.conPhone2" placeholder="请输入联系电话" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系地址2" prop="conAddress2">
<el-input v-model="formData.conAddress2" placeholder="请输入联系地址" />
</el-form-item>
</el-col>
</el-row>
</div>
<!-- 银行信息 -->
<div class="form-section">
<div class="section-title">银行信息</div>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="开户地区" prop="accountRegion">
<el-input v-model="formData.accountRegion" placeholder="请输入开户地区" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开户银行" prop="accountBank">
<el-input v-model="formData.accountBank" placeholder="请输入开户银行" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="开户账号" prop="accountNo">
<el-input v-model="formData.accountNo" placeholder="请输入开户账号" />
</el-form-item>
</el-col>
</el-row>
</div>
</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="dialogVisible = false">取 消</el-button>
</template> </template>
</Dialog> </Dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict' import { getStrDictOptions, getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import * as SupplierApi from '@/api/biz/supplier' import * as SupplierApi from '@/api/biz/supplier'
const { t } = useI18n() // 国际化 const { t } = useI18n()
const message = useMessage() // 消息弹窗 const message = useMessage()
const dialogVisible = ref(false) // 弹窗的是否展示 const dialogVisible = ref(false)
const dialogTitle = ref('') // 弹窗的标题 const dialogTitle = ref('')
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const formLoading = ref(false)
const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formType = ref('')
const formData = ref({ const formData = ref({
id: undefined, id: undefined,
supplierNo: undefined, supplierNo: undefined,
@ -123,40 +193,47 @@ const formData = ref({
accountBank: undefined, accountBank: undefined,
accountNo: undefined, accountNo: undefined,
remark: undefined, remark: undefined,
enabledStatus: undefined, enabledStatus: 0,
status: undefined, status: 1,
isBlacklist: undefined, isBlacklist: 0,
}) })
const formRules = reactive({ const formRules = reactive({
supplierNo: [{ required: true, message: '供应商编码不能为空', trigger: 'blur' }], supplierNo: [{ required: true, message: '请输入供应商编码', trigger: 'blur' }],
enabledStatus: [{ required: true, message: '启用状态（1：启用2：未启用）不能为空', trigger: 'blur' }], supplierName: [{ required: true, message: '请输入供应商名称', trigger: 'blur' }],
supplierType: [{ required: true, message: '请选择供应商类型', trigger: 'change' }],
enabledStatus: [{ required: true, message: '请选择启用状态', trigger: 'change' }],
}) })
const formRef = ref() // 表单 Ref const formRef = ref()
/** 打开弹窗 */
const open = async (type: string, id?: number) => { const open = async (type: string, id?: number) => {
dialogVisible.value = true dialogVisible.value = true
dialogTitle.value = t('action.' + type) dialogTitle.value = t('action.' + type)
formType.value = type formType.value = type
resetForm() resetForm()
// 修改时，设置数据
if (id) { if (id) {
formLoading.value = true formLoading.value = true
try { try {
formData.value = await SupplierApi.getSupplier(id) const data = await SupplierApi.getSupplier(id)
if (data.enabledStatus !== undefined && data.enabledStatus !== null) {
data.enabledStatus = String(data.enabledStatus)
}
if (data.status !== undefined && data.status !== null) {
data.status = String(data.status)
}
if (data.isBlacklist !== undefined && data.isBlacklist !== null) {
data.isBlacklist = String(data.isBlacklist)
}
formData.value = data
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
} }
} }
defineExpose({ open }) // 提供 open 方法，用于打开弹窗 defineExpose({ open })
/** 提交表单 */ const emit = defineEmits(['success'])
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
const submitForm = async () => { const submitForm = async () => {
// 校验表单
await formRef.value.validate() await formRef.value.validate()
// 提交请求
formLoading.value = true formLoading.value = true
try { try {
const data = formData.value as unknown as SupplierApi.SupplierVO const data = formData.value as unknown as SupplierApi.SupplierVO
@ -168,14 +245,12 @@ const submitForm = async () => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
} }
dialogVisible.value = false dialogVisible.value = false
// 发送操作成功的事件
emit('success') emit('success')
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
} }
/** 重置表单 */
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
id: undefined, id: undefined,
@ -195,10 +270,23 @@ const resetForm = () => {
accountBank: undefined, accountBank: undefined,
accountNo: undefined, accountNo: undefined,
remark: undefined, remark: undefined,
enabledStatus: undefined, enabledStatus: 0,
status: undefined, status: 1,
isBlacklist: undefined, isBlacklist: 0,
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>
<style scoped>
.form-section {
margin-bottom: 24px;
}
.section-title {
font-size: 14px;
font-weight: 600;
color: #606266;
margin-bottom: 16px;
padding-left: 8px;
border-left: 3px solid #409eff;
}
</style>

89
mes-ui/mes-ui-admin-vue3/src/views/biz/supplier/index.vue
View File

@ -6,7 +6,7 @@
:model="queryParams" :model="queryParams"
ref="queryFormRef" ref="queryFormRef"
:inline="true" :inline="true"
label-width="68px" label-width="100px"
> >
<el-form-item label="供应商编码" prop="supplierNo"> <el-form-item label="供应商编码" prop="supplierNo">
<el-input <el-input
@ -26,19 +26,10 @@
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="简称" prop="supplierSimName"> <el-form-item label="供应商类型" prop="supplierType">
<el-input
v-model="queryParams.supplierSimName"
placeholder="请输入简称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="供应商类型（1原料 2 辅料 3 设备 4 外协 5 服务 9其它）" prop="supplierType">
<el-select <el-select
v-model="queryParams.supplierType" v-model="queryParams.supplierType"
placeholder="请选择供应商类型（1原料 2 辅料 3 设备 4 外协 5 服务 9其它）" placeholder="请选择供应商类型"
clearable clearable
class="!w-240px" class="!w-240px"
> >
@ -50,34 +41,26 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="供应商等级（1 A 2 B 3 C 4D）" prop="supplierReg">
<el-input <el-form-item label="启用状态" prop="enabledStatus">
v-model="queryParams.supplierReg"
placeholder="请输入供应商等级（1 A 2 B 3 C 4D）"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="启用状态（1：启用2：未启用）" prop="enabledStatus">
<el-select <el-select
v-model="queryParams.enabledStatus" v-model="queryParams.enabledStatus"
placeholder="请选择启用状态（1：启用2：未启用）" placeholder="请选择启用状态"
clearable clearable
class="!w-240px" class="!w-240px"
> >
<el-option <el-option
v-for="dict in getStrDictOptions(DICT_TYPE.SYSTEM_STATUS)" v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_STATUS)"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="供应商状态(1 正常 2 暂停供货 3 淘汰)" prop="status"> <el-form-item label="状态" prop="status">
<el-select <el-select
v-model="queryParams.status" v-model="queryParams.status"
placeholder="请选择供应商状态(1 正常 2 暂停供货 3 淘汰)" placeholder="请选择状态"
clearable clearable
class="!w-240px" class="!w-240px"
> >
@ -100,15 +83,6 @@
> >
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['biz:supplier:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</ContentWrap> </ContentWrap>
@ -116,30 +90,39 @@
<!-- 列表 --> <!-- 列表 -->
<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" type="index" width="60px" />
<el-table-column label="供应商编码" align="center" prop="supplierNo" /> <el-table-column label="供应商编码" align="center" prop="supplierNo" />
<el-table-column label="供应商名称" align="center" prop="supplierName" /> <el-table-column label="供应商名称" align="center" prop="supplierName" />
<el-table-column label="简称" align="center" prop="supplierSimName" /> <el-table-column label="简称" align="center" prop="supplierSimName" />
<el-table-column label="供应商类型（1原料 2 辅料 3 设备 4 外协 5 服务 9其它）" align="center" prop="supplierType"> <el-table-column label="供应商类型" align="center" prop="supplierType">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.SUPPLIER_TYPE" :value="scope.row.supplierType" /> <dict-tag :type="DICT_TYPE.SUPPLIER_TYPE" :value="scope.row.supplierType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商等级（1 A 2 B 3 C 4D）" align="center" prop="supplierReg"> <el-table-column label="等级" align="center" prop="supplierReg">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.SUPPLIER_GRADE" :value="scope.row.supplierReg" /> <dict-tag :type="DICT_TYPE.SUPPLIER_GRADE" :value="scope.row.supplierReg" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="联系人1" align="center" prop="contact1" /> <el-table-column label="联系人1" align="center" prop="contact1" />
<el-table-column label="联系电话1" align="center" prop="conPhone1" /> <el-table-column label="联系电话1" align="center" prop="conPhone1" />
<el-table-column label="联系地址1" align="center" prop="conAddress1" /> <el-table-column label="供应商状态" align="center" prop="status">
<el-table-column label="联系人2" align="center" prop="contact2" /> <template #default="scope">
<el-table-column label="联系电话2" align="center" prop="conPhone2" /> <dict-tag :type="DICT_TYPE.SUPPLIER_STATUS" :value="scope.row.status" />
<el-table-column label="联系地址2" align="center" prop="conAddress2" /> </template>
<el-table-column label="公司税号" align="center" prop="comTaxNumber" /> </el-table-column>
<el-table-column label="开户地区" align="center" prop="accountRegion" /> <el-table-column label="启用状态" align="center" prop="enabledStatus">
<el-table-column label="开户银行" align="center" prop="accountBank" /> <template #default="scope">
<el-table-column label="开户账号" align="center" prop="accountNo" /> <dict-tag :type="DICT_TYPE.SYSTEM_STATUS" :value="scope.row.enabledStatus" />
</template>
</el-table-column>
<el-table-column label="是否黑名单" align="center" prop="isBlacklist">
<template #default="scope">
<el-tag :type="scope.row.isBlacklist === 1 ? 'danger' : 'success'">
{{ scope.row.isBlacklist === 1 ? '是' : '否' }}
</el-tag>
</template>
</el-table-column>
<el-table-column <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
@ -147,18 +130,6 @@
:formatter="dateFormatter" :formatter="dateFormatter"
width="180px" width="180px"
/> />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="启用状态（1：启用2：未启用）" align="center" prop="enabledStatus">
<template #default="scope">
<dict-tag :type="DICT_TYPE.SYSTEM_STATUS" :value="scope.row.enabledStatus" />
</template>
</el-table-column>
<el-table-column label="供应商状态(1 正常 2 暂停供货 3 淘汰)" align="center" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.SUPPLIER_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="是否黑名单(0 是 1否)" align="center" prop="isBlacklist" />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template #default="scope"> <template #default="scope">
<el-button <el-button
@ -194,7 +165,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict' import { getStrDictOptions, getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download' import download from '@/utils/download'
import * as SupplierApi from '@/api/biz/supplier' import * as SupplierApi from '@/api/biz/supplier'