diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineParamServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineParamServiceImpl.java index e3c5e20..82f2e02 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineParamServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineParamServiceImpl.java @@ -55,7 +55,7 @@ public class MachineParamServiceImpl extends ServiceImpl page = new Page<>(machineParamPagination.getCurrentPage(), machineParamPagination.getPageSize()); diff --git a/jnpf-java-boot/jnpf-web/src/views/example/machineparam/detail.vue b/jnpf-java-boot/jnpf-web/src/views/example/machineparam/detail.vue index 933fa27..655ec9a 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/machineparam/detail.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/machineparam/detail.vue @@ -177,6 +177,8 @@ export default { this.materialOptions = res.data.map(item => ({ label: item.matName, value: String(item.id), + matCode: item.matCode || '', + matName: item.matName || '', })) }) }, @@ -214,7 +216,7 @@ export default { }, getMaterialName(matCode) { const item = this.materialOptions.find(opt => opt.value === matCode) - return item ? item.label : '' + return item ? `${item.matCode}-${item.matName}` : '' }, getEnabledStatusName(status) { const item = this.enabledStatusOptions.find(opt => opt.id === status) diff --git a/jnpf-java-boot/jnpf-web/src/views/example/machineparam/form.vue b/jnpf-java-boot/jnpf-web/src/views/example/machineparam/form.vue index 448f82e..0313f07 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/machineparam/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/machineparam/form.vue @@ -209,6 +209,7 @@ export default { this.dataForm.id = id || ''; this.dialogVisible = true; this.loading = true; + this.machineOptions = []; // 每次编辑前清空机台列表 this.$nextTick(() => { if (this.$refs.formRef) { this.$refs.formRef.resetFields(); @@ -228,6 +229,13 @@ export default { matCode: String(data.matCode || ''), enabledStatus: String(data.enabledStatus || '1'), }; + + // 编辑时,如果有工序ID,加载对应的机台列表 + if (data.procId) { + this.dataForm.procId = data.procId; + this.loadMachineList(data.procId); + } + // 回显工艺参数列表 if (data.detailList && Array.isArray(data.detailList)) { this.paramList = data.detailList.map(item => {