From 196b113ea00f009c2fc59068e6fcff6e1d144ba9 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期五, 22 八月 2025 11:17:30 +0800
Subject: [PATCH] 1
---
src/views/basesetting/machine.vue | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/src/views/basesetting/machine.vue b/src/views/basesetting/machine.vue
index fcd92c3..f5d3e80 100644
--- a/src/views/basesetting/machine.vue
+++ b/src/views/basesetting/machine.vue
@@ -27,14 +27,22 @@
@on-load="onLoad"
>
<template #menu-left>
- <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">瀵煎嚭</el-button>
- <!-- <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleView">瀵煎叆</el-button> -->
- <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleAdd">鏂板</el-button>
+ <div class="menuLeft">
+ <el-button type="primary" size="default" icon="el-icon-circle-plus" plain @click="handleExport">瀵煎嚭</el-button>
+ <el-upload :show-file-list="false" class="upload-demo"
+ action="/api/blade-mdm/machine/import"
+ :on-change="handleChange">
+ <el-button type="primary" plain size="default">瀵煎叆</el-button>
+ </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>
<el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleDel(scope.row, scope.index)">鍒犻櫎</el-button>
+ <!--
<el-button type="primary" text size="default" icon="el-icon-upload" @click.stop="handleUp(scope.row, scope.index)">浜х敓鏈哄簥鍥炰紶鏈烘瀯鏍�</el-button>
+ -->
</template>
<template #status="{ row }">
@@ -140,6 +148,7 @@
{
label: '鏈哄簥缁�',
prop: 'machineGroupName',
+ filterable:true,
search: true,
type: 'select',
dicUrl: '/blade-system/dict-biz/dictionary?code=machine_group',
@@ -223,6 +232,7 @@
{
label: '鎵�灞炴満搴婄粍',
prop: 'machineGroupCode',
+ filterable:true,
type: 'select',
span: 12,
dicUrl: '/blade-system/dict-biz/dictionary?code=machine_group',
@@ -287,11 +297,27 @@
}]
},
{
+ label: '绋嬪簭涓存椂鐩綍',
+ prop: 'progTempDir',
+ type: 'input',
+ span: 12,
+ dataType: 'string',
+ },
+ {
label: '绋嬪簭涓嬪彂鐩綍',
prop: 'progSendDir',
type: 'input',
span: 12,
dataType: 'string',
+ },
+ {
+ label: '涓嬪彂鐩綍淇濆瓨鏃堕棿',
+ prop: 'sendDirExpiryHours',
+ placeholder:"(灏忔椂)",
+ max:24,
+ min:1,
+ type: 'number',
+ span: 12,
},
{
label: '绋嬪簭鍥炰紶鐩綍',
@@ -300,6 +326,16 @@
span: 12,
dataType: 'string',
},
+ {
+ label: '鍥炰紶鐩綍淇濆瓨鏃堕棿',
+ prop: 'receiveDirExpiryHours',
+ max:24,
+ min:1,
+ placeholder:"(灏忔椂)",
+ type: 'number',
+ span: 12,
+ },
+
{
label: '澶囨敞',
prop: 'remark',
@@ -313,6 +349,9 @@
};
},
methods: {
+ handleChange(a,b,c) {
+ console.log(a,b,c);
+ },
nodeClick(data) {
this.treeDeptId = data.id;
this.mypage.current = 1;
@@ -497,5 +536,13 @@
</script>
<style lang="scss">
-
+.upload-demo {
+ display: inline-block;
+ margin-left: 6px;
+ margin-right: 6px;
+}
+.menuLeft {
+ display: flex;
+ align-items: center;
+}
</style>
--
Gitblit v1.9.3