From 10ec0d1db5179d90a82e7d534cda6e9bcf597c08 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 01 九月 2024 22:41:52 +0800
Subject: [PATCH] 报备功能优化
---
src/views/system/point/index.vue | 76 ++++++++++++++++++++++++++++----------
1 files changed, 56 insertions(+), 20 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index 9003544..8554d51 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -34,27 +34,36 @@
</el-col>
<el-col :span="1.5">
<el-popover>
- <p>瀵煎叆鐐逛綅鍙仛鏇存柊鎿嶄綔</p>
<div class="bottom_">
- <el-select @change="getUnitContractTime" v-model="importUnitId" size="small" placeholder="杩愮淮鍗曚綅">
+ <p>瀵煎叆鐐逛綅鍙仛鏇存柊鎿嶄綔</p>
+ </div>
+ <div class="bottom_">
+ <el-switch
+ v-model="needUpdateUnit"
+ active-text="淇敼杩愮淮鍗曚綅/鏃堕棿"
+ inactive-text="涓嶄慨鏀硅繍缁村崟浣�/鏃堕棿">
+ </el-switch>
+ </div>
+ <div class="bottom_" v-show="needUpdateUnit">
+ <el-select @change="getUnitContractTime" v-model="importUnitId" size="small" placeholder="鏇存崲杩愮淮鍗曚綅">
<el-option v-for="unit in unitList" :key="unit.id" :label="unit.value" :value="unit.id"></el-option>
</el-select>
</div>
- <div class="bottom_">
+ <div class="bottom_" v-show="needUpdateUnit">
<el-select @change="showTimeRange" v-model="contractId" size="small" placeholder="杩愮淮鍚堝悓" :disabled="! importUnitId">
<el-option v-for="(time, index) in timeList" :key="index" :label="time.name" :value="time.id"></el-option>
</el-select>
<span style="margin-left: 10px;color: #8a8989" v-show="importUnitId">璇ュ崟浣嶆湁{{timeList.length}}涓悎鍚�</span>
</div>
- <div class="bottom_">
+ <div class="bottom_" v-show="needUpdateUnit">
<el-date-picker
:disabled="! contractId"
size="small"
v-model="ywTimes"
type="daterange"
range-separator="鑷�"
- start-placeholder="杩愮淮寮�濮嬫椂闂�"
- end-placeholder="杩愮淮缁撴潫鏃堕棿">
+ start-placeholder="鏇存崲杩愮淮鏃堕棿"
+ end-placeholder="鏇存崲杩愮淮鏃堕棿">
</el-date-picker>
</div>
<div class="bottom_">
@@ -94,9 +103,9 @@
<div>{{ getTagText(scope.row) }}</div>
</template>
</el-table-column>
- <el-table-column label="鐐逛綅寮�濮嬫椂闂�" align="center" prop="startTime" width="140">
+ <el-table-column label="杩愮淮寮�濮嬫椂闂�" align="center" prop="startTime" width="140">
</el-table-column>
- <el-table-column label="鐐逛綅缁撴潫鏃堕棿" align="center" prop="endTime" width="140">
+ <el-table-column label="杩愮淮缁撴潫鏃堕棿" align="center" prop="endTime" width="140">
</el-table-column>
<el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" />
<el-table-column label="鐩戠閮ㄩ棬" align="center" prop="deptName" />
@@ -121,22 +130,46 @@
<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-switch
+ style="display: block"
+ v-model="form.importantTag"
+ active-color="#13ce66"
+ inactive-color="#409EFF"
+ active-text="閲嶇偣鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ <!-- <el-select v-model="form.importantTag" placeholder="閲嶇偣鏍囩" clearable>
<el-option label="閲嶇偣鐐逛綅" :value="true" />
<el-option label="鏅�氱偣浣�" :value="false" />
- </el-select>
+ </el-select> -->
</el-form-item>
<el-form-item label="鐪佸巺鏍囩" prop="provinceTag">
- <el-select v-model="form.provinceTag" placeholder="鐪佸巺鏍囩" clearable>
+ <el-switch
+ style="display: block"
+ v-model="form.provinceTag"
+ active-color="#13ce66"
+ inactive-color="#409EFF"
+ active-text="鐪佸巺鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ <!-- <el-select v-model="form.provinceTag" placeholder="鐪佸巺鏍囩" clearable>
<el-option label="鐪佸巺鐐逛綅" :value="true" />
<el-option label="鏅�氱偣浣�" :value="false" />
- </el-select>
+ </el-select> -->
</el-form-item>
<el-form-item label="閲嶇偣鎸囨尌鍥惧儚鏍囩" prop="importantCommandImageTag">
- <el-select v-model="form.importantCommandImageTag" placeholder="閲嶇偣鎸囨尌鍥惧儚鏍囩" clearable>
+ <el-switch
+ style="display: block"
+ v-model="form.importantCommandImageTag"
+ active-color="#13ce66"
+ inactive-color="#409EFF"
+ active-text="閲嶇偣鎸囨尌鍥惧儚鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ <!-- <el-select v-model="form.importantCommandImageTag" placeholder="閲嶇偣鎸囨尌鍥惧儚鏍囩" clearable>
<el-option label="閲嶇偣鎸囨尌鍥惧儚鐐逛綅" :value="true" />
<el-option label="鏅�氱偣浣�" :value="false" />
- </el-select>
+ </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>-->
@@ -211,6 +244,7 @@
dicts: ['point_tag'],
data() {
return {
+ needUpdateUnit: false,
importantTag: false,
provinceTag: false,
importantCommandImageTag: false,
@@ -299,12 +333,13 @@
let text = '';
// 妫�鏌ユ瘡涓爣绛撅紝濡傛灉涓簍rue锛屽垯娣诲姞鍒皌ext涓�
- if (row.importantTag) text += '閲嶇偣鐐逛綅 ';
- if (row.provinceTag) text += '鐪佸巺鐐逛綅 ';
- if (row.importantCommandImageTag) text += '閲嶇偣鎸囨尌鍥惧儚 ';
-
+ if (row.importantTag) text += '閲嶇偣鐐逛綅銆�';
+ if (row.provinceTag) text += '鐪佸巺鐐逛綅銆�';
+ if (row.importantCommandImageTag) text += '閲嶇偣鎸囨尌鍥惧儚銆�';
+ if (row.deptTag) text += '閮ㄧ骇銆�';
+ text === '' ? '鏅�氱偣浣�' : text
// 杩斿洖鎷兼帴鍚庣殑鏂囨湰鍜屽浐瀹氭枃瀛�
- return text ==='' ? '鏅�氱偣浣�' : text
+ return text.replace(/銆�$/, '')
},
getUnitContractTime(unitId) {
this.ywTimes = []
@@ -335,6 +370,7 @@
formData.append("startTime", this.ywTimes[0] ? this.ywTimes[0] : '')
formData.append("endTime", this.ywTimes[1] ? this.ywTimes[1] : '')
formData.append("unitId", this.importUnitId ? this.importUnitId : -1)
+ formData.append("needUpdateUnit", this.needUpdateUnit)
importData(formData).then(res => {
this.$message.success("瀵煎叆鎴愬姛")
this.upload = false
@@ -513,7 +549,7 @@
<style scoped>
.bottom_ {
width: 100%;
- margin-bottom: 5px;
+ margin-bottom: 8px;
}
.col-item {
margin: 5px 0;
--
Gitblit v1.8.0