From 3283fe1a1b37141e2db03752c35a42a8ad3e9be2 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 25 三月 2024 18:09:44 +0800
Subject: [PATCH] 事前事后报备增加筛选条件
---
src/views/system/point/index.vue | 323 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 257 insertions(+), 66 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index a0aa54e..854dc37 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
<el-input
v-model="queryParams.pointName"
@@ -32,16 +32,15 @@
</el-form>
<el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['x:point:add']"
- >鏂板</el-button>
- </el-col>
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="primary"-->
+<!-- plain-->
+<!-- icon="el-icon-plus"-->
+<!-- size="mini"-->
+<!-- @click="handleAdd"-->
+<!-- >鏂板</el-button>-->
+<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="success"
@@ -50,7 +49,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['x:point:edit']"
>淇敼</el-button>
</el-col>
<el-col :span="1.5">
@@ -61,18 +59,25 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['x:point:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
- icon="el-icon-download"
+ icon="el-icon-top"
size="mini"
- @click="handleExport"
- v-hasPermi="['x:point:export']"
- >瀵煎嚭</el-button>
+ @click="handleImportPoint"
+ >瀵煎叆鐐逛綅</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ plain
+ icon="el-icon-receiving"
+ size="mini"
+ @click="handleEditBatch"
+ >鎵归噺淇敼</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -90,7 +95,15 @@
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
- <el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitId" />
+ <el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" />
+ <el-table-column label="鐩戠閮ㄩ棬" align="center" prop="deptName" />
+ <el-table-column label="杩愮淮绫诲埆" align="center" prop="category">
+ <template slot-scope="scope">
+ <div v-if="scope.row.category === 1">瑙嗛鐩戞帶</div>
+ <div v-else-if="scope.row.category === 2">杞﹁締璇嗗埆</div>
+ <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" class-name="small-padding fixed-width">
@@ -100,14 +113,12 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['x:point:edit']"
>淇敼</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['x:point:remove']"
>鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -121,30 +132,51 @@
@pagination="getList"
/>
- <!-- 娣诲姞鎴栦慨鏀硅繍缁寸偣浣嶅璇濇 -->
+ <!-- 娣诲姞杩愮淮鐐逛綅瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
<el-input v-model="form.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" />
</el-form-item>
- <el-form-item label="鐐逛綅寮�濮嬫椂闂�" prop="startTime">
- <el-date-picker clearable
- v-model="form.startTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鐐逛綅寮�濮嬫椂闂�">
- </el-date-picker>
+ <el-form-item label="鐐逛綅鎵�鍦ㄥ湴" prop="region">
+ <el-cascader v-model="form.region" :options="regionList" placeholder="鐐逛綅鎵�鍦ㄥ湴" :props="props" collapse-tags></el-cascader>
</el-form-item>
- <el-form-item label="鐐逛綅缁撴潫鏃堕棿" prop="endTime">
- <el-date-picker clearable
- v-model="form.endTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鐐逛綅缁撴潫鏃堕棿">
- </el-date-picker>
+ <el-form-item label="璁惧绫诲瀷" prop="category">
+ <el-select v-model="form.category" placeholder="璁惧绫诲瀷">
+ <el-option label="浜鸿劯璇嗗埆" value="2"/>
+ <el-option label="瑙嗛鐩戞帶" value="1"/>
+ <el-option label="杞﹁締鐩戞帶" value="3"/>
+ </el-select>
</el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-form-item label="鐩戠閮ㄩ棬" prop="category">
+ <el-select v-model="form.deptName" placeholder="鐩戠閮ㄩ棬">
+ <el-option label="鐪佸巺" value="鐪佸巺"/>
+ <el-option label="鑷础鑽ｅ幙鍏畨灞�" value="鑷础鑽ｅ幙鍏畨灞�"/>
+ <el-option label="鑷础瀵岄『鍏畨灞�" value="鑷础瀵岄『鍏畨灞�"/>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="杩愮淮鍗曚綅" prop="unitId">
+ <el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅">
+ <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="form.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">
@@ -152,16 +184,69 @@
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
+
+ <!-- 鎵归噺淇敼杩愮淮鍗曚綅 -->
+ <el-dialog title="鎵归噺淇敼杩愮淮鍗曚綅" :visible.sync="batchOpen" width="600px" append-to-body>
+ <el-form ref="form" :model="batchEditForm" :rules="batchRules" label-width="120px">
+ <el-form-item label="鐐逛綅閫夋嫨" prop="ids">
+ <el-cascader @change="cos" v-model="batchEditForm.ids" :options="regionList" placeholder="璇烽�夋嫨鍖哄煙" :props="props" collapse-tags></el-cascader>
+ </el-form-item>
+ <el-form-item label="杩愮淮鍗曚綅" prop="unitId">
+ <el-select v-model="batchEditForm.unitId" placeholder="閫夋嫨杩愮淮鍗曚綅">
+ <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">
+ <el-button type="primary" @click="submitBatchEdit">纭� 瀹�</el-button>
+ <el-button @click="cancelBatchEdit">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+
</div>
</template>
<script>
-import { listPoint, getPoint, delPoint, addPoint, updatePoint } from "@/api/platform/point";
+import { listPoint, getPoint, delPoint, addPoint, batchEdit, updatePoint } from "@/api/platform/point";
+import { unitSelect } from "@/api/platform/unit";
+import { getCascader } from '../../../api/platform/region'
export default {
name: "Point",
data() {
return {
+ // 鎵归噺淇敼琛ㄥ崟
+ batchEditForm: {
+ ids: [],
+ unitId: null,
+ timezone: null,
+ startTime: null,
+ endTime: null
+ },
+ // 鎵归噺淇敼寮圭獥
+ batchOpen: false,
+ props: { multiple: true },
+ regionList: [],
+ // 姝ｅ湪淇敼绗嚑涓�
+ editingIndex: null,
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -180,6 +265,12 @@
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
+ // 淇敼寮圭獥
+ editOpen: false,
+ // 杩愮淮鍗曚綅
+ unitList: [],
+ // 杩愮淮鏃跺尯
+ timezone:[],
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -192,32 +283,112 @@
},
// 琛ㄥ崟鍙傛暟
form: {},
+ // 鎵归噺琛ㄥ崟鍐呭
+ formList:[],
+ // 涓存椂琛ㄥ崟鏁版嵁
+ tempForm: {},
+ // 涓存椂琛ㄥ崟鏁版嵁鍒楄〃
+ tempFormList: [],
// 琛ㄥ崟鏍￠獙
rules: {
pointName: [
{ required: true, message: "鐐逛綅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
],
- startTime: [
- { required: true, message: "鐐逛綅寮�濮嬫椂闂翠笉鑳戒负绌�", trigger: "blur" }
+ region: [
+ { required: true, message: "鐐逛綅鎵�鍦ㄥ湴涓嶈兘涓虹┖", trigger: "change" }
],
- endTime: [
- { required: true, message: "鐐逛綅缁撴潫鏃堕棿涓嶈兘涓虹┖", trigger: "blur" }
+ deptName: [
+ { required: true, message: "鐩戠閮ㄩ棬涓嶈兘涓虹┖", trigger: "change" }
],
- unitId: [
- { required: true, message: "杩愮淮鍗曚綅涓嶈兘涓虹┖", trigger: "change" }
+ category: [
+ { required: true, message: "璁惧绫诲瀷", trigger: "change" }
],
+ },
+ // 鎵归噺琛ㄥ崟鏍￠獙
+ batchRules: {
+ ids: [
+ { required: true, message: "璇烽�夋嫨鐐逛綅", trigger: "change" }
+ ]
}
};
},
created() {
this.getList();
+ this.getUnitSelect();
+ this.getCascader();
},
methods: {
+ // 鐐逛綅瀵煎叆
+ handleImportPoint() {
+
+ },
+ cos(value) {
+ console.log(value)
+ },
+ // 鎻愪氦鎵归噺淇敼
+ submitBatchEdit() {
+ this.batchEditForm.ids = this.batchEditForm.ids.map(array => array[array.length - 1]);
+ if (this.batchEditForm.timezone) {
+ this.batchEditForm.startTime = this.batchEditForm.timezone[0];
+ this.batchEditForm.endTime = this.batchEditForm.timezone[1];
+ }
+ },
+ // 鍙栨秷鎵归噺淇敼
+ cancelBatchEdit() {
+ this.batchOpen = false;
+ },
+ // 鎵归噺淇敼
+ handleEditBatch() {
+ this.batchOpen = true;
+ },
+ removeRegion(item) {
+ this.tempFormList = this.tempFormList.filter(data => data !== item)
+ },
+ // 鑾峰彇鍖哄幙绾ц仈
+ getCascader() {
+ getCascader().then(res => {
+ this.regionList = 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() {
+ // 杩愮淮鍗曚綅涓嬫媺鍒楄〃
+ unitSelect().then((res) => {
+ this.unitList = res.data;
+ })
+ },
/** 鏌ヨ杩愮淮鐐逛綅鍒楄〃 */
getList() {
this.loading = true;
listPoint(this.queryParams).then(response => {
- this.pointList = response.rows;
+ this.pointList = response.data;
this.total = response.total;
this.loading = false;
});
@@ -225,6 +396,10 @@
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
+ this.reset();
+ },
+ updateCancel() {
+ this.editOpen = false;
this.reset();
},
// 琛ㄥ崟閲嶇疆
@@ -239,7 +414,8 @@
remark: null,
createTime: null,
updateTime: null,
- deleted: null
+ deleted: null,
+ pointDetail: ""
};
this.resetForm("form");
},
@@ -256,7 +432,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
+ this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 鏂板鎸夐挳鎿嶄綔 */
@@ -271,29 +447,33 @@
const id = row.id || this.ids
getPoint(id).then(response => {
this.form = response.data;
+ this.form.timezone = [this.form.startTime, this.form.endTime]
+ if (this.form.pointDetail) {
+ this.tempFormList = JSON.parse(this.form.pointDetail)
+ }
this.open = true;
this.title = "淇敼杩愮淮鐐逛綅";
});
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updatePoint(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addPoint(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
+ if (this.tempFormList) {
+ this.form.pointDetail = JSON.stringify(this.tempFormList)
+ }
+ if (this.form.id != null) {
+ updatePoint(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addPoint(this.form).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.reset()
+ this.getList();
+ });
+ }
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
@@ -303,7 +483,8 @@
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ }).catch(() => {
+ });
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
@@ -314,3 +495,13 @@
}
};
</script>
+
+<style scoped>
+.col-item {
+ margin: 5px 0;
+ display: flex;
+ flex-direction: row;
+ align-content: center;
+ justify-content: center;
+}
+</style>
--
Gitblit v1.8.0