From c30d5534c86d48cdd94d06b6760aeb57df56963f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 03 九月 2024 22:41:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/check/result/detail/detail.vue | 62 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 17 deletions(-)
diff --git a/src/views/system/check/result/detail/detail.vue b/src/views/system/check/result/detail/detail.vue
index bc41357..67b6417 100644
--- a/src/views/system/check/result/detail/detail.vue
+++ b/src/views/system/check/result/detail/detail.vue
@@ -1,5 +1,12 @@
<template>
- <div class="app-container">
+ <div style="padding: 0px 10px">
+ <div >
+ <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
+ >
+ <el-menu-item index="0">鐪佸巺鑰冩牳</el-menu-item>
+ <el-menu-item index="1">鍖哄幙鑰冩牳</el-menu-item>
+ </el-menu>
+ </div>
<el-container>
<el-main>
<h2>鑰冩牳瑙勫垯</h2>
@@ -91,18 +98,18 @@
:inline="true"
v-show="showSearch"
>
- <el-form-item label="鑰冩牳鏈堝害" prop="name">
- <el-date-picker
- v-model="queryParams.date"
- format="yyyy-MM"
- value-format="yyyy-MM"
- type="month"
- placeholder="閫夋嫨鏃ユ湡"
- @change="dateChange"
- >
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鑰冩牳瀛ｅ害">
+<!-- <el-form-item label="鑰冩牳鏈堝害" prop="name">-->
+<!-- <el-date-picker-->
+<!-- v-model="queryParams.date"-->
+<!-- format="yyyy-MM"-->
+<!-- value-format="yyyy-MM"-->
+<!-- type="month"-->
+<!-- placeholder="閫夋嫨鏃ユ湡"-->
+<!-- @change="dateChange"-->
+<!-- >-->
+<!-- </el-date-picker>-->
+<!-- </el-form-item>-->
+ <el-form-item label="鑰冩牳鏃堕棿">
<el-date-picker
:clearable="false"
v-model="queryParams.quarter"
@@ -154,6 +161,17 @@
>
<template slot-scope="scope">
<span>{{ translateDeptId(scope.row.dept_id) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鑰冩牳鏍囩"
+ align="center"
+ prop="dept_id"
+ width="120px"
+ fixed
+ >
+ <template slot-scope="scope">
+ {{ scope.row.examine_tag === 0 ? '鐪佸巺鑰冩牳' : '鍖哄幙鑰冩牳' }}
</template>
</el-table-column>
<template v-for="item in tableData">
@@ -325,7 +343,8 @@
queryParams: {
id: null,
date: null,
- quarter: null
+ quarter: null,
+ examineTag: null
},
// 琛ㄥ崟鏍￠獙
rules: {},
@@ -344,6 +363,9 @@
if (this.$route.query.id) {
this.queryParams.id = this.$route.query.id;
}
+ let examineTag = this.$route.query.examineTag;
+ this.activeIndex = examineTag;
+ this.queryParams.examineTag = examineTag;
// 鑰冩牳绉垎鍒楄〃
this.getList();
this.areaSelect();
@@ -441,6 +463,15 @@
this.indexOpen = true;
this.title = "淇敼鑰冩牳鎸囨爣";
},
+ /** 瀵艰埅鍒囨崲 */
+ handleSelect(key) {
+ this.activeIndex = key;
+ this.queryParams.examineTag = key;
+ // 鑰冩牳绉垎鍒楄〃
+ this.getList();
+
+
+ },
/** 淇敼鎸夐挳鎿嶄綔 */
handleRuleUpdate(row) {
this.reset("ruleForm");
@@ -471,9 +502,6 @@
},
`鑰冩牳鎸囨爣_${new Date().getTime()}.xlsx`
);
- },
- handleSelect(key, keyPath) {
- console.log(key, keyPath);
},
},
};
--
Gitblit v1.8.0