From a85494cc5769c3dab7f210c012fba1c45103e779 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 06 六月 2023 16:16:55 +0800
Subject: [PATCH] 修改了不会重复页面的一些bug
---
ruoyi-ui/src/views/economy/index.vue | 284 ++++++++++++++++++++++++++++----------------------------
1 files changed, 142 insertions(+), 142 deletions(-)
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index 1a994f5..88d62f6 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -22,20 +22,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鍩洪噾/鍙拌处" prop="type" >
- <el-select
- v-model="queryParams.type"
- placeholder="鍩洪噾/鍙拌处"
- clearable
- style="width: 240px"
- >
- <el-option
- v-for="dict in typeOptions"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
+ <el-form-item label="绫诲瀷" prop="type">
+ <el-input
+ v-model="queryParams.type"
+ placeholder="璇疯緭鍏ョ被鍨�"
+ clearable
+ style="width: 240px"
+ @keyup.enter.native="handleQuery"
/>
- </el-select>
</el-form-item>
<el-form-item label="鐢ㄩ��" prop="useFor">
@@ -52,7 +46,6 @@
<el-button size="mini" @click="resetQuery" style=" width: 65px;height: 32px; background: #FFDDE3; border-radius:6px 6px 6px 6px;opacity: 1;">閲嶇疆</el-button>
</el-form-item>
</el-form>
-
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@@ -88,77 +81,73 @@
>瀵煎嚭</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['family:note:export']"
- >瀵煎叆妯℃澘涓嬭浇</el-button>
- </el-col>
- <el-col :span="1.2">
- <el-upload
- action=""
- class="upload-demo"
- :show-file-list="false"
- :http-request="handleEnport"
- >
- <el-button size="mini" type="primary"
- plain
- icon="el-icon-plus" >瀵煎叆</el-button>
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExportTemplate"
+ v-hasPermi="['family:note:export']"
+ >瀵煎叆妯℃澘涓嬭浇</el-button>
+ </el-col>
+ <el-col :span="1.2">
+ <el-upload
+ action=""
+ class="upload-demo"
+ :show-file-list="false"
+ :http-request="handleEnport"
+ >
+ <el-button size="mini" type="primary"
+ plain
+ icon="el-icon-plus" >瀵煎叆</el-button>
- </el-upload>
- </el-col>
+ </el-upload>
+ </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!-- 搴忓彿銆佸熀閲�/鍙拌处銆佹椂闂淬�佹敹鍏�/鏀嚭銆佺敤閫斻�佷娇鐢ㄤ汉銆佺幇閲�/鑷姩鎵ｅ垝銆佷綑棰濄�佺數瀛愭枃浠躲�佸娉� 鎿嶄綔-->
<!-- 杩欓噷鏈変釜familyList鏁扮粍 鏄湪data()涓畾涔夌殑 -->
- <el-table v-loading="loading" :data="economyList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" :data="economyList" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
- <el-table-column label="鍩洪噾/鍙拌处" prop="type" sortable width="120" >
- <template slot-scope="scope">
- {{ getSrc1(scope.row.type) }}
- </template>
- </el-table-column>
- <el-table-column label="鏃堕棿" align="center" sortable prop="createTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鏀跺叆/鏀嚭" prop="price" sortable width="100" />
+ <el-table-column label="鍙戠敓鏃堕棿" prop="createTime" sortable width="100" align="center">
+ <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
+ <el-table-column label="鍙拌处" prop="type" sortable width="100" />
+ <el-table-column label="鏀跺叆/鏀嚭" prop="price" sortable width="100" >
+
+ </el-table-column>
<el-table-column label="鐢ㄩ��" prop="useFor" sortable width="100" />
- <!-- <el-table-column label="浜嬮」鍐呭" prop="content" sortable :show-overflow-tooltip="true" width="150" /> -->
+
<el-table-column label="浣跨敤浜�" prop="usePeople" sortable width="100" />
<el-table-column label="鐜伴噾/鑷姩鎵ｅ垝" prop="kind" sortable width="130" >
- <template slot-scope="scope">
- {{ getSrc2(scope.row.kind) }}
- </template>
+ <template slot-scope="scope">{{scope.row.kind? scope.row.kind: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="浣欓" prop="balance" sortable width="100" />
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" align="center" sortable width="110" >
<template slot-scope="scope" >
- <img
- class="el-upload-list__item-thumbnail"
- src="../../assets/images/deviceLis.png"
- alt=""
- style="width: 35px; height: 35px;"
- fit="cover"
- v-if="scope.row.url !== ','"
- >
- <img
- class="el-upload-list__item-thumbnail"
- src="../../assets/images/deviceA.png"
- alt=""
- style="width: 35px; height: 35px;"
- fit="cover"
- v-if="scope.row.url === ','"
- >
- </template>
- </el-table-column>
- <el-table-column label="澶囨敞" prop="remark" sortable width="100" />
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ v-if="scope.row.url !== ','"
+ >
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceA.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ v-if="scope.row.url === ','"
+ >
+ </template>
+ </el-table-column>
+ <el-table-column label="澶囨敞" prop="remark" sortable width="100" >
+ <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
@@ -166,7 +155,7 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['system:role:edit']"
+ v-hasPermi="['familymodel:economy:info']"
>淇敼</el-button>
<el-button
size="mini"
@@ -175,14 +164,13 @@
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>鍒犻櫎</el-button>
- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
+ <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:economy:info']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
</el-dropdown>
</template>
</el-table-column>
</el-table>
-
<pagination
v-show="total>0"
:total="total"
@@ -196,22 +184,26 @@
<!-- 璁惧鍚嶇О銆佹椂闂淬�佽喘涔颁汉銆佷簨椤瑰唴瀹广�佸瓨鏀惧湴鐐广�佸娉ㄣ�佺數瀛愭枃浠� -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
- <el-form-item label="鍩洪噾/鍙拌处" prop="type">
- <el-select v-model="formDat.type" placeholder="璇烽�夋嫨鍩洪噾/鍙拌处" clearable :style="{width: '100%'}" >
- <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
- ></el-option>
- </el-select>
- </el-form-item>
+ <el-form-item label="鍙拌处" prop="type">
+ <el-input v-model="formDat.type" placeholder="璇疯緭鍏ュ唴瀹�" clearable :style="{width: '100%'}" ></el-input>
+ </el-form-item>
- <el-form-item label="鏃堕棿" prop="createTime">
+ <el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
- v-model='formDat.createTime'
+ v-model='formDat.happenTime'
type='date'
placeholder='閫夋嫨鏃ユ湡'
></el-date-picker>
</el-form-item>
<el-form-item label="鏀跺叆/鏀嚭" prop="price">
- <el-input v-model="formDat.price" placeholder="璇疯緭鍏ユ敹鍏�/鏀嚭" clearable :style="{width: '100%'}" ></el-input>
+ <el-select v-model="formDat.price" placeholder="璇烽�夋嫨鏀跺叆/鏀嚭" clearable :style="{width: '100%'}" >
+ <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="閲戦" prop="balance">
+ <el-input v-model="formDat.balance" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" >
+ </el-input>
</el-form-item>
<el-form-item label="鐢ㄩ��" prop="useFor">
<el-input v-model="formDat.useFor" placeholder="璇疯緭鍏ョ敤閫�" clearable :style="{width: '100%'}" >
@@ -221,20 +213,10 @@
<el-input v-model="formDat.usePeople" placeholder="璇疯緭鍏ヤ娇鐢ㄤ汉" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鐜伴噾/鑷姩鎵ｅ垝" prop="kind">
- <el-select v-model="formDat.kind" placeholder="璇烽�夋嫨鐜伴噾/鑷姩鎵ｅ垝" clearable :style="{width: '100%'}" >
- <el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="浣欓" prop="balance">
- <el-input v-model="formDat.balance" placeholder="璇疯緭鍏ヤ綑棰�" clearable :style="{width: '100%'}" >
+ <el-form-item label="鏀粯鏂瑰紡" prop="kind">
+ <el-input v-model="formDat.kind" placeholder="璇疯緭鍏ユ敮浠樻柟寮�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <!-- <el-form-item label="瀹跺涵鍙�" prop="familyId">
- <el-input v-model="formDat.familyId" placeholder="璇疯緭鍏ュ搴彿" clearable :style="{width: '100%'}" >
- </el-input>
- </el-form-item> -->
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
@@ -407,17 +389,17 @@
}],
type: [{
required: true,
- message: '璇烽�夋嫨鍩洪噾/鍙拌处',
- trigger: 'change'
+ message: '璇疯緭鍏ュ彴璐﹀唴瀹�',
+ trigger: 'blur'
}],
balance: [{
required: true,
- message: '璇疯緭鍏ヤ綑棰�',
+ message: '璇疯緭鍏ラ噾棰�',
trigger: 'blur'
}],
kind: [{
- required: true,
- message: '璇疯緭鍏ュ搴彿',
+ // required: true,
+ message: '璇疯緭鍏ユ敮浠樻柟寮�',
trigger: 'blur'
}],
createTime: [{
@@ -432,50 +414,49 @@
}],
},
typeOptions: [
- {
- value: '0',
- label: '鍩洪噾',
-},
-{
- value: '1',
- label: '鍙拌处',
-}
- ],
+ {
+ value: '鏀跺叆',
+ label: '鏀跺叆',
+ },
+ {
+ value: '鏀嚭',
+ label: '鏀嚭',
+ }],
typeOptions1: [
- {
- value: '0',
- label: '鐜伴噾',
-},
-{
- value: '1',
- label: '鑷姩鎵ｅ垝',
-}
+ {
+ value: '0',
+ label: '鐜伴噾',
+ },
+ {
+ value: '1',
+ label: '鑷姩鎵ｅ垝',
+ }
],
};
},
created() {
this.getList();
- this.getCateInfor()
+ this.getCateInfor()
},
methods: {
- //鍩洪噾/鍙拌处鐨勯�夋嫨
- getSrc1(type) {
- if (type === 0) {
- return '鍩洪噾'
- }else {
- return '鍙拌处'
- }
- },
+ //鍩洪噾/鍙拌处鐨勯�夋嫨
+ getSrc1(type) {
+ if (type === 0) {
+ return '鍩洪噾'
+ }else {
+ return '鍙拌处'
+ }
+ },
- getSrc2(kind) {
- if (kind == 0) {
- return '鐜伴噾'
- }else {
- return '鑷姩鎵ｅ垝'
- }
- },
+ getSrc2(kind) {
+ if (kind == 0) {
+ return '鐜伴噾'
+ }else {
+ return '鑷姩鎵ｅ垝'
+ }
+ },
// 鍙栨秷鎸夐挳
cancelData() {
@@ -503,7 +484,7 @@
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
- listEconomy(this.queryParams).then(response => {
+ listEconomy(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
this.economyList = response.data.data;
@@ -521,19 +502,23 @@
}
},
getCateInfor()
- {
- let _this = this
- getCategory().then(response=>{
+ {
+ let _this = this
+ getCategory().then(response=>{
- response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ })
})
- })
- },
+ },
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
this.reset();
+ },
+ getRowId(row)
+ {
+ return row.id
},
// 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級
cancelDataScope() {
@@ -669,10 +654,24 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
+ const Ids = this.ids;
+
+ if(Ids.length==0)
+ {
this.download('/zfEconomy/export', {
...this.queryParams
}, `zfEconomy_${new Date().getTime()}.xlsx`)
+ }else
+ {
+ this.download('/zfEconomy/export1/'+Ids, {
+ }, `zfEconomy_${new Date().getTime()}.xlsx`)
+ }
}
+ ,
+ handleExportTemplate(){
+ this.download('/zfEconomy/model', {
+
+ }, `zfEconomy_${new Date().getTime()}.xlsx`)
},
/** 瀵煎叆鎿嶄綔*/
handleEnport(params){
@@ -682,7 +681,7 @@
let _this = this
alert(file)
enload(formData).then(response => {
- _this.getList();
+ _this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
}).catch(err)
@@ -690,7 +689,8 @@
Message({ message: "瀵煎叆澶辫触", type: 'error' })
}
- }
+ }
+ }
};
</script>
--
Gitblit v1.9.1