From 0311359d2b04fc7176509b00a383dce057443001 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期日, 08 十二月 2024 22:30:52 +0800
Subject: [PATCH] 导入合同规则
---
src/views/system/point/index.vue | 82 ++++++++++++++++++++++++++++++++++------
1 files changed, 69 insertions(+), 13 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index ef120cf..99212b6 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>
@@ -142,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>
@@ -173,9 +189,27 @@
inactive-text="鏅�氱偣浣�">
</el-switch>
</el-form-item>
- <el-form-item label="鐪佸巺:" prop="provinceTag">
+ <el-form-item label="瑙嗛:" prop="provinceTagVideo">
<el-switch
- v-model="form.provinceTag"
+ v-model="form.provinceTagVideo"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="鐪佸巺鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="杞﹁締:" prop="provinceTagCar">
+ <el-switch
+ v-model="form.provinceTagCar"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="鐪佸巺鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="浜鸿劯:" prop="provinceTagFace">
+ <el-switch
+ v-model="form.provinceTagFace"
active-color="#13ce66"
inactive-color="gray"
active-text="鐪佸巺鐐逛綅"
@@ -245,19 +279,19 @@
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,
@@ -335,9 +369,13 @@
this.getUnitSelect();
// this.getCascader();
this.getDeptCascader();
- this.getDyColumn()
+ this.getDyColumn();
},
methods: {
+ clearTime() {
+ console.log("鐢熸晥")
+ this.timezone = '';
+ },
getDyColumn() {
// 鏌ヨ鍔ㄦ�佸垪
let params = {
@@ -345,6 +383,8 @@
}
getDynamicColumnList(params).then(res => {
this.dynamicColumnList = res.data
+ this.refreshkey+=1
+ console.log("鍔犺浇鍔ㄦ�佸垪"+this.refreshkey)
})
},
getDynamicValue(row, propName) {
@@ -356,7 +396,9 @@
// 妫�鏌ユ瘡涓爣绛撅紝濡傛灉涓簍rue锛屽垯娣诲姞鍒皌ext涓�
if (row.importantTag) text += '閲嶇偣鐐逛綅銆�';
- if (row.provinceTag) text += '鐪佸巺鐐逛綅銆�';
+ if (row.provinceTagVideo) text += '鐪佸巺瑙嗛銆�';
+ if (row.provinceTagCar) text += '鐪佸巺杞﹁締銆�';
+ if (row.provinceTagFace) text += '鐪佸巺浜鸿劯銆�';
if (row.importantCommandImageTag) text += '閲嶇偣鎸囨尌鍥惧儚銆�';
if (row.deptTag) text += '閮ㄧ骇銆�';
text === '' ? '鏅�氱偣浣�' : text
@@ -437,7 +479,12 @@
handleEditBatch() {
this.batchOpen = true;
},
-
+ // 杩愮淮鍏徃涓嬫媺鏁版嵁
+ selectUnit() {
+ workList(this.queryParams).then(res => {
+ this.unitList = res.data;
+ })
+ },
// 鑾峰彇鍖哄幙绾ц仈
getCascader() {
getCascader().then(res => {
@@ -483,7 +530,9 @@
updateTime: null,
deleted: null,
importantTag: false,
- provinceTag: false,
+ provinceTagVideo: false,
+ provinceTagCar: false,
+ provinceTagFace: false,
deptTag: false,
};
this.resetForm("form");
@@ -528,6 +577,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