From 7a5910ac61a372a865995d2a71caef3ea87c2050 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 18:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/point/index.vue | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index 5f8cb06..60480ac 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -36,7 +36,7 @@
<el-popover>
<p>瀵煎叆鐐逛綅鍙仛鏇存柊鎿嶄綔</p>
<div class="bottom_">
- <el-select @change="getUnitContractTime" v-model="importUnitId" size="small" placeholder="杩愮淮鍗曚綅">
+ <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>
@@ -53,14 +53,9 @@
v-model="ywTimes"
type="daterange"
range-separator="鑷�"
- start-placeholder="杩愮淮寮�濮嬫椂闂�"
- end-placeholder="杩愮淮缁撴潫鏃堕棿">
+ start-placeholder="鏇存崲杩愮淮鏃堕棿"
+ end-placeholder="鏇存崲杩愮淮鏃堕棿">
</el-date-picker>
- </div>
- <div class="bottom_">
- <el-checkbox v-model="provinceTag">閲嶇偣鐐逛綅</el-checkbox>
- <el-checkbox v-model="importantTag">鐪佸巺</el-checkbox>
- <el-checkbox v-model="importantCommandImageTag">閲嶇偣鎸囨尌鍥惧儚</el-checkbox>
</div>
<div class="bottom_">
<el-upload
@@ -77,7 +72,7 @@
</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>
@@ -334,19 +329,13 @@
},
// 鐐逛綅瀵煎叆
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])
- formData.append("provinceTag", this.provinceTag)
- formData.append("importantTag", this.importantTag)
- formData.append("importantCommandImageTag", this.importantCommandImageTag)
- 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)
+ importData(formData).then(res => {
this.$message.success("瀵煎叆鎴愬姛")
this.upload = false
this.getList()
--
Gitblit v1.8.0