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

♻️ refactor(machinery): 统一规格型号字段命名为 'specification'

pull/871/MERGE
YunaiV 2026-04-11 16:03:22 +08:00
parent 3e203a9536
commit 6358e7db9e
32 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/mes/dv/checkplan/machinery/index.ts
View File

@ -8,7 +8,7 @@ export interface DvCheckPlanMachineryVO {
machineryCode: string // 设备编码
machineryName: string // 设备名称
machineryBrand: string // 品牌
machinerySpec: string // 规格型号
machinerySpecification: string // 规格型号
remark: string // 备注
}

2
src/api/mes/dv/checkrecord/index.ts
View File

@ -9,7 +9,7 @@ export interface DvCheckRecordVO {
machineryCode?: string // 设备编码
machineryName?: string // 设备名称
machineryBrand?: string // 品牌
machinerySpec?: string // 规格型号
machinerySpecification?: string // 规格型号
checkTime: Date // 点检时间
userId: number // 点检人编号
nickname?: string // 点检人名称

2
src/api/mes/dv/machinery/index.ts
View File

@ -6,7 +6,7 @@ export interface DvMachineryVO {
code: string // 设备编码
name: string // 设备名称
brand: string // 品牌
spec: string // 规格型号
specification: string // 规格型号
machineryTypeId: number // 设备类型编号
machineryTypeName: string // 设备类型名称
workshopId: number // 所属车间编号

2
src/api/mes/dv/maintenrecord/index.ts
View File

@ -9,7 +9,7 @@ export interface DvMaintenRecordVO {
machineryCode?: string // 设备编码
machineryName?: string // 设备名称
machineryBrand?: string // 品牌
machinerySpec?: string // 规格型号
machinerySpecification?: string // 规格型号
maintenTime: Date // 保养时间
userId: number // 用户编号
nickname?: string // 保养人名称

2
src/api/mes/dv/repair/index.ts
View File

@ -9,7 +9,7 @@ export interface DvRepairVO {
machineryCode?: string // 设备编码
machineryName?: string // 设备名称
machineryBrand?: string // 品牌
machinerySpec?: string // 规格型号
machinerySpecification?: string // 规格型号
requireDate: Date // 报修日期
finishDate: Date // 维修完成日期
confirmDate: Date // 验收日期

2
src/api/mes/pro/task/index.ts
View File

@ -17,7 +17,7 @@ export interface ProTaskVO {
itemId: number // 产品物料编号
itemName: string // 产品名称
itemCode: string // 产品编码
itemSpec: string // 规格型号
itemSpecification: string // 规格型号
quantity: number // 排产数量
producedQuantity: number // 已生产数量
qualifyQuantity: number // 合格品数量

2
src/api/mes/pro/task/issue/index.ts
View File

@ -14,7 +14,7 @@ export interface ProTaskIssueVO {
itemId: number // 产品物料编号
itemName: string // 产品名称
itemCode: string // 产品编码
itemSpec: string // 规格型号
itemSpecification: string // 规格型号
unitMeasureId: number // 单位编号
unitMeasureName: string // 单位名称
issuedQuantity: number // 总投料数量

2
src/api/mes/pro/workorder/bom/index.ts
View File

@ -7,7 +7,7 @@ export interface ProWorkOrderBomVO {
itemId: number // BOM 物料编号
itemName: string // 物料名称
itemCode: string // 物料编码
itemSpec: string // 规格型号
itemSpecification: string // 规格型号
unitMeasureId: number // 单位编号
unitMeasureName: string // 单位名称
quantity: number // 预计使用量

2
src/api/mes/pro/workorder/index.ts
View File

@ -11,7 +11,7 @@ export interface ProWorkOrderVO {
productId: number // 产品编号
productName: string // 产品名称
productCode: string // 产品编码
productSpec: string // 规格型号
productSpecification: string // 规格型号
unitMeasureName: string // 单位名称
quantity: number // 生产数量
quantityProduced: number // 已生产数量

2
src/api/mes/tm/tool/index.ts
View File

@ -6,7 +6,7 @@ export interface TmToolVO {
code: string // 工具编码
name: string // 工具名称
brand: string // 品牌
spec: string // 型号规格
specification: string // 型号规格
toolTypeId: number // 工具类型编号
toolTypeName: string // 工具类型名称
quantity: number // 数量

2
src/views/mes/dv/checkplan/CheckPlanMachineryList.vue
View File

@ -17,7 +17,7 @@
<el-table-column label="设备编码" align="center" prop="machineryCode" min-width="120" />
<el-table-column label="设备名称" align="center" prop="machineryName" min-width="150" />
<el-table-column label="品牌" align="center" prop="machineryBrand" min-width="100" />
<el-table-column label="规格型号" align="center" prop="machinerySpec" min-width="120" />
<el-table-column label="规格型号" align="center" prop="machinerySpecification" min-width="120" />
<el-table-column label="备注" align="center" prop="remark" min-width="120" />
<el-table-column v-if="isUpdate" label="操作" align="center" width="80">
<template #default="scope">

2
src/views/mes/dv/checkrecord/index.vue
View File

@ -74,7 +74,7 @@
</el-table-column>
<el-table-column label="设备名称" align="center" prop="machineryName" min-width="120" />
<el-table-column label="品牌" align="center" prop="machineryBrand" />
<el-table-column label="规格型号" align="center" prop="machinerySpec" min-width="120" />
<el-table-column label="规格型号" align="center" prop="machinerySpecification" min-width="120" />
<el-table-column label="计划编码" align="center" prop="planCode" min-width="120" />
<el-table-column label="计划名称" align="center" prop="planName" min-width="120" />
<el-table-column

2
src/views/mes/dv/machinery/MachineryCheckRecordList.vue
View File

@ -35,7 +35,7 @@
<el-table-column label="设备编码" align="center" prop="machineryCode" width="120" />
<el-table-column label="设备名称" align="center" prop="machineryName" width="120" />
<el-table-column label="品牌" align="center" prop="machineryBrand" width="100" />
<el-table-column label="规格型号" align="center" prop="machinerySpec" width="120" />
<el-table-column label="规格型号" align="center" prop="machinerySpecification" width="120" />
<el-table-column label="状态" align="center" prop="status" width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_DV_CHECK_RECORD_STATUS" :value="scope.row.status" />

8
src/views/mes/dv/machinery/MachineryForm.vue
View File

@ -58,8 +58,8 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="规格型号" prop="spec">
<el-input v-model="formData.spec" placeholder="请输入规格型号" />
<el-form-item label="规格型号" prop="specification">
<el-input v-model="formData.specification" placeholder="请输入规格型号" />
</el-form-item>
</el-col>
<el-col v-if="isDetail" :span="8">
@ -154,7 +154,7 @@ const formData = ref({
code: undefined,
name: undefined,
brand: undefined,
spec: undefined,
specification: undefined,
machineryTypeId: undefined,
workshopId: undefined,
status: MesDvMachineryStatusEnum.STOP,
@ -235,7 +235,7 @@ const resetForm = () => {
code: undefined,
name: undefined,
brand: undefined,
spec: undefined,
specification: undefined,
machineryTypeId: undefined,
workshopId: undefined,
status: MesDvMachineryStatusEnum.STOP,

2
src/views/mes/dv/machinery/MachineryMaintenRecordList.vue
View File

@ -35,7 +35,7 @@
<el-table-column label="设备编码" align="center" prop="machineryCode" width="120" />
<el-table-column label="设备名称" align="center" prop="machineryName" width="120" />
<el-table-column label="品牌" align="center" prop="machineryBrand" width="100" />
<el-table-column label="规格型号" align="center" prop="machinerySpec" width="120" />
<el-table-column label="规格型号" align="center" prop="machinerySpecification" width="120" />
<el-table-column label="状态" align="center" prop="status" width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_MAINTEN_RECORD_STATUS" :value="scope.row.status" />

2
src/views/mes/dv/machinery/components/DvMachinerySelect.vue
View File

@ -26,7 +26,7 @@
<div>设备编码：{{ selectedItem.code }}</div>
<div>设备名称：{{ selectedItem.name }}</div>
<div v-if="selectedItem.brand">品牌：{{ selectedItem.brand }}</div>
<div v-if="selectedItem.spec">规格型号：{{ selectedItem.spec }}</div>
<div v-if="selectedItem.specification">规格型号：{{ selectedItem.specification }}</div>
</div>
</template>
<el-input

2
src/views/mes/dv/machinery/components/DvMachinerySelectDialog.vue
View File

@ -92,7 +92,7 @@
<el-table-column label="设备编码" align="center" prop="code" width="120" />
<el-table-column label="设备名称" align="left" prop="name" min-width="120" />
<el-table-column label="品牌" align="left" prop="brand" min-width="120" />
<el-table-column label="规格型号" align="left" prop="spec" min-width="120" />
<el-table-column label="规格型号" align="left" prop="specification" min-width="120" />
<el-table-column label="所属车间" align="center" prop="workshopName" width="120" />
<el-table-column label="设备状态" align="center" prop="status" width="100">
<template #default="scope">

2
src/views/mes/dv/machinery/index.vue
View File

@ -113,7 +113,7 @@
</el-table-column>
<el-table-column label="设备名称" align="center" prop="name" min-width="150" />
<el-table-column label="品牌" align="center" prop="brand" width="100" />
<el-table-column label="规格型号" align="center" prop="spec" width="120" />
<el-table-column label="规格型号" align="center" prop="specification" width="120" />
<el-table-column label="设备类型" align="center" prop="machineryTypeName" width="120" />
<el-table-column label="所属车间" align="center" prop="workshopName" width="120" />
<el-table-column label="设备状态" align="center" prop="status" width="100">

2
src/views/mes/dv/maintenrecord/index.vue
View File

@ -64,7 +64,7 @@
</el-table-column>
<el-table-column label="设备名称" align="center" prop="machineryName" />
<el-table-column label="品牌" align="center" prop="machineryBrand" />
<el-table-column label="规格型号" align="center" prop="machinerySpec" />
<el-table-column label="规格型号" align="center" prop="machinerySpecification" />
<el-table-column label="计划名称" align="center" prop="planName" />
<el-table-column
label="保养时间"

2
src/views/mes/pro/feedback/FeedbackForm.vue
View File

@ -425,7 +425,7 @@ const handleTaskChange = async (task: any) => {
itemCode: task.itemCode || '',
itemName: task.itemName || '',
unitMeasureName: '',
itemSpecification: task.itemSpec || ''
itemSpecification: task.itemSpecification || ''
}
await loadCheckFlag(task.routeId, task.processId)
}

4
src/views/mes/pro/task/WorkOrderForm2.vue
View File

@ -52,8 +52,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规格型号" prop="productSpec">
<el-input v-model="formData.productSpec" disabled />
<el-form-item label="规格型号" prop="productSpecification">
<el-input v-model="formData.productSpecification" disabled />
</el-form-item>
</el-col>
<el-col :span="8">

2
src/views/mes/pro/task/components/ProTaskSelect.vue
View File

@ -30,7 +30,7 @@
<div>工序：{{ selectedItem.processName || '-' }}</div>
<div>工作站：{{ selectedItem.workstationName || '-' }}</div>
<div>物料：{{ selectedItem.itemName || '-' }}</div>
<div>规格：{{ selectedItem.itemSpec || '-' }}</div>
<div>规格：{{ selectedItem.itemSpecification || '-' }}</div>
</div>
</template>
<el-input

2
src/views/mes/pro/task/components/ProTaskSelectDialog.vue
View File

@ -116,7 +116,7 @@
</el-table-column>
<el-table-column label="物料编码" align="center" prop="itemCode" width="140" />
<el-table-column label="物料名称" align="center" prop="itemName" width="140" />
<el-table-column label="规格型号" align="center" prop="itemSpec" width="120" />
<el-table-column label="规格型号" align="center" prop="itemSpecification" width="120" />
<el-table-column label="排产数量" align="center" prop="quantity" width="100" />
<el-table-column label="已生产数量" align="center" prop="producedQuantity" width="110" />
<el-table-column label="开始生产时间" align="center" prop="startTime" width="170">

2
src/views/mes/pro/task/index.vue
View File

@ -98,7 +98,7 @@
<el-table-column label="来源单据编号" align="center" prop="orderSourceCode" width="140" />
<el-table-column label="产品编码" align="center" prop="productCode" width="120" />
<el-table-column label="产品名称" align="center" prop="productName" min-width="120" />
<el-table-column label="规格型号" align="center" prop="productSpec" width="120" />
<el-table-column label="规格型号" align="center" prop="productSpecification" width="120" />
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="工单数量" align="center" prop="quantity" width="100" />
<el-table-column label="调整数量" align="center" prop="quantityChanged" width="100" />

2
src/views/mes/pro/workorder/WorkOrderBomList.vue
View File

@ -11,7 +11,7 @@
<el-table v-loading="loading" :data="bomList" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="BOM 物料编码" align="center" prop="itemCode" width="120" />
<el-table-column label="BOM 物料名称" align="center" prop="itemName" min-width="150" />
<el-table-column label="规格型号" align="center" prop="itemSpec" width="120" />
<el-table-column label="规格型号" align="center" prop="itemSpecification" width="120" />
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="物料/产品" align="center" prop="itemOrProduct" width="100">
<template #default="scope">

2
src/views/mes/pro/workorder/WorkOrderItemList.vue
View File

@ -3,7 +3,7 @@
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="物料编码" align="center" prop="itemCode" width="120" />
<el-table-column label="物料名称" align="center" prop="itemName" min-width="150" />
<el-table-column label="规格型号" align="center" prop="itemSpec" width="120" />
<el-table-column label="规格型号" align="center" prop="itemSpecification" width="120" />
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="物料/产品" align="center" prop="itemOrProduct" width="100">
<template #default="scope">

2
src/views/mes/pro/workorder/components/ProWorkOrderSelectDialog.vue
View File

@ -116,7 +116,7 @@
<el-table-column label="订单编号" align="center" prop="orderSourceCode" width="140" />
<el-table-column label="产品编号" align="center" prop="productCode" width="120" />
<el-table-column label="产品名称" align="center" prop="productName" min-width="200" />
<el-table-column label="规格型号" align="center" prop="productSpec" min-width="120" />
<el-table-column label="规格型号" align="center" prop="productSpecification" min-width="120" />
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="工单数量" align="center" prop="quantity" width="100" />
<el-table-column label="客户编码" align="center" prop="clientCode" width="120" />

2
src/views/mes/pro/workorder/index.vue
View File

@ -127,7 +127,7 @@
<el-table-column label="来源单据编号" align="center" prop="orderSourceCode" width="140" />
<el-table-column label="产品编码" align="center" prop="productCode" width="120" />
<el-table-column label="产品名称" align="center" prop="productName" min-width="120" />
<el-table-column label="规格型号" align="center" prop="productSpec" width="120" />
<el-table-column label="规格型号" align="center" prop="productSpecification" width="120" />
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="工单数量" align="center" prop="quantity" width="100" />
<el-table-column label="已生产数量" align="center" prop="quantityProduced" width="100" />

8
src/views/mes/tm/tool/ToolForm.vue
View File

@ -45,8 +45,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="型号规格" prop="spec">
<el-input v-model="formData.spec" placeholder="请输入型号规格" />
<el-form-item label="型号规格" prop="specification">
<el-input v-model="formData.specification" placeholder="请输入型号规格" />
</el-form-item>
</el-col>
</el-row>
@ -182,7 +182,7 @@ const formData = ref({
code: undefined,
name: undefined,
brand: undefined,
spec: undefined,
specification: undefined,
toolTypeId: undefined,
quantity: 1,
availableQuantity: 1,
@ -279,7 +279,7 @@ const resetForm = () => {
code: undefined,
name: undefined,
brand: undefined,
spec: undefined,
specification: undefined,
toolTypeId: undefined,
quantity: 1,
availableQuantity: 1,

2
src/views/mes/tm/tool/components/TmToolSelect.vue
View File

@ -26,7 +26,7 @@
<div>工具编码：{{ selectedItem.code }}</div>
<div>工具名称：{{ selectedItem.name }}</div>
<div v-if="selectedItem.brand">品牌：{{ selectedItem.brand }}</div>
<div v-if="selectedItem.spec">型号规格：{{ selectedItem.spec }}</div>
<div v-if="selectedItem.specification">型号规格：{{ selectedItem.specification }}</div>
<div v-if="selectedItem.toolTypeName">工具类型：{{ selectedItem.toolTypeName }}</div>
</div>
</template>

2
src/views/mes/tm/tool/components/TmToolSelectDialog.vue
View File

@ -99,7 +99,7 @@
<el-table-column label="工具编码" align="center" prop="code" width="120" />
<el-table-column label="工具名称" align="left" prop="name" min-width="120" />
<el-table-column label="品牌" align="left" prop="brand" min-width="100" />
<el-table-column label="型号规格" align="left" prop="spec" min-width="100" />
<el-table-column label="型号规格" align="left" prop="specification" min-width="100" />
<el-table-column label="工具类型" align="center" prop="toolTypeName" width="120" />
<el-table-column label="库存数量" align="center" prop="quantity" width="100" />
<el-table-column label="可用数量" align="center" prop="availableQuantity" width="100" />

8
src/views/mes/tm/tool/index.vue
View File

@ -44,9 +44,9 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item label="型号规格" prop="spec">
<el-form-item label="型号规格" prop="specification">
<el-input
v-model="queryParams.spec"
v-model="queryParams.specification"
placeholder="请输入型号规格"
clearable
@keyup.enter="handleQuery"
@ -108,7 +108,7 @@
</el-table-column>
<el-table-column label="工具名称" align="center" prop="name" min-width="150" />
<el-table-column label="品牌" align="center" prop="brand" width="100" />
<el-table-column label="型号规格" align="center" prop="spec" width="120" />
<el-table-column label="型号规格" align="center" prop="specification" width="120" />
<el-table-column label="工具类型" align="center" prop="toolTypeName" width="120" />
<el-table-column label="库存数量" align="center" prop="quantity" width="100" />
<el-table-column label="可用数量" align="center" prop="availableQuantity" width="100" />
@ -202,7 +202,7 @@ const queryParams = reactive({
name: undefined,
toolTypeId: undefined,
brand: undefined,
spec: undefined,
specification: undefined,
status: undefined
})
const queryFormRef = ref() // 搜索的表单