From 9e8d1bd0b6fb495920921214775b84d490e032a3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 16:43:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/point/index.vue | 209 +++++++++++++++++++++++++++++++--------------------
1 files changed, 127 insertions(+), 82 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index eb8e231..5f162cf 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -29,31 +29,41 @@
v-hasPermi="['point:remove']">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" plain icon="el-icon-bottom" v-loading="download" size="mini" @click="handleExport"
+ <el-button type="primary" plain icon="el-icon-top" v-loading="download" size="mini" @click="handleExport"
v-hasPermi="['point:export']">瀵煎嚭鐐逛綅</el-button>
</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_">
- <el-select @change="showTimeRange" v-model="contractId" size="small" placeholder="杩愮淮鍚堝悓">
+ <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_">
@@ -71,10 +81,10 @@
</el-upload>
</div>
<div>
- <el-button class="bottom_" type="primary" size="small" v-model="upload" :disabled="! importUnitId || ! importFile || ! this.ywTimes || this.ywTimes.length < 2" @click="handleImport"
+ <el-button class="bottom_" type="primary" size="small" v-loading="upload" @click="handleImport"
v-hasPermi="['point:import']">瀵煎叆</el-button>
</div>
- <el-button type="primary" size="mini" plain icon="el-icon-top" slot="reference">瀵煎叆鐐逛綅</el-button>
+ <el-button type="primary" size="mini" plain icon="el-icon-bottom" slot="reference" v-hasPermi="['point:import']">瀵煎叆鐐逛綅</el-button>
</el-popover>
</el-col>
<!-- <el-col :span="1.5">-->
@@ -87,21 +97,15 @@
<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>
+ <!-- 浣跨敤璁＄畻灞炴�ф潵鏄剧ず鎷兼帴鍚庣殑鏂囨湰 -->
+ <div>{{ getTagText(scope.row) }}</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 label="杩愮淮寮�濮嬫椂闂�" align="center" prop="startTime" width="140">
</el-table-column>
- <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" />
@@ -120,56 +124,82 @@
@pagination="getList" />
<!-- 娣诲姞杩愮淮鐐逛綅瀵硅瘽妗� -->
- <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-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="deptId">
- <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="杩愮淮鍗曚綅">
- <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
- size="small"
- v-model="timezone"
- type="daterange"
- range-separator="鑷�"
- start-placeholder="杩愮淮寮�濮嬫椂闂�"
- end-placeholder="杩愮淮缁撴潫鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鐐逛綅澶囨敞" prop="remark">
- <el-input type="textarea" v-model="form.remark"/>
- </el-form-item>
- </el-form>
+ <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+ <div style="display: flex;flex-direction: row">
+ <div style="flex: 5; border-right: 1px solid #d3d3d3; padding-right: 10px">
+ <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="deptId">
+ <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="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
+ size="small"
+ v-model="timezone"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="杩愮淮寮�濮嬫椂闂�"
+ end-placeholder="杩愮淮缁撴潫鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鐐逛綅澶囨敞" prop="remark">
+ <el-input type="textarea" v-model="form.remark"/>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div style="flex: 5">
+ <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+ <el-form-item label="閲嶇偣:" prop="importantTag">
+ <el-switch
+ v-model="form.importantTag"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="閲嶇偣鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="鐪佸巺:" prop="provinceTag">
+ <el-switch
+ v-model="form.provinceTag"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="鐪佸巺鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="閮ㄧ骇:" prop="deptTag">
+ <el-switch
+ v-model="form.deptTag"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="閮ㄧ骇鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="閲嶇偣鎸囨尌鍥惧儚:" prop="importantCommandImageTag">
+ <el-switch
+ v-model="form.importantCommandImageTag"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="閲嶇偣鎸囨尌鍥惧儚鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ </el-form>
+
+ </div>
+ </div>
+
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">鍙� 娑�</el-button>
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -212,9 +242,13 @@
export default {
name: "Point",
- dicts: ['point_tag'],
+ dicts: ['point_tag', 'area_code'],
data() {
return {
+ needUpdateUnit: false,
+ importantTag: false,
+ provinceTag: false,
+ importantCommandImageTag: false,
timeList: [],
timezone: [],
ywTimes: [],
@@ -296,6 +330,18 @@
this.getDeptCascader();
},
methods: {
+ getTagText(row) {
+ let text = '';
+
+ // 妫�鏌ユ瘡涓爣绛撅紝濡傛灉涓簍rue锛屽垯娣诲姞鍒皌ext涓�
+ if (row.importantTag) text += '閲嶇偣鐐逛綅銆�';
+ if (row.provinceTag) text += '鐪佸巺鐐逛綅銆�';
+ if (row.importantCommandImageTag) text += '閲嶇偣鎸囨尌鍥惧儚銆�';
+ if (row.deptTag) text += '閮ㄧ骇銆�';
+ text === '' ? '鏅�氱偣浣�' : text
+ // 杩斿洖鎷兼帴鍚庣殑鏂囨湰鍜屽浐瀹氭枃瀛�
+ return text.replace(/銆�$/, '')
+ },
getUnitContractTime(unitId) {
this.ywTimes = []
this.contractId = null;
@@ -319,16 +365,14 @@
},
// 鐐逛綅瀵煎叆
handleImport() {
- if (! this.ywTimes || this.ywTimes.length < 2) {
- this.$message.error("璇烽�夋嫨杩愮淮鏃堕棿")
- return
- }
this.upload =true;
let formData = new FormData()
formData.append("file", this.importFile)
- formData.append("startTime", this.ywTimes[0])
- formData.append("endTime", this.ywTimes[1])
- importData(formData, this.importUnitId).then(res => {
+ 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
this.getList()
@@ -417,8 +461,9 @@
createTime: null,
updateTime: null,
deleted: null,
- importantTag: null,
- provinceTag: null
+ importantTag: false,
+ provinceTag: false,
+ deptTag: false,
};
this.resetForm("form");
},
@@ -506,7 +551,7 @@
<style scoped>
.bottom_ {
width: 100%;
- margin-bottom: 5px;
+ margin-bottom: 8px;
}
.col-item {
margin: 5px 0;
--
Gitblit v1.8.0