From b29f1588f2bb8b46df38a52cbae07ea8590f099a Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 08 八月 2023 19:10:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/honor/index.vue | 104 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 76 insertions(+), 28 deletions(-)
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index 79a32e1..b1d5240 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -50,14 +50,28 @@
-->
</el-form-item>
<el-form-item label="鍚嶇О" prop="name">
- <el-input
+<!-- <el-input-->
+<!-- v-model="queryParams.name"-->
+<!-- placeholder="璇疯緭鍏ュ悕绉�"-->
+<!-- clearable-->
+<!-- style="width: 240px"-->
+<!-- @keyup.enter.native="handleQuery">-->
+<!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
+<!-- </el-input>-->
+ <el-select
v-model="queryParams.name"
- placeholder="璇疯緭鍏ュ悕绉�"
+ placeholder="鎵�鏈夌被鍒�"
clearable
style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
+ @keyup.enter.native="handleQuery"
+ >
+ <el-option
+ v-for="dic in typeOptions"
+ :key="dic.value"
+ :label="dic.label"
+ :value="dic.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="绫诲埆" prop="type" >
<!-- <el-input-->
@@ -76,10 +90,10 @@
@keyup.enter.native="handleQuery"
>
<el-option
- v-for="dict in typeOptions"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
+ v-for="item in typeOption"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
/>
</el-select>
@@ -185,10 +199,23 @@
<!-- </el-table-column>-->
<el-table-column label="绫诲埆" prop="type" sortable :show-overflow-tooltip="true" width="120" align="center" >
<!-- <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>-->
- <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>
+ <template slot-scope="scope">{{ getSrc1(scope.row.type) }}</template>
</el-table-column>
<el-table-column label="鍚嶇О" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" >
- <template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template>
+<!-- <template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template>-->
+ <template slot-scope="scope">
+<!-- <template v-if="formDat.name===1">{{ getSrc(scope.row.name) }}</template>-->
+ <template v-if="scope.row.name == 1">鍑虹敓璇�</template>
+ <template v-else-if="scope.row.name == 2">瀛︾敓璇�</template>
+ <template v-else-if="scope.row.name == 3">姣曚笟璇�</template>
+ <template v-else-if="scope.row.name == 4">缁撳璇�</template>
+ <template v-else-if="scope.row.name == 5">鎴峰彛绨�</template>
+ <template v-else-if="scope.row.name == 6">鐙敓瀛愬コ璇�</template>
+ <template v-else-if="scope.row.name == 7">楂樼骇鑱岀О</template>
+ <template v-else-if="scope.row.name == 8">鎶ょ収</template>
+ <template v-else-if="scope.row.name == 9">閫氳璇�</template>
+ <template v-else>{{ scope.row.name }}</template>
+ </template>
</el-table-column>
<el-table-column label="璇佸彿/涓撲笟" prop="idNo" sortable width="170" align="center" >
<template slot-scope="scope">{{scope.row.idNo? scope.row.idNo: '鈥斺�斺�斺��'}}</template>
@@ -279,15 +306,16 @@
<!-- <el-date-picker v-model='formDat.happenTime' type='date' placeholder='閫夋嫨鏃ユ湡'></el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item label="绫诲埆" prop="type">
-<!-- <el-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" >-->
-<!-- </el-input>-->
- <el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" >
- <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+ <el-select v-model="formDat.type" placeholder="璇烽�夋嫨鍚嶇О" clearable :style="{width: '100%'}" >
+ <el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="鍚嶇О" prop="name">
- <el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ悕绉�" clearable :style="{width: '100%'}" ></el-input>
+ <el-select v-model="formDat.name" placeholder="璇烽�夋嫨鍚嶇О" clearable :style="{width: '100%'}" >
+ <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="璇佷欢鍙�/涓撲笟" prop="idNo">
<el-input v-model="formDat.idNo" placeholder="璇疯緭鍏ヨ瘉浠跺彿/涓撲笟" clearable :style="{width: '100%'}" >
@@ -528,6 +556,11 @@
},
selected:'',
typeOptions: [],
+ typeOption:[
+ {value:'1',label:'鑽ｈ獕'},
+ {value:'0',label:'璇佷欢'},
+ {value:'2',label:'璧勮川'},]
+
};
},
created() {
@@ -575,30 +608,44 @@
let _this = this
getCategory().then(response=>{
- response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ response.data.itemValues.replace("{", "").replace("}", "").split(",").map(elem => {
+ const label = elem.split(":")[0].trim();
+ const value = parseInt(elem.split(":")[1].trim());
+ _this.typeOptions.push({ "label": label, "value": value });
})
})
},
//绫诲埆閫夋嫨
- getSrc(type) {
- if (type === 1){
+ getSrc1(type){
+ if(type===0){
+ return '璇佷欢'
+ }else if(type===1){
+ return '鑽ｈ獕'
+ }else if(type===2){
+ return '璧勮川'
+ }
+ },
+ //鍚嶇О閫夋嫨
+ getSrc(name) {
+ if (name === 1){
return '鍑虹敓璇�'
- }else if(type === 2){
+ }else if(name === 2){
return '瀛︾敓璇�'
- }else if(type === 3){
+ }else if(name === 3){
return '姣曚笟璇�'
- }else if(type === 4){
+ }else if(name === 4){
return '缁撳璇�'
- }else if(type === 5){
+ }else if(name === 5){
return '鎴峰彛绨�'
- }else if(type === 6){
+ }else if(name === 6){
return '鐙敓瀛愬コ璇�'
- }else if(type === 7){
+ }else if(name === 7){
return '楂樼骇鑱岀О'
- }else if(type === 8){
+ }else if(name === 8){
return '鎶ょ収'
- }else if(type === 9){
+ }else if(name === 9){
return '閫氳璇�'
}else {
return '鍏跺畠'
@@ -659,6 +706,7 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
+
this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.1