From 319d2d82e78cfaf951178f238e9bb2a9ecafb9c6 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期五, 26 四月 2024 14:02:45 +0800
Subject: [PATCH] chore:合并分支
---
src/views/system/point/index.vue | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index ad4b242..c8b775e 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -32,15 +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"
- >鏂板</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"
@@ -49,6 +49,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
+ v-hasPermi="['point:edit']"
>淇敼</el-button>
</el-col>
<el-col :span="1.5">
@@ -59,6 +60,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
+ v-hasPermi="['point:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -68,6 +70,7 @@
icon="el-icon-top"
size="mini"
@click="handleImportPoint"
+ v-hasPermi="['point:import']"
>瀵煎叆鐐逛綅</el-button>
</el-col>
<el-col :span="1.5">
@@ -77,6 +80,7 @@
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>
@@ -84,7 +88,10 @@
<el-table v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鐐逛綅鍚嶇О" align="center" prop="pointName" />
+ <el-table-column label="鐐逛綅绫诲瀷" align="center" prop="pointType" />
+ <el-table-column label="鏍囩" align="center" prop="tag" >
+ <span>{{important}}</span>
+ </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>
@@ -113,12 +120,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
+ v-hasPermi="['point:edit']"
>淇敼</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
+ v-hasPermi="['point:remove']"
>鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -137,6 +146,12 @@
<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="tag">
+ <el-select v-model="form.tag" placeholder="鐐逛綅鏍囩">
+ <el-option label="鏅�氱偣浣�" value="鏅�氱偣浣�"/>
+ <el-option label="閲嶇偣鐐逛綅" value="閲嶇偣鐐逛綅"/>
+ </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>
@@ -249,6 +264,7 @@
editingIndex: null,
// 閬僵灞�
loading: true,
+ important: '閲嶇偣鐐逛綅',
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
--
Gitblit v1.8.0