From fb29a61b78b11c222a9698835d4a1b18d8ed973e Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期六, 24 八月 2024 12:09:47 +0800
Subject: [PATCH] refactor：合同考核结果详情调整
---
src/views/system/point/index.vue | 63 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index 5f8cb06..bfd3e73 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>
@@ -126,22 +121,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>-->
@@ -334,19 +353,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