From 54eb1c490d3eb203028491ff1f75cd211423eb7b Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期五, 26 四月 2024 15:50:30 +0800
Subject: [PATCH] feat:新增上报内容
---
src/views/system/report/index.vue | 297 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 157 insertions(+), 140 deletions(-)
diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index f399ce2..caa3d0a 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -2,41 +2,20 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="杩愮淮浜哄憳" prop="peopleId">
- <el-input
- v-model="queryParams.peopleId"
- placeholder="杩愮淮浜哄憳濮撳悕"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.peopleId" placeholder="杩愮淮浜哄憳濮撳悕" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="鐐逛綅" prop="pointId">
- <el-input
- v-model="queryParams.pointId"
- placeholder="鐐逛綅"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.pointId" placeholder="鐐逛綅" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="鎶ュ绫诲瀷" prop="reportType">
- <el-select
- v-model="queryParams.reportType"
- placeholder="鎶ュ绫诲瀷"
- clearable
- >
+ <el-select v-model="queryParams.reportType" placeholder="鎶ュ绫诲瀷" clearable>
<el-option label="浜嬪墠鎶ュ" value="浜嬪墠鎶ュ" />
<el-option label="浜嬪悗鎶ュ" value="浜嬪悗鎶ュ" />
</el-select>
</el-form-item>
<el-form-item label="鎶ュ鏃堕棿">
- <el-date-picker
- v-model="daterangeCreateTime"
- style="width: 240px"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
+ <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+ range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -46,61 +25,64 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['system:report:add']"
- >鏂板</el-button>
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+ v-hasPermi="['system:report:add']">鏂板</el-button>
</el-col>
-<!-- <el-col :span="1.5">-->
-<!-- <el-button-->
-<!-- type="success"-->
-<!-- plain-->
-<!-- icon="el-icon-edit"-->
-<!-- size="mini"-->
-<!-- :disabled="single"-->
-<!-- @click="handleUpdate"-->
-<!-- >淇敼</el-button>-->
-<!-- </el-col>-->
+ <!-- <el-col :span="1.5">-->
+ <!-- <el-button-->
+ <!-- type="success"-->
+ <!-- plain-->
+ <!-- icon="el-icon-edit"-->
+ <!-- size="mini"-->
+ <!-- :disabled="single"-->
+ <!-- @click="handleUpdate"-->
+ <!-- >淇敼</el-button>-->
+ <!-- </el-col>-->
<el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['system:report:remove']"
- >鍒犻櫎</el-button>
+ <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+ v-hasPermi="['system:report:remove']">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['system:report:export']"
- >瀵煎嚭</el-button>
+ <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+ v-hasPermi="['system:report:export']">瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
+ <el-table-column type="expand">
+ <template slot-scope="scope">
+ <div class="info-container">
+ <div class="info-item">
+ <div class="info-label">涓婃姤鍐呭</div>
+ <div class="info-text" v-html="scope.row.reportContent"></div>
+ </div>
+ <div class="info-item">
+ <div class="info-label">涓婃姤鏉愭枡</div>
+ <div class="info-list">
+ <div class="list-item" v-for="file in formatFileList(scope.row.reportMaterials)" :key="file" @click="showFile(file)">
+ <div class="item-icon">
+ <i class="el-icon-document"></i>
+ </div>
+ <div class="item-text">{{ file }}</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </template>
+ </el-table-column>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" />
<el-table-column label="鎶ュ浜哄憳" align="center" prop="peopleName" />
<el-table-column label="鐐逛綅" align="center" prop="pointName" />
<el-table-column label="鎶ュ绫诲瀷" align="center" prop="reportType" />
- <el-table-column label="鎶ュ鍐呭" align="center" prop="reportContent" show-overflow-tooltip="true" />
+ <!-- <el-table-column label="鎶ュ鍐呭" align="center" prop="reportContent" show-overflow-tooltip="true" />
<el-table-column label="涓婃姤鏉愭枡" align="center" prop="reportMaterials" show-overflow-tooltip="true">
<template slot-scope="scope">
- <div v-for="(item, index) in scope.row.reportMaterials.split(',')" :key="index">{{ item.substring(item.lastIndexOf("/") + 1) }}</div>
+ <div v-for="(item, index) in scope.row.reportMaterials.split(',')" :key="index">{{
+ item.substring(item.lastIndexOf("/") + 1) }}</div>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="鏁呴殰绫诲瀷" align="center" prop="errorType" />
<el-table-column label="瀹℃牳鏃堕棿" align="center" prop="auditingTime" width="180">
<template slot-scope="scope">
@@ -109,90 +91,57 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
-<!-- <el-button-->
-<!-- size="mini"-->
-<!-- type="text"-->
-<!-- icon="el-icon-edit"-->
-<!-- @click="handleUpdate(scope.row)"-->
-<!-- v-hasPermi="['system:report:edit']"-->
-<!-- >淇敼</el-button>-->
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleAuditing(scope.row)"
- v-hasPermi="['system:report:edit']"
- v-if="scope.row.status === 0"
- >瀹℃牳</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:report:remove']"
- >鍒犻櫎</el-button>
+ <!-- <el-button-->
+ <!-- size="mini"-->
+ <!-- type="text"-->
+ <!-- icon="el-icon-edit"-->
+ <!-- @click="handleUpdate(scope.row)"-->
+ <!-- v-hasPermi="['system:report:edit']"-->
+ <!-- >淇敼</el-button>-->
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAuditing(scope.row)"
+ v-hasPermi="['system:report:edit']" v-if="scope.row.status === 0">瀹℃牳</el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ v-hasPermi="['system:report:remove']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+ @pagination="getList" />
<!-- 娣诲姞鎴栦慨鏀规姤澶囧璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="鐐逛綅" prop="pointId">
- <el-select
- v-model="form.pointId"
- filterable
- remote
- reserve-keyword
- placeholder="璇烽�夋嫨鐐逛綅"
- :remote-method="remoteGetPoints"
- :loading="selectLoading">
- <el-option
- v-for="item in pointList"
- :key="item.id"
- :label="item.value"
- :value="item.id">
+ <el-select v-model="form.pointId" filterable remote reserve-keyword placeholder="璇烽�夋嫨鐐逛綅"
+ :remote-method="remoteGetPoints" :loading="selectLoading">
+ <el-option v-for="item in pointList" :key="item.id" :label="item.value" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鎶ュ绫诲瀷" prop="reportType">
<el-select v-model="form.reportType">
- <el-option label="浜嬪墠鎶ュ" value="浜嬪墠鎶ュ"/>
- <el-option label="浜嬪悗鎶ュ" value="浜嬪悗鎶ュ"/>
+ <el-option label="浜嬪墠鎶ュ" value="浜嬪墠鎶ュ" />
+ <el-option label="浜嬪悗鎶ュ" value="浜嬪悗鎶ュ" />
</el-select>
</el-form-item>
<el-form-item label="鏁呴殰绫诲瀷" prop="errorType">
<el-select v-model="form.errorType">
- <el-option label="甯傛斂鏂藉伐" value="甯傛斂鏂藉伐"/>
- <el-option label="璁惧鏁呴殰" value="璁惧鏁呴殰"/>
- <el-option label="璁惧閬楀け" value="璁惧閬楀け"/>
+ <el-option label="甯傛斂鏂藉伐" value="甯傛斂鏂藉伐" />
+ <el-option label="璁惧鏁呴殰" value="璁惧鏁呴殰" />
+ <el-option label="璁惧閬楀け" value="璁惧閬楀け" />
</el-select>
</el-form-item>
<el-form-item label="鎶ュ鏃堕棿" prop="expirTime">
- <el-date-picker
- v-model="form.expirTime"
- style="width: 240px"
- value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- @change="handleExpirTimeChange"
- ></el-date-picker>
+ <el-date-picker v-model="form.expirTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+ range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"
+ @change="handleExpirTimeChange"></el-date-picker>
</el-form-item>
<el-form-item label="鎶ュ鍐呭" prop="reportContent">
- <editor v-model="form.reportContent" :min-height="192"/>
+ <editor v-model="form.reportContent" :min-height="192" />
</el-form-item>
<el-form-item label="涓婃姤鏉愭枡" prop="reportMaterials">
- <file-upload v-model="form.reportMaterials"/>
+ <file-upload v-model="form.reportMaterials" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -230,7 +179,10 @@
<el-input type="textarea" v-html="auditingForm.reportContent" disabled />
</el-form-item>
<el-form-item label="涓婃姤鏉愭枡">
- <el-link v-for="item in auditingForm.reportMaterials != null ? auditingForm.reportMaterials.split(',') : auditingForm.reportMaterials" :underline="false" :key="item" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
+ <el-link
+ v-for="item in auditingForm.reportMaterials != null ? auditingForm.reportMaterials.split(',') : auditingForm.reportMaterials"
+ :underline="false" :key="item" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1)
+ }}</el-link>
</el-form-item>
<el-form-item label="瀹℃牳缁撴灉">
<el-radio-group v-model="auditingForm.status">
@@ -239,7 +191,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="瀹℃牳鎰忚" prop="suggest">
- <el-input v-model="auditingForm.auditOpinion"/>
+ <el-input v-model="auditingForm.auditOpinion" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -350,17 +302,17 @@
},
handleAuditing(row) {
this.auditingOpen = true;
- this.auditingForm.id =row.id
- this.auditingForm.pointId =row.pointId
- this.auditingForm.pointName =row.pointName
- this.auditingForm.unitName =row.unitName
- this.auditingForm.peopleName =row.peopleName
- this.auditingForm.errorType =row.errorType
- this.auditingForm.reportContent =row.reportContent
- this.auditingForm.reportType =row.reportType
- this.auditingForm.endCreateTime =row.endCreateTime
- this.auditingForm.beginCreateTime =row.beginCreateTime
- this.auditingForm.reportMaterials =row.reportMaterials
+ this.auditingForm.id = row.id
+ this.auditingForm.pointId = row.pointId
+ this.auditingForm.pointName = row.pointName
+ this.auditingForm.unitName = row.unitName
+ this.auditingForm.peopleName = row.peopleName
+ this.auditingForm.errorType = row.errorType
+ this.auditingForm.reportContent = row.reportContent
+ this.auditingForm.reportType = row.reportType
+ this.auditingForm.endCreateTime = row.endCreateTime
+ this.auditingForm.beginCreateTime = row.beginCreateTime
+ this.auditingForm.reportMaterials = row.reportMaterials
},
// 杩滅▼鎼滅储鐐逛綅
remoteGetPoints(query) {
@@ -433,7 +385,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
+ this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 鏂板鎸夐挳鎿嶄綔 */
@@ -494,12 +446,12 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鎶ュ缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎鎶ュ缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
return delReport(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ }).catch(() => { });
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
@@ -508,9 +460,74 @@
}, `report_${new Date().getTime()}.xlsx`)
},
/** 涓嬭浇鎸夐挳鎿嶄綔 */
- handleDownload (data) {
+ handleDownload(data) {
this.$download.resource(data);
+ },
+
+ formatFileList(data) {
+ if (!data) return [];
+ return data.split(',');
+ },
+ showFile(filePath) {
+ console.log(process.env.VUE_APP_FILE_URL + filePath);
}
}
};
</script>
+
+<style lang="scss" scoped>
+.info-container {
+ width: 100%;
+ max-height: 400px;
+ overflow-y: scroll;
+}
+
+.info-item {
+ display: flex;
+ margin-bottom: 20px;
+
+ .info-label {
+ font-size: 14px;
+ font-weight: bold;
+ margin-right: 20px;
+ }
+
+ .info-text {
+ width: 20%;
+ padding: 20px;
+ border-radius: 10px;
+ border: 1px solid #c0c0c0;
+ }
+
+ .info-list {
+ width: 20%;
+
+ .list-item {
+ width: 100%;
+ border-radius: 5px;
+ border: 1px solid #c0c0c0;
+ padding: 10px 10px;
+ display: flex;
+ align-items: center;
+ margin-bottom: 10px;
+ cursor: pointer;
+
+ .item-icon {
+ flex-shrink: 0;
+ margin-right: 5px;
+ }
+
+ .item-text {
+ flex-grow: 1;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ &:hover {
+ border-color: #1890ff;
+ }
+ }
+ }
+}
+</style>
--
Gitblit v1.8.0