From 8aa8085a5cfc8ec3b89a9b655bb3bf349c26e9ba Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 21:13:42 +0800
Subject: [PATCH] 考核详情加标签table
---
src/views/system/point/index.vue | 154 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 111 insertions(+), 43 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index 83c25d0..8554d51 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -35,18 +35,35 @@
<el-col :span="1.5">
<el-popover>
<div class="bottom_">
- <el-select v-model="importUnitId" size="small" placeholder="杩愮淮鍗曚綅">
+ <p>瀵煎叆鐐逛綅鍙仛鏇存柊鎿嶄綔</p>
+ </div>
+ <div class="bottom_">
+ <el-switch
+ v-model="needUpdateUnit"
+ active-text="淇敼杩愮淮鍗曚綅/鏃堕棿"
+ inactive-text="涓嶄慨鏀硅繍缁村崟浣�/鏃堕棿">
+ </el-switch>
+ </div>
+ <div class="bottom_" v-show="needUpdateUnit">
+ <el-select @change="getUnitContractTime" v-model="importUnitId" size="small" placeholder="鏇存崲杩愮淮鍗曚綅">
<el-option v-for="unit in unitList" :key="unit.id" :label="unit.value" :value="unit.id"></el-option>
</el-select>
</div>
- <div class="bottom_">
+ <div class="bottom_" v-show="needUpdateUnit">
+ <el-select @change="showTimeRange" v-model="contractId" size="small" placeholder="杩愮淮鍚堝悓" :disabled="! importUnitId">
+ <el-option v-for="(time, index) in timeList" :key="index" :label="time.name" :value="time.id"></el-option>
+ </el-select>
+ <span style="margin-left: 10px;color: #8a8989" v-show="importUnitId">璇ュ崟浣嶆湁{{timeList.length}}涓悎鍚�</span>
+ </div>
+ <div class="bottom_" v-show="needUpdateUnit">
<el-date-picker
+ :disabled="! contractId"
size="small"
v-model="ywTimes"
type="daterange"
range-separator="鑷�"
- start-placeholder="杩愮淮寮�濮嬫椂闂�"
- end-placeholder="杩愮淮缁撴潫鏃堕棿">
+ start-placeholder="鏇存崲杩愮淮鏃堕棿"
+ end-placeholder="鏇存崲杩愮淮鏃堕棿">
</el-date-picker>
</div>
<div class="bottom_">
@@ -64,37 +81,31 @@
</el-upload>
</div>
<div>
- <el-button class="bottom_" type="primary" size="small" v-model="upload" :disabled="! importUnitId || ! importFile || ! this.ywTimes || this.ywTimes.length < 2" @click="handleImport"
+ <el-button class="bottom_" type="primary" size="small" v-loading="upload" @click="handleImport"
v-hasPermi="['point:import']">瀵煎叆</el-button>
</div>
<el-button type="primary" size="mini" plain icon="el-icon-top" slot="reference">瀵煎叆鐐逛綅</el-button>
</el-popover>
</el-col>
- <el-col :span="1.5">
- <el-button type="danger" plain icon="el-icon-receiving" size="mini" @click="handleEditBatch"
- v-hasPermi="['point:edit']">鎵归噺淇敼</el-button>
- </el-col>
+<!-- <el-col :span="1.5">-->
+<!-- <el-button type="danger" plain icon="el-icon-receiving" size="mini" @click="handleEditBatch"-->
+<!-- v-hasPermi="['point:edit']">鎵归噺淇敼</el-button>-->
+<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="鐐逛綅鍚嶇О" prop="pointName" width="200" show-overflow-tooltip/>
- <el-table-column label="閲嶇偣鏍囩" align="center" width="90" show-overflow-tooltip>
+ <el-table-column label="鏍囩" align="center" width="200" show-overflow-tooltip>
<template slot-scope="scope">
- <div v-if="scope.row.importantTag === 'important'">閲嶇偣鐐逛綅</div>
- <div v-else-if="scope.row.importantTag === 'normal'">鏅�氱偣浣�</div>
+ <!-- 浣跨敤璁＄畻灞炴�ф潵鏄剧ず鎷兼帴鍚庣殑鏂囨湰 -->
+ <div>{{ getTagText(scope.row) }}</div>
</template>
</el-table-column>
- <el-table-column label="鐪佸巺鏍囩" align="center" width="90" show-overflow-tooltip>
- <template slot-scope="scope">
- <div v-if="scope.row.provinceTag === 'province'">鐪佸巺鐐逛綅</div>
- <div v-else-if="scope.row.provinceTag === 'normal'">鏅�氱偣浣�</div>
- </template>
+ <el-table-column label="杩愮淮寮�濮嬫椂闂�" align="center" prop="startTime" width="140">
</el-table-column>
- <el-table-column label="鐐逛綅寮�濮嬫椂闂�" align="center" prop="startTime" width="140">
- </el-table-column>
- <el-table-column label="鐐逛綅缁撴潫鏃堕棿" align="center" prop="endTime" width="140">
+ <el-table-column label="杩愮淮缁撴潫鏃堕棿" align="center" prop="endTime" width="140">
</el-table-column>
<el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" />
<el-table-column label="鐩戠閮ㄩ棬" align="center" prop="deptName" />
@@ -114,21 +125,51 @@
<!-- 娣诲姞杩愮淮鐐逛綅瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
<el-input v-model="form.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" />
</el-form-item>
<el-form-item label="閲嶇偣鏍囩" prop="importantTag">
- <el-select v-model="form.importantTag" placeholder="閲嶇偣鏍囩" clearable>
- <el-option label="閲嶇偣鐐逛綅" value="important" />
- <el-option label="鏅�氱偣浣�" value="normal" />
- </el-select>
+ <el-switch
+ style="display: block"
+ v-model="form.importantTag"
+ active-color="#13ce66"
+ inactive-color="#409EFF"
+ active-text="閲嶇偣鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ <!-- <el-select v-model="form.importantTag" placeholder="閲嶇偣鏍囩" clearable>
+ <el-option label="閲嶇偣鐐逛綅" :value="true" />
+ <el-option label="鏅�氱偣浣�" :value="false" />
+ </el-select> -->
</el-form-item>
<el-form-item label="鐪佸巺鏍囩" prop="provinceTag">
- <el-select v-model="form.provinceTag" placeholder="鐪佸巺鏍囩" clearable>
- <el-option label="鐪佸巺鐐逛綅" value="province" />
- <el-option label="鏅�氱偣浣�" value="normal" />
- </el-select>
+ <el-switch
+ style="display: block"
+ v-model="form.provinceTag"
+ active-color="#13ce66"
+ inactive-color="#409EFF"
+ active-text="鐪佸巺鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ <!-- <el-select v-model="form.provinceTag" placeholder="鐪佸巺鏍囩" clearable>
+ <el-option label="鐪佸巺鐐逛綅" :value="true" />
+ <el-option label="鏅�氱偣浣�" :value="false" />
+ </el-select> -->
+ </el-form-item>
+ <el-form-item label="閲嶇偣鎸囨尌鍥惧儚鏍囩" prop="importantCommandImageTag">
+ <el-switch
+ style="display: block"
+ v-model="form.importantCommandImageTag"
+ active-color="#13ce66"
+ inactive-color="#409EFF"
+ active-text="閲嶇偣鎸囨尌鍥惧儚鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ <!-- <el-select v-model="form.importantCommandImageTag" placeholder="閲嶇偣鎸囨尌鍥惧儚鏍囩" clearable>
+ <el-option label="閲嶇偣鎸囨尌鍥惧儚鐐逛綅" :value="true" />
+ <el-option label="鏅�氱偣浣�" :value="false" />
+ </el-select> -->
</el-form-item>
<!-- <el-form-item label="鐐逛綅鎵�鍦ㄥ湴" prop="region">-->
<!-- <el-cascader v-model="form.region" :options="regionList" placeholder="鐐逛綅鎵�鍦ㄥ湴" :props="props" collapse-tags></el-cascader>-->
@@ -137,11 +178,6 @@
<el-cascader v-model="form.deptId" :options="deptOptions" :show-all-levels="false" clearable
:props="{ checkStrictly: true }">
</el-cascader>
- </el-form-item>
- <el-form-item label="鐐逛綅鏍囩" prop="pointTag">
- <el-select v-model="form.pointTag" placeholder="鐐逛綅鏍囩" multiple clearable>
- <el-option v-for="dict in dict.type.point_tag" :key="dict.value" :label="dict.label" :value="dict.value" />
- </el-select>
</el-form-item>
<el-form-item label="杩愮淮鍗曚綅" prop="unitId">
<el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅">
@@ -198,7 +234,7 @@
</template>
<script>
-import { listPoint, getPoint, delPoint, addPoint, batchEdit, updatePoint, exportData, importData } from "@/api/platform/point";
+import { listPoint, getPoint, delPoint, addPoint, batchEdit, updatePoint, exportData, importData, timeRange } from "@/api/platform/point";
import { unitSelect } from "@/api/platform/unit";
import { getCascader } from '@/api/platform/region'
import { cascader } from '@/api/system/dept'
@@ -208,12 +244,18 @@
dicts: ['point_tag'],
data() {
return {
+ needUpdateUnit: false,
+ importantTag: false,
+ provinceTag: false,
+ importantCommandImageTag: false,
+ timeList: [],
timezone: [],
ywTimes: [],
fileList: [],
importFile: null,
importUrl: '',
importUnitId: null,
+ contractId: null,
download: false,
upload: false,
deptOptions: [],
@@ -287,6 +329,34 @@
this.getDeptCascader();
},
methods: {
+ getTagText(row) {
+ let text = '';
+
+ // 妫�鏌ユ瘡涓爣绛撅紝濡傛灉涓簍rue锛屽垯娣诲姞鍒皌ext涓�
+ if (row.importantTag) text += '閲嶇偣鐐逛綅銆�';
+ if (row.provinceTag) text += '鐪佸巺鐐逛綅銆�';
+ if (row.importantCommandImageTag) text += '閲嶇偣鎸囨尌鍥惧儚銆�';
+ if (row.deptTag) text += '閮ㄧ骇銆�';
+ text === '' ? '鏅�氱偣浣�' : text
+ // 杩斿洖鎷兼帴鍚庣殑鏂囨湰鍜屽浐瀹氭枃瀛�
+ return text.replace(/銆�$/, '')
+ },
+ getUnitContractTime(unitId) {
+ this.ywTimes = []
+ this.contractId = null;
+ timeRange(unitId).then(res => {
+ this.timeList = res.data;
+ })
+ },
+ showTimeRange(contractId) {
+ let a = this.timeList.filter(item => item.id === contractId)
+ if (a.length < 1) {
+ this.ywTimes = []
+ return
+ }
+ let target = a[0]
+ this.ywTimes = [target.startTime, target.endTime]
+ },
beforeUpload(file) {
this.importFile = file
this.fileList = [file]
@@ -294,16 +364,14 @@
},
// 鐐逛綅瀵煎叆
handleImport() {
- if (! this.ywTimes || this.ywTimes.length < 2) {
- this.$message.error("璇烽�夋嫨杩愮淮鏃堕棿")
- return
- }
this.upload =true;
let formData = new FormData()
formData.append("file", this.importFile)
- formData.append("startTime", this.ywTimes[0])
- formData.append("endTime", this.ywTimes[1])
- importData(formData, this.importUnitId).then(res => {
+ formData.append("startTime", this.ywTimes[0] ? this.ywTimes[0] : '')
+ formData.append("endTime", this.ywTimes[1] ? this.ywTimes[1] : '')
+ formData.append("unitId", this.importUnitId ? this.importUnitId : -1)
+ formData.append("needUpdateUnit", this.needUpdateUnit)
+ importData(formData).then(res => {
this.$message.success("瀵煎叆鎴愬姛")
this.upload = false
this.getList()
@@ -481,7 +549,7 @@
<style scoped>
.bottom_ {
width: 100%;
- margin-bottom: 5px;
+ margin-bottom: 8px;
}
.col-item {
margin: 5px 0;
--
Gitblit v1.8.0