From f8683f3e8e8ece2588f4ddfad26a1bd4b0bdf2d3 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 12 八月 2024 11:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/point/index.vue | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index e39645e..5f8cb06 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -93,16 +93,10 @@
<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="200" show-overflow-tooltip>
<template slot-scope="scope">
- <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>
+ <!-- 浣跨敤璁＄畻灞炴�ф潵鏄剧ず鎷兼帴鍚庣殑鏂囨湰 -->
+ <div>{{ getTagText(scope.row) }}</div>
</template>
</el-table-column>
<el-table-column label="鐐逛綅寮�濮嬫椂闂�" align="center" prop="startTime" width="140">
@@ -127,20 +121,26 @@
<!-- 娣诲姞杩愮淮鐐逛綅瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="130px">
<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-option label="閲嶇偣鐐逛綅" :value="true" />
+ <el-option label="鏅�氱偣浣�" :value="false" />
</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-option label="鐪佸巺鐐逛綅" :value="true" />
+ <el-option label="鏅�氱偣浣�" :value="false" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="閲嶇偣鎸囨尌鍥惧儚鏍囩" prop="importantCommandImageTag">
+ <el-select v-model="form.importantCommandImageTag" placeholder="閲嶇偣鎸囨尌鍥惧儚鏍囩" clearable>
+ <el-option label="閲嶇偣鎸囨尌鍥惧儚鐐逛綅" :value="true" />
+ <el-option label="鏅�氱偣浣�" :value="false" />
</el-select>
</el-form-item>
<!-- <el-form-item label="鐐逛綅鎵�鍦ㄥ湴" prop="region">-->
@@ -150,11 +150,6 @@
<el-cascader v-model="form.deptId" :options="deptOptions" :show-all-levels="false" clearable
:props="{ checkStrictly: true }">
</el-cascader>
- </el-form-item>
- <el-form-item label="鐐逛綅鏍囩" prop="pointTag">
- <el-select v-model="form.pointTag" placeholder="鐐逛綅鏍囩" multiple clearable>
- <el-option v-for="dict in dict.type.point_tag" :key="dict.value" :label="dict.label" :value="dict.value" />
- </el-select>
</el-form-item>
<el-form-item label="杩愮淮鍗曚綅" prop="unitId">
<el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅">
@@ -305,6 +300,17 @@
this.getDeptCascader();
},
methods: {
+ getTagText(row) {
+ let text = '';
+
+ // 妫�鏌ユ瘡涓爣绛撅紝濡傛灉涓簍rue锛屽垯娣诲姞鍒皌ext涓�
+ if (row.importantTag) text += '閲嶇偣鐐逛綅 ';
+ if (row.provinceTag) text += '鐪佸巺鐐逛綅 ';
+ if (row.importantCommandImageTag) text += '閲嶇偣鎸囨尌鍥惧儚 ';
+
+ // 杩斿洖鎷兼帴鍚庣殑鏂囨湰鍜屽浐瀹氭枃瀛�
+ return text ==='' ? '鏅�氱偣浣�' : text
+ },
getUnitContractTime(unitId) {
this.ywTimes = []
this.contractId = null;
--
Gitblit v1.8.0