From b3bd8bb2cedee4e60a2aac12ed88c7ebe8ba98ed Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期四, 25 五月 2023 13:46:25 +0800
Subject: [PATCH] 修改保洁收纳
---
ruoyi-ui/src/views/clean/index.vue | 140 ++++++++++++++++++++++++++--------------------
1 files changed, 78 insertions(+), 62 deletions(-)
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 2bd5233..04f4456 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -52,7 +52,7 @@
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">
<el-button
@@ -64,7 +64,7 @@
v-hasPermi="['system:role:add']"
>鏂板</el-button>
</el-col>
-
+
<el-col :span="1.5">
<el-button
type="danger"
@@ -86,14 +86,14 @@
v-hasPermi="['family:note:export']"
>瀵煎嚭</el-button>
</el-col>
-
+
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
- @click="handleExport"
+ @click="handleExportTemplate"
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
@@ -107,30 +107,29 @@
<el-button size="mini" type="primary"
plain
icon="el-icon-plus" >瀵煎叆</el-button>
-
+
</el-upload>
</el-col>
-
+
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
-
- <el-table v-loading="loading" :data="cleanList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
- <el-table-column type="selection" width="55" align="center" />
+
+ <el-table v-loading="loading" :data="cleanList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
+ <el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
+ <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
+
<el-table-column label="绫诲瀷" prop="kind" sortable width="120" >
<template slot-scope="scope">
{{ getSrc1(scope.row.kind) }}
</template>
</el-table-column>
- <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
- <el-table-column label="閫傜敤浜�" prop="suitable" sortable :show-overflow-tooltip="true" width="150" />
+ <el-table-column label="閫傜敤浜�" prop="suitable" sortable :show-overflow-tooltip="true" width="150" />
<el-table-column label="绫诲埆" prop="type" sortable width="100" />
<el-table-column label="淇濇磥鏂规硶" prop="method" sortable width="100" />
<el-table-column label="鏉愭枡瀛樻斁鍦�" prop="location" sortable width="120" />
<el-table-column label="鏀剧疆鍦扮偣" prop="place" sortable width="100" />
- <el-table-column label="鍙戠敓鏃堕棿" align="center" sortable prop="happenTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.happenTime) }}</span>
- </template>
+ <el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="100" align="center">
+ <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="澶囨敞" prop="remark" sortable width="100" />
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="100" >
@@ -176,7 +175,7 @@
</template>
</el-table-column>
</el-table>
-
+
<pagination
v-show="total>0"
:total="total"
@@ -185,11 +184,11 @@
@pagination="getList"
style="background: #FEF7FC;"
/>
-
+
<!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
<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="kind">
<el-select v-model="formDat.kind" placeholder="璇烽�夋嫨绫诲瀷" clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
@@ -221,11 +220,11 @@
<el-input v-model="formDat.location" 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>
-
+
<h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
@@ -251,7 +250,7 @@
>
<i class="el-icon-zoom-in"></i>
</span>
-
+
<span
v-if="!disabled"
class="el-upload-list__item-delete"
@@ -260,8 +259,8 @@
<i class="el-icon-delete"></i>
</span>
</span>
-
-
+
+
</div>
</el-upload>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -270,7 +269,7 @@
:file-list="fileListOther"
class="upload-demo"
multiple
-
+
:on-remove="handleRemove"
:http-request="requestUpload"
:show-file-list="true"
@@ -281,30 +280,30 @@
</div>
</template>
</el-upload>
-
+
</el-form>
<h4 class="form-header"> </h4>
-
+
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
<el-button @click="cancelData">鍙� 娑�</el-button>
</div>
</el-dialog>
-
+
<!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
-
+
</el-dialog>
-
+
</div>
</template>
-
+
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-
-
-
+
+
+
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�
import {listClean,enload,delClean, addClean, uploadPic} from "@/api/clean/index";
export default {
@@ -314,7 +313,7 @@
return {
// 閬僵灞�
disabled: false,
-
+
loading: true,
formData:[],
// 閫変腑鏁扮粍
@@ -346,7 +345,7 @@
fileList:[
],
fileListOther:[
-
+
],
dsb:true,
btn:false,
@@ -360,7 +359,7 @@
remark: undefined,
happenTime: undefined,
url: undefined,
-
+
},
// 鑿滃崟鍒楄〃
menuOptions: [],
@@ -429,7 +428,7 @@
created() {
this.getList();
this.getCateInfor()
-
+
},
methods: {
//
@@ -445,7 +444,10 @@
this.open = false;
this.reset();
},
-
+ getRowId(row)
+ {
+ return row.id
+ },
//闅旇鍙樿壊
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 0) {
@@ -454,20 +456,20 @@
return "statistics-warning-row";
}
},
-
+
/** 鏌ヨ瑙掕壊鍒楄〃 */
getList() {
this.loading = true;
this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
-
+
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listClean(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
this.cleanList = response.data.data;
-
+
this.total = response.data.total;
this.loading = false;
}
@@ -478,13 +480,13 @@
{
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]})
})
})
},
-
+
handleRemove(file) {
for(let i = 0; i < this.fileListOther.length; i++)
{
@@ -543,7 +545,7 @@
this.single = selection.length!=1
this.multiple = !selection.length
},
-
+
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
@@ -559,7 +561,7 @@
handleUpdate(row) {
const id = row.id;
let jd = true
-
+
this.$router.push({
path:"/familymodel/clean/cleanInfo/" + id,
query:{
@@ -567,14 +569,14 @@
}
});
},
-
-
+
+
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
handleRemoveFile(file,) {
-
+
for(let i = 0; i < this.fileListOther.length; i++)
{
if(this.fileListOther[i].url==file.url)
@@ -583,7 +585,7 @@
},
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
-
+
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
@@ -593,7 +595,7 @@
this.formDat.url = ul+","+uls
this.$refs["elForm"].validate(valid => {
if (valid) {
-
+
addClean(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
@@ -608,22 +610,22 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
+
}
-
+
else{
_this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
}
})
-
+
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
@@ -637,10 +639,25 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.download('/zfEconomy/export', {
+ const Ids = this.ids;
+
+ if(Ids.length==0)
+ {
+ this.download('/zfClean/export', {
...this.queryParams
}, `clean_${new Date().getTime()}.xlsx`)
+ }else{
+ this.download('/zfClean/export1/'+Ids, {
+
+ }, `clean_${new Date().getTime()}.xlsx`)
+ }
},
+ handleExportTemplate() {
+ this.download('/zfClean/model', {
+
+ }, `clean_${new Date().getTime()}.xlsx`)
+ },
+
/** 瀵煎叆鎿嶄綔*/
handleEnport(params){
var file = params.file;
@@ -651,12 +668,12 @@
enload(formData).then(response => {
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
-
+
}).catch(err)
{
Message({ message: "瀵煎叆澶辫触", type: 'error' })
}
-
+
}
}
};
@@ -664,11 +681,10 @@
<style>
.el-table__row.statistics-warning-row {
background: #E0EEFE;
-
+
}
.el-table__row.statistics-warning-row1 {
background: #FFEFF2;
-
+
}
</style>
-
\ No newline at end of file
--
Gitblit v1.9.1