From a0b1fdec2bc5ddad11e981936b80d0fdf1e4bc69 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 09:25:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/enums.vue | 89 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 78 insertions(+), 11 deletions(-)
diff --git a/src/components/view/enums.vue b/src/components/view/enums.vue
index 13cb90b..44095aa 100644
--- a/src/components/view/enums.vue
+++ b/src/components/view/enums.vue
@@ -37,10 +37,10 @@
</style>
<template>
- <div class="role_manage">
+ <div class="enums">
<div>
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">鏋氫妇绠＄悊</el-col>
+ <el-col :span="12" style="padding-left: 20px;text-align: left;">鏁版嵁瀛楀吀</el-col>
<el-col :span="12" style="text-align: right;">
<el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
</el-col>
@@ -48,14 +48,14 @@
</div>
<div class="search">
<div class="search_thing">
- <div class="search_label">鏍囬锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.label" @keyup.enter.native="refreshTable()"></el-input></div>
- </div>
- <div class="search_thing">
<div class="search_label">鍒嗙被锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="componentData.entity.category" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">鏍囬锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.label" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
@@ -81,7 +81,7 @@
label: null,
category: null,
orderBy: {
- field: 'id',
+ field: 'category,order_num,id',
order: 'asc'
}
},
@@ -100,8 +100,75 @@
type: 'text',
method: 'doDiy'
}],
- tagField: {},
- selectField: {},
+ tagField: {
+ type:{
+ select:[
+ {
+ value:'',
+ label:'榛樿',
+ type:''
+ },
+ {
+ value:'success',
+ label:'鎴愬姛',
+ type:'success'
+ },
+ {
+ value:'info',
+ label:'淇℃伅',
+ type:'info'
+ },
+ {
+ value:'warning',
+ label:'璀﹀憡',
+ type:'warning'
+ },
+ {
+ value:'danger',
+ label:'閿欒',
+ type:'danger'
+ },
+ ]
+ }
+ },
+ selectField: {
+ type:{
+ select:[
+ {
+ value:'',
+ label:'榛樿'
+ },
+ {
+ value:'success',
+ label:'鎴愬姛'
+ },
+ {
+ value:'info',
+ label:'淇℃伅'
+ },
+ {
+ value:'warning',
+ label:'璀﹀憡'
+ },
+ {
+ value:'danger',
+ label:'閿欒'
+ },
+ ]
+ }
+ },
+ spanConfig:{
+ rows:[
+ {
+ name:'category',
+ index:1
+ },
+ // {
+ // name:'createUserName',
+ // index:5
+ // }
+ ],
+ },
requiredAdd:['category','label','value'],
requiredUp:['category','label','value']
},
@@ -153,4 +220,4 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3