From 043c591be4650cc254e3467e8d5b5d90ed2f9984 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期一, 29 四月 2024 18:00:00 +0800
Subject: [PATCH] Merge branch 'master' into dev-threejs
---
src/views/system/point/index.vue | 84 +++---------------------------------------
1 files changed, 6 insertions(+), 78 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index fe561c1..6d51e3f 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -4,16 +4,6 @@
<el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
<el-input v-model="queryParams.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="鐐逛綅寮�濮嬫椂闂�" prop="startTime">
- <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鐐逛綅寮�濮嬫椂闂�">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鐐逛綅缁撴潫鏃堕棿" prop="endTime">
- <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鐐逛綅缁撴潫鏃堕棿">
- </el-date-picker>
- </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>
@@ -57,16 +47,6 @@
<dict-tag :options="dict.type.point_tag" :value="scope.row.pointTags" />
</template>
</el-table-column>
- <el-table-column label="鐐逛綅寮�濮嬫椂闂�" align="center" prop="startTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鐐逛綅缁撴潫鏃堕棿" align="center" prop="endTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
<el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" />
<el-table-column label="鐩戠閮ㄩ棬" align="center" prop="deptName" />
<el-table-column label="杩愮淮绫诲埆" align="center" prop="category">
@@ -76,7 +56,6 @@
<div v-else-if="scope.row.category === 3">浜鸿劯璇嗗埆</div>
</template>
</el-table-column>
- <el-table-column label="杩愮淮鐘舵��" align="center" prop="status" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
<el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -123,10 +102,8 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐐逛綅鏃跺尯" prop="timezone">
- <el-date-picker @change="dateChange" v-model="form.timezone" type="daterange" align="right" unlink-panels
- range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
- </el-date-picker>
+ <el-form-item label="鐐逛綅澶囨敞" prop="remark">
+ <el-input type="textarea" v-model="form.remark"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -147,11 +124,6 @@
<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="timezone">
- <el-date-picker @change="dateChange" v-model="batchEditForm.timezone" type="daterange" align="right"
- unlink-panels range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
- </el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -180,15 +152,11 @@
ids: [],
unitId: null,
timezone: null,
- startTime: null,
- endTime: null
},
// 鎵归噺淇敼寮圭獥
batchOpen: false,
props: { multiple: true },
regionList: [],
- // 姝ｅ湪淇敼绗嚑涓�
- editingIndex: null,
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -211,26 +179,17 @@
editOpen: false,
// 杩愮淮鍗曚綅
unitList: [],
- // 杩愮淮鏃跺尯
- timezone: [],
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
pageSize: 10,
pointName: null,
- startTime: null,
- endTime: null,
unitId: null,
status: null,
},
// 琛ㄥ崟鍙傛暟
- form: {},
- // 鎵归噺琛ㄥ崟鍐呭
- formList: [],
- // 涓存椂琛ㄥ崟鏁版嵁
- tempForm: {},
- // 涓存椂琛ㄥ崟鏁版嵁鍒楄〃
- tempFormList: [],
+ form: {
+ },
// 琛ㄥ崟鏍￠獙
rules: {
pointName: [
@@ -284,9 +243,7 @@
handleEditBatch() {
this.batchOpen = true;
},
- removeRegion(item) {
- this.tempFormList = this.tempFormList.filter(data => data !== item)
- },
+
// 鑾峰彇鍖哄幙绾ц仈
getCascader() {
getCascader().then(res => {
@@ -299,33 +256,11 @@
this.deptOptions = res.data;
})
},
- // 鐐逛綅椤逛慨鏀瑰畬鎴�
- editFinishItem(index) {
- this.editingIndex = null;
- let form = this.tempFormList[index];
- form.startTime = form.timezone[0];
- form.endTime = form.timezone[1];
- this.formList[index] = form;
- },
- // 鐐逛綅椤逛慨鏀�
- editPointItem(index) {
- if (this.editingIndex !== index && this.editingIndex !== null) {
- this.$modal.msgWarning("璇峰厛瀹屾垚涓婁竴涓慨鏀�");
- } else {
- this.editingIndex = index;
- this.tempFormList[index] = this.formList[index];
- }
- },
+
// 鏃堕棿閫夋嫨鍙戠敓鍙樺寲
dateChange() {
this.tempForm.startTime = this.tempForm.timezone[0];
this.tempForm.endTime = this.tempForm.timezone[1];
- },
- // 缁х画娣诲姞鐐逛綅
- nextAdd() {
- let item = {}
- // this.formList.push(item);
- this.tempFormList.push(item);
},
getUnitSelect() {
// 杩愮淮鍗曚綅涓嬫媺鍒楄〃
@@ -347,17 +282,11 @@
this.open = false;
this.reset();
},
- updateCancel() {
- this.editOpen = false;
- this.reset();
- },
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
id: null,
pointName: null,
- startTime: null,
- endTime: null,
unitId: null,
deptId: [],
status: null,
@@ -399,7 +328,6 @@
this.form = response.data;
this.form.pointTag = response.data.pointTags;
this.form.deptId = response.data.deptIds
- this.form.timezone = [this.form.startTime, this.form.endTime]
this.form.category = this.form.category + ''
this.open = true;
this.title = "淇敼杩愮淮鐐逛綅";
--
Gitblit v1.8.0