From 7603e24bb41407d62d2335276758a61270530067 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 15 十一月 2024 11:39:39 +0800
Subject: [PATCH] 工单白名单基础增删改查
---
src/views/system/point/index.vue | 71 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 8 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index 5f162cf..3a7ba72 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -1,8 +1,23 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" @submit.native.prevent>
<el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
- <el-input v-model="queryParams.pointName" placeholder="杈撳叆鐐逛綅鍚嶇О" clearable @keyup.enter.native="handleQuery" />
+ <el-input v-model="queryParams.pointName" placeholder="杈撳叆鐐逛綅鍚嶇О" clearable @clear="handleQuery" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鍗曚綅" prop="unit">
+ <el-select
+ v-model="queryParams.unitId"
+ placeholder="璇烽�夋嫨鍗曚綅"
+ clearable
+ @change="handleQuery"
+ >
+ <el-option
+ v-for="unit in unitList"
+ :key="unit.id"
+ :label="unit.value"
+ :value="unit.id"
+ />
+ </el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
@@ -61,6 +76,7 @@
size="small"
v-model="ywTimes"
type="daterange"
+ value-format="yyyy-MM-dd"
range-separator="鑷�"
start-placeholder="鏇存崲杩愮淮鏃堕棿"
end-placeholder="鏇存崲杩愮淮鏃堕棿">
@@ -91,10 +107,10 @@
<!-- <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>
+ <right-toolbar @refreshHeader= "getDyColumn" :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
+ <el-table :key = "refreshkey" 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="200" show-overflow-tooltip>
@@ -110,6 +126,11 @@
<el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" />
<el-table-column label="鐩戠閮ㄩ棬" align="center" prop="deptName" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
+ <el-table-column v-for="(column, index) in dynamicColumnList" :key="index" :label="column.labelValue" :prop="column.propName" align="center">
+ <template slot-scope="scope">
+ {{ getDynamicValue(scope.row, column.propName) }}
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -137,7 +158,7 @@
</el-cascader>
</el-form-item>
<el-form-item label="杩愮淮鍗曚綅" prop="unitId">
- <el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅">
+ <el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅" clearable @clear = "clearTime">
<el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
@@ -235,22 +256,24 @@
</template>
<script>
+import { addDynamicColumn, deleteDynamicColumnById, editDynamicColumn, getDynamicColumnList } from '@/api/platform/dynamicColumn'
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'
-
export default {
name: "Point",
dicts: ['point_tag', 'area_code'],
data() {
return {
+ refreshkey : 0,
+ dynamicColumnList: [],
needUpdateUnit: false,
importantTag: false,
provinceTag: false,
importantCommandImageTag: false,
timeList: [],
- timezone: [],
+ timezone: null,
ywTimes: [],
fileList: [],
importFile: null,
@@ -328,8 +351,28 @@
this.getUnitSelect();
// this.getCascader();
this.getDeptCascader();
+ this.getDyColumn();
},
methods: {
+ clearTime() {
+ console.log("鐢熸晥")
+ this.timezone = '';
+ },
+ getDyColumn() {
+ // 鏌ヨ鍔ㄦ�佸垪
+ let params = {
+ tableName: 't_yw_point'
+ }
+ getDynamicColumnList(params).then(res => {
+ this.dynamicColumnList = res.data
+ this.refreshkey+=1
+ console.log("鍔犺浇鍔ㄦ�佸垪"+this.refreshkey)
+ })
+ },
+ getDynamicValue(row, propName) {
+ let target = row.dynamicColumnList.filter(item => item.propName === propName)
+ return target && target.length > 0 ? target[0].columnValue : ''
+ },
getTagText(row) {
let text = '';
@@ -416,7 +459,12 @@
handleEditBatch() {
this.batchOpen = true;
},
-
+ // 杩愮淮鍏徃涓嬫媺鏁版嵁
+ selectUnit() {
+ workList(this.queryParams).then(res => {
+ this.unitList = res.data;
+ })
+ },
// 鑾峰彇鍖哄幙绾ц仈
getCascader() {
getCascader().then(res => {
@@ -507,6 +555,13 @@
submitForm() {
this.$refs['form'].validate(valid => {
if (valid) {
+ if (this.timezone && this.timezone.length > 0) {
+ this.form.startTime = this.timezone[0]
+ this.form.endTime = this.timezone[1]
+ } else {
+ this.form.startTime = null
+ this.form.endTime = null
+ }
if (this.form.deptId && this.form.deptId.length > 0) {
this.form.deptId = this.form.deptId[this.form.deptId.length - 1]
}
--
Gitblit v1.8.0