From 641ce71b7b29c32105c82619fa7abfb9b2f38e3b Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 25 八月 2023 19:25:29 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/web/SRM
---
src/views/other/commonDialog/EditDropdownDialog.vue | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/views/other/commonDialog/EditDropdownDialog.vue b/src/views/other/commonDialog/EditDropdownDialog.vue
index 2562bd7..142bf25 100644
--- a/src/views/other/commonDialog/EditDropdownDialog.vue
+++ b/src/views/other/commonDialog/EditDropdownDialog.vue
@@ -13,11 +13,6 @@
<el-input v-model="scope.row.name" size="mini"></el-input>
</template>
</el-table-column>
- <el-table-column label="鏄剧ず棰滆壊" prop="color">
- <template slot-scope="scope">
- <el-color-picker v-model="scope.row.color" size="small" @change="colorClick(scope.row)"></el-color-picker>
- </template>
- </el-table-column>
<el-table-column label="璁句负榛樿" prop="setDefault">
<template slot-scope="scope">
<el-switch
@@ -50,7 +45,6 @@
</el-table>
<div style="padding: 10px">
<el-button type="text" size="mini" @click="addDropdown">鏂板涓嬫媺妗�</el-button>
- <el-button type="text" size="mini">鎭㈠榛樿棰滆壊</el-button>
</div>
<div slot="footer">
<el-button type="primary" size="small" @click="editConfig.editVisible = false">淇濆瓨</el-button>
--
Gitblit v1.8.0