From 47a9d0b2711203995fd5eeb00df1bebda7d63ad8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 21 三月 2024 10:27:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/score/index.vue | 87 +++++++++++++++++--------------------------
1 files changed, 35 insertions(+), 52 deletions(-)
diff --git a/src/views/system/score/index.vue b/src/views/system/score/index.vue
index 1a0bd98..ba5dc99 100644
--- a/src/views/system/score/index.vue
+++ b/src/views/system/score/index.vue
@@ -1,14 +1,14 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="鍗曚綅鍚�" prop="unitId">
- <el-input
- v-model="queryParams.unitId"
- placeholder="璇疯緭鍏ュ崟浣嶅悕"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
+<!-- <el-form-item label="鍗曚綅鍚�" prop="unitId">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.unitId"-->
+<!-- placeholder="璇疯緭鍏ュ崟浣嶅悕"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
<el-form-item label="鑰冩牳鍚�" prop="examineId">
<el-input
v-model="queryParams.examineId"
@@ -17,24 +17,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎿嶄綔绫诲瀷" prop="operateCategory">
- <el-select v-model="queryParams.operateCategory" placeholder="璇烽�夋嫨鎿嶄綔绫诲瀷" clearable>
- <el-option
- v-for="dict in dict.type.platform_operate_category"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="绉垎绫诲瀷" prop="scoreCategory">
- <el-input
- v-model="queryParams.scoreCategory"
- placeholder="璇疯緭鍏ョН鍒嗙被鍨�"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
+<!-- <el-form-item label="绉垎绫诲瀷" prop="scoreCategory">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.scoreCategory"-->
+<!-- placeholder="璇疯緭鍏ョН鍒嗙被鍨�"-->
+<!-- clearable-->
+<!-- @keyup.enter.native="handleQuery"-->
+<!-- />-->
+<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -86,24 +76,29 @@
<el-table v-loading="loading" :data="scoreList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="鑰冩牳鍚�" align="center" prop="examineName" />
- <el-table-column label="鍗曚綅鍚�" align="center" prop="unitName" />
- <el-table-column label="鍒嗗��" align="center" prop="score" />
- <el-table-column label="鎿嶄綔绫诲瀷" align="center" prop="operateCategory">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.platform_operate_category" :value="scope.row.operateCategory"/>
- </template>
+ <el-table-column label="鑰冩牳瀵硅薄" align="center" >
+ {{"鎴愰兘x杩愮淮"}}
</el-table-column>
- <el-table-column label="绉垎绫诲瀷" align="center" prop="scoreCategory">
+ <el-table-column label="鍒嗗��" align="center" prop="score" />
+ <el-table-column label="鑰冩牳瑙勫垯" align="center" prop="scoreCategory">
<template slot-scope="scope">
<div v-if="scope.row.scoreCategory === 1">瑙嗛鍦ㄧ嚎鐜�</div>
<div v-else-if="scope.row.scoreCategory === 2">瀛樺偍鏁呴殰</div>
- <div v-else-if="scope.row.scoreCategory === 3">淇濋殰宸ヤ綔</div>
+ <div v-else-if="scope.row.scoreCategory === 4">涓�鏈轰竴妗�24灏忔椂鏈慨澶�</div>
+ <div v-else-if="scope.row.scoreCategory === 5">鏃堕挓涓嶅悓姝�24灏忔椂鏈慨澶�</div>
</template>
</el-table-column>
<el-table-column label="鍒涘缓浜�" align="center" prop="createBy" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-s-check"
+ @click="handleAuditing(scope.row)"
+ v-hasPermi="['score:publish:audit']"
+ >瀹℃牳</el-button>
<el-button
size="mini"
type="text"
@@ -134,16 +129,6 @@
<el-form-item label="鍒嗗��" prop="score">
<el-input v-model="form.score" placeholder="璇疯緭鍏ュ垎鍊�" />
</el-form-item>
- <el-form-item label="鍗曚綅鍚�" prop="unitId">
- <el-select v-model="form.unitId" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in unitList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
<el-form-item label="鑰冩牳鍚�" prop="examineId">
<el-select v-model="form.examineId" placeholder="璇烽�夋嫨">
<el-option
@@ -154,17 +139,17 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鎿嶄綔绫诲瀷" prop="operateCategory">
- <el-select v-model="form.operateCategory" placeholder="璇烽�夋嫨鎿嶄綔绫诲瀷">
+ <el-form-item label="鑰冩牳瀵硅薄" prop="unitId">
+ <el-select v-model="form.unitId" placeholder="璇烽�夋嫨">
<el-option
- v-for="item in operateCategoryList"
+ v-for="item in unitList"
:key="item.id"
:label="item.value"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="绉垎绫诲瀷" prop="scoreCategory">
+ <el-form-item label="鑰冩牳瑙勫垯" prop="scoreCategory">
<el-select v-model="form.scoreCategory" placeholder="璇烽�夋嫨">
<el-option
v-for="item in scoreCategoryList"
@@ -193,14 +178,12 @@
dicts: ['platform_operate_category'],
data() {
return {
- operateCategoryList: [
- { id: 2, value: '浜哄伐鎵撳垎' },
- { id: 1, value: '绯荤粺鎵撳垎' },
- ],
scoreCategoryList: [
{ id: 2, value: '瀛樺偍鏁呴殰' },
{ id: 1, value: '瑙嗛鍦ㄧ嚎鐜�' },
{ id: 3, value: '淇濋殰宸ヤ綔' },
+ { id: 4, value: '涓�鏈轰竴妗�24灏忔椂鏈慨澶�' },
+ { id: 5, value: '鏃堕挓涓嶅悓姝�24灏忔椂鏈慨澶�' },
],
unitList: [],
--
Gitblit v1.8.0