From 9979b58671ff78026be0bacdc246872e6ed76703 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 07 八月 2024 14:13:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/point/index.vue | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index 2da5721..83c25d0 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -80,9 +80,16 @@
<el-table 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="90" show-overflow-tooltip>
+ <el-table-column label="閲嶇偣鏍囩" align="center" width="90" show-overflow-tooltip>
<template slot-scope="scope">
- <dict-tag :options="dict.type.point_tag" :value="scope.row.pointTags" />
+ <div v-if="scope.row.importantTag === 'important'">閲嶇偣鐐逛綅</div>
+ <div v-else-if="scope.row.importantTag === 'normal'">鏅�氱偣浣�</div>
+ </template>
+ </el-table-column>
+ <el-table-column label="鐪佸巺鏍囩" align="center" width="90" show-overflow-tooltip>
+ <template slot-scope="scope">
+ <div v-if="scope.row.provinceTag === 'province'">鐪佸巺鐐逛綅</div>
+ <div v-else-if="scope.row.provinceTag === 'normal'">鏅�氱偣浣�</div>
</template>
</el-table-column>
<el-table-column label="鐐逛綅寮�濮嬫椂闂�" align="center" prop="startTime" width="140">
@@ -91,13 +98,6 @@
</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">
- <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="remark" />
<el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -118,16 +118,21 @@
<el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
<el-input v-model="form.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" />
</el-form-item>
+ <el-form-item label="閲嶇偣鏍囩" prop="importantTag">
+ <el-select v-model="form.importantTag" placeholder="閲嶇偣鏍囩" clearable>
+ <el-option label="閲嶇偣鐐逛綅" value="important" />
+ <el-option label="鏅�氱偣浣�" value="normal" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐪佸巺鏍囩" prop="provinceTag">
+ <el-select v-model="form.provinceTag" placeholder="鐪佸巺鏍囩" clearable>
+ <el-option label="鐪佸巺鐐逛綅" value="province" />
+ <el-option label="鏅�氱偣浣�" value="normal" />
+ </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>-->
<!-- </el-form-item>-->
- <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="deptId">
<el-cascader v-model="form.deptId" :options="deptOptions" :show-all-levels="false" clearable
:props="{ checkStrictly: true }">
@@ -387,7 +392,8 @@
createTime: null,
updateTime: null,
deleted: null,
- pointTag: []
+ importantTag: null,
+ provinceTag: null
};
this.resetForm("form");
},
@@ -419,11 +425,11 @@
const id = row.id || this.ids
getPoint(id).then(response => {
this.form = response.data;
- this.form.pointTag = response.data.pointTags;
this.form.deptId = response.data.deptIds
this.form.category = this.form.category + ''
this.timezone = [response.data.startTime, response.data.endTime]
this.open = true;
+ console.log(this.form)
this.title = "淇敼杩愮淮鐐逛綅";
});
},
--
Gitblit v1.8.0