From 02aad919c193a50948cfdd6bef5bf50882578baf Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 13:30:47 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/basesetting/machine.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/views/basesetting/machine.vue b/src/views/basesetting/machine.vue
index f5d3e80..bebb42f 100644
--- a/src/views/basesetting/machine.vue
+++ b/src/views/basesetting/machine.vue
@@ -36,6 +36,7 @@
</el-upload>
<el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">鏂板</el-button>
</div>
+
</template>
<template #menu="scope">
<el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleEdit(scope.row, scope.index)">缂栬緫</el-button>
@@ -276,7 +277,7 @@
dataType: 'string',
},
{
- label: '绯荤粺鎺у埗',
+ label: '鎺у埗绯荤粺',
prop: 'controlSystem',
type: 'select',
span: 12,
--
Gitblit v1.9.3