From 29ea0fd5d04dbaac800f211e0ac7701de0a7f3f4 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 15 九月 2025 15:18:08 +0800
Subject: [PATCH] 新需求
---
src/views/system/report/index.vue | 246 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 182 insertions(+), 64 deletions(-)
diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index 3f10afc..8d18a89 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -2,7 +2,7 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="鍏抽敭瀛�" prop="peopleId">
- <el-input v-model="queryParams.keyword" placeholder="璇疯緭鍏ュ叧閿瓧" clearable @keyup.enter.native="handleQuery" />
+ <el-input v-model="queryParams.keyword" placeholder="鐐逛綅鍚嶆悳绱�" clearable @keyup.enter.native="handleQuery" @clear="handleQuery"/>
</el-form-item>
<el-form-item label="鎶ュ绫诲瀷" prop="reportType">
<el-select v-model="queryParams.reportType" @change="handleQuery" placeholder="鎶ュ绫诲瀷" clearable>
@@ -11,18 +11,48 @@
</el-select>
</el-form-item>
<el-form-item label="鏁呴殰绫诲瀷" prop="errorTypeList">
- <el-select v-model="queryParams.errorTypeList" multiple @change="handleQuery" clearable @clear="handleQuery">
+ <el-select v-model="queryParams.errorTypeList" multiple @change="handleQuery" clearable>
<el-option v-for="dict in dict.type.report_error_type" :value="dict.value" :key="dict.value" :label="dict.label" />
</el-select>
</el-form-item>
- <el-form-item label="瀹℃牳鐘舵��">
- <el-select v-model="queryParams.status" @change="handleQuery" placeholder="瀹℃牳鐘舵��" clearable>
+ <el-form-item label="鎶ュ鏃堕棿" prop="timeRange" >
+ <el-date-picker
+ v-model="reportTimeRange"
+ type="daterange"
+ range-separator="鑷�"
+ value-format="yyyy-MM-dd"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ @change="handleQuery"
+ clearable
+ >
+ </el-date-picker>
+ </el-form-item>
+
+ <el-form-item label="鏈夋晥鏃堕棿" prop="timeRange" >
+ <el-date-picker
+ v-model="effectiveTimeRange"
+ type="daterange"
+ range-separator="鑷�"
+ value-format="yyyy-MM-dd"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ @change="handleQuery"
+ clearable
+ >
+ </el-date-picker>
+ </el-form-item>
+
+ <el-form-item label="">
+ <el-select v-model="queryParams.status" @change="handleQuery" placeholder="" clearable>
<el-option label="鍏ㄩ儴" value="" />
<el-option label="瀹℃牳涓�" :value="0" />
<el-option label="瀹℃牳鏈�氳繃" :value="2" />
<el-option label="瀹℃牳閫氳繃" :value="1" />
</el-select>
</el-form-item>
+
+
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
@@ -35,7 +65,8 @@
v-hasPermi="['system:report:add']">鍗曟鎶ュ</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport">鎵归噺鎶ュ</el-button>
+ <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
+ v-hasPermi="['system:report:add']">鎵归噺鎶ュ</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
@@ -59,8 +90,17 @@
<div class="info-item">
<div class="info-label">鎶ュ鏉愭枡</div>
<div class="info-list">
- <div style="margin-bottom: 8px" v-for="file in formatFileList(scope.row.reportMaterials)" :key="file">
- <el-link type="primary" @click="handleDownload(file)">
+ <div style="margin-bottom: 8px" v-for="file in scope.row.reportMaterials!=null ? scope.row.reportMaterials.split(',') : scope.row.reportMaterials" :key="file">
+ <el-image
+ v-if="isImageFile(file)"
+ :src="getPreview(file)"
+ :preview-src-list="[getPreview(file)]"
+ fit="cover"
+ class="material-preview"
+ style="width: 100px; height: 100px; margin: 5px;"
+ >
+ </el-image>
+ <el-link v-else type="primary" @click="handleDownload(file)">
{{file.match(/\/([^\/]*)$/)[1]}}
</el-link>
</div>
@@ -87,7 +127,7 @@
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:report:edit']" v-if="scope.row.status === 2 || scope.row.status === 0">淇敼</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 || scope.row.status === 2">瀹℃牳</el-button>
+ v-hasPermi="['system:report:auditing']" v-if="scope.row.status === 0 || scope.row.status === 2">瀹℃牳</el-button>
<el-button size="mini" type="text" icon="el-icon-s-check" @click="handleAuditingRecord(scope.row.id)"
v-hasPermi="['system:report:record']">瀹℃牳璁板綍</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -136,7 +176,10 @@
</el-select>
</el-form-item>
<el-form-item label="鎶ュ鏃堕棿" prop="daterangeCreateTime">
- <el-date-picker v-model="form.daterangeCreateTime" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss"
+ <el-date-picker v-model="form.daterangeCreateTime"
+ type="datetimerange"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ format="yyyy-MM-dd HH:mm:ss"
range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"
></el-date-picker>
</el-form-item>
@@ -163,35 +206,52 @@
<!-- 鏌ョ湅瀹℃牳璁板綍 -->
<el-dialog title="鎶ュ瀹℃牳璁板綍" :visible.sync="recordOpen" :close-on-click-modal="false" width="900px">
<div slot="footer" class="dialog-footer" style="max-height: 500px;overflow-y: auto;">
- <el-timeline v-for="record in auditingRecordList" :key="record.id">
- <el-timeline-item :timestamp="record.auditingTime" placement="top">
- <el-card>
- <el-descriptions title="鎻愪氦鏁版嵁" :column="3" border>
- <el-descriptions-item label="鐐逛綅" label-class-name="my-label" content-class-name="my-content">{{
- record.pointName }}</el-descriptions-item>
- <el-descriptions-item label="鎶ュ绫诲瀷">{{ record.reportType }}</el-descriptions-item>
- <el-descriptions-item label="瀹℃牳缁撴灉"><el-tag :type="record.result ? 'success' : 'danger'">{{ record.result ? "閫氳繃" : "鏈�氳繃" }}</el-tag></el-descriptions-item>
- <el-descriptions-item label="瀹℃牳鎰忚">{{ record.resultRemark ? record.resultRemark : "鏃�" }}</el-descriptions-item>
- <el-descriptions-item label="鎶ュ鍐呭">
- <div class="content" v-html="getHtmlContent(record.reportContent)"></div>
- </el-descriptions-item>
- <el-descriptions-item label="鎶ュ鏉愭枡">
- <el-link
- v-for="item in record.reportMaterials != null ? record.reportMaterials.split(',') : record.reportMaterials"
- :underline="false" type="primary" :key="item" @click="handleDownload(item)">
- {{ item.substring(item.lastIndexOf("/") + 1) }}
- </el-link>
- </el-descriptions-item>
- </el-descriptions>
- </el-card>
- </el-timeline-item>
- </el-timeline>
+ <div v-if="auditingRecordList && auditingRecordList.length > 0">
+ <el-timeline v-for="record in auditingRecordList" :key="record.id">
+ <el-timeline-item :timestamp="record.auditingTime" placement="top">
+ <el-card>
+ <el-descriptions title="鎻愪氦鏁版嵁" :column="3" border>
+ <el-descriptions-item label="鐐逛綅" label-class-name="my-label" content-class-name="my-content">{{
+ record.pointName }}</el-descriptions-item>
+ <el-descriptions-item label="鎶ュ绫诲瀷">{{ record.reportType }}</el-descriptions-item>
+ <el-descriptions-item label="瀹℃牳缁撴灉"><el-tag :type="record.result ? 'success' : 'danger'">{{ record.result ? "閫氳繃" : "鏈�氳繃" }}</el-tag></el-descriptions-item>
+ <el-descriptions-item label="瀹℃牳鎰忚">{{ record.resultRemark ? record.resultRemark : "鏃�" }}</el-descriptions-item>
+ <el-descriptions-item label="鎶ュ鍐呭">
+ <div class="content" v-html="getHtmlContent(record.reportContent)"></div>
+ </el-descriptions-item>
+ <el-descriptions-item label="鎶ュ鏉愭枡">
+ <div
+ v-for="item in record.reportMaterials != null ? record.reportMaterials.split(',') : record.reportMaterials"
+ :key="item">
+ <el-image
+ v-if="isImageFile(item)"
+ :src="getPreview(item)"
+ :preview-src-list="[getPreview(item)]"
+ fit="cover"
+ style="width: 100px; height: 100px; margin: 5px;">
+ </el-image>
+ <el-link
+ v-else
+ :underline="false" type="primary" @click="handleDownload(item)">
+ {{ item.substring(item.lastIndexOf("/") + 1) }}
+ </el-link>
+ </div>
+ </el-descriptions-item>
+ </el-descriptions>
+ </el-card>
+ </el-timeline-item>
+ </el-timeline>
+ </div>
+ <div v-else>
+ <el-empty description="鏃犲鏍歌褰�"></el-empty>
+ </div>
+
<el-button type="primary" @click="recordOpen = false">鍏抽棴</el-button>
</div>
</el-dialog>
<!-- 瀹℃牳鎶ュ -->
- <el-dialog title="鎶ュ瀹℃牳" :visible.sync="auditingOpen" :close-on-click-modal="false" width="800px" append-to-body>
+ <el-dialog title="鎶ュ瀹℃牳" :visible.sync="auditingOpen" :close-on-click-modal="false" width="1100px" append-to-body>
<div style="display: flex;flex-direction: row">
<div style="flex: 6; border-right: 1px solid #d2d1d1; padding-right: 20px">
<el-form ref="form" :model="auditingForm" :rules="auditingRules" label-width="80px">
@@ -208,13 +268,13 @@
<el-input v-model="auditingForm.reportType" disabled />
</el-form-item>
<el-form-item label="鏁呴殰绫诲瀷">
- <el-input v-model="auditingForm.errorTypeList" disabled />
+ <el-input v-model="auditingForm.errorType" disabled />
</el-form-item>
<el-form-item label="鐢熸晥鏃堕棿">
- <el-date-picker v-model="auditingForm.beginCreateTime" disabled />
+ <el-date-picker v-model="auditingForm.beginCreateTime" format="yyyy-MM-dd HH:mm:ss" disabled />
</el-form-item>
<el-form-item label="澶辨晥鏃堕棿">
- <el-date-picker v-model="auditingForm.endCreateTime" disabled />
+ <el-date-picker v-model="auditingForm.endCreateTime" format="yyyy-MM-dd HH:mm:ss" disabled />
</el-form-item>
<el-form-item label="瀹℃牳缁撴灉">
<el-radio-group v-model="auditingForm.auditingResult">
@@ -227,12 +287,13 @@
</el-form-item>
</el-form>
</div>
- <div style="flex: 6; border-right: 1px solid #d2d1d1; padding-right: 20px">
- <div>鎵归噺瀹℃牳鍚屼竴鎵规鍙风殑鎶ュ</div>
- <div>
- <el-checkbox-group v-model="selectedTo">
+ <div style="flex: 5; border-right: 1px solid #d2d1d1; padding-right: 20px; padding-left: 20px">
+ <div>鍚屼竴鎵规鍙风殑鎶ュ</div>
+ <div style="margin-top: 20px">
+ <el-checkbox-group v-if="togetherList && togetherList.length > 0" v-model="selectedTo">
<el-checkbox v-for="item in togetherList" :label="item.id">{{item.pointName}}</el-checkbox>
</el-checkbox-group>
+ <span v-else>鏃�</span>
</div>
</div>
<div style="flex: 5; padding-left: 20px">
@@ -241,10 +302,24 @@
<span v-html="auditingForm.reportContent"></span>
</el-form-item>
<el-form-item label="鎶ュ鏉愭枡">
- <el-link
+ <!-- 娣诲姞绌鸿 -->
+ <div class="material-spacer">{{''}}</div>
+ <div
v-for="item in auditingForm.reportMaterials != null ? auditingForm.reportMaterials.split(',') : auditingForm.reportMaterials"
- :underline="false" type="primary" :key="item" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1)
- }}</el-link>
+ :key="item">
+ <el-image
+ v-if="isImageFile(item)"
+ :src="getPreview(item)"
+ :preview-src-list="[getPreview(item)]"
+ fit="cover"
+ style="width: 100px; height: 100px; margin: 5px;">
+ </el-image>
+ <el-link
+ v-else
+ :underline="false" type="primary" @click="handleDownload(item)">
+ {{ item.substring(item.lastIndexOf("/") + 1) }}
+ </el-link>
+ </div>
</el-form-item>
</el-form>
</div>
@@ -252,10 +327,9 @@
<div slot="footer" class="dialog-footer">
<el-button @click="auditingCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="auditingSubmit">纭� 瀹�</el-button>
+ <el-button type="primary" @click="auditingSubmit">瀹� 鏍�</el-button>
</div>
</el-dialog>
-
</div>
</template>
@@ -275,7 +349,7 @@
fileList: [],
url: process.env.VUE_APP_BASE_API + '/report/import',
addOrImport: 'add',
- fileType: ["doc", "xls", "xlsx", "ppt", "txt", "pdf", "png", "jpg"],
+ fileType: ["doc", "xls", "xlsx", "ppt", "txt", "pdf", "png", "jpg","docx"],
auditingRecordList: [],
// 鐐逛綅list
pointList: [],
@@ -317,6 +391,8 @@
auditingResult: false,
daterangeCreateTime: []
},
+ reportTimeRange:null,//鎶ュ鏃堕棿
+ effectiveTimeRange:null,//鏈夋晥鏃堕棿
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -325,7 +401,11 @@
errorType: null,
status: '',
reportType: null,
- errorTypeList: []
+ errorTypeList: [],
+ reportTimeStart:null,
+ reportTimeEnd:null,
+ effectTimeStart:null,
+ effectTimeEnd:null,
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -362,6 +442,16 @@
this.getList();
},
methods: {
+ getPreview(url) {
+ // 浣跨敤鍏ㄥ眬閰嶇疆鐨勫浘鐗囧墠缂�
+ return this.$img + url;
+ },
+ isImageFile(url) {
+ const imageExtensions = ['.jpg', '.jpeg', '.png', '.gif', '.webp'];
+ return imageExtensions.some(ext =>
+ url.toLowerCase().endsWith(ext)
+ );
+ },
getHtmlContent(content) {
if (content) {
return content
@@ -373,9 +463,9 @@
if (item.result === 0) {
return '瀹℃牳涓�'
} else if (item.status === 1) {
- return '瀹℃牳閫氳繃'
+ return '閫氳繃'
} else if (item.status === 2) {
- return '瀹℃牳鏈�氳繃'
+ return '鏈�氳繃'
}
},
auditingCancel() {
@@ -394,7 +484,7 @@
this.togetherList = res.data;
if (this.togetherList && this.togetherList.length > 0) {
this.togetherList = this.togetherList.filter(item => item.id != row.id)
- this.selectedTo = this.togetherList.map(item => item.pointId)
+ this.selectedTo = this.togetherList.map(item => item.id)
}
})
}
@@ -432,13 +522,13 @@
/** 鏌ヨ鎶ュ鍒楄〃 */
getList() {
this.loading = true;
- if (this.form.daterangeCreateTime && this.form.daterangeCreateTime.length > 0) {
- this.queryParams["beginCreateTime"] = this.form.daterangeCreateTime[0];
- this.queryParams["endCreateTime"] = this.form.daterangeCreateTime[1];
- } else {
- this.queryParams["beginCreateTime"] = null;
- this.queryParams["endCreateTime"] = null;
- }
+ // if (this.form.daterangeCreateTime && this.form.daterangeCreateTime.length > 0) {
+ // this.queryParams["beginCreateTime"] = this.form.daterangeCreateTime[0];
+ // this.queryParams["endCreateTime"] = this.form.daterangeCreateTime[1];
+ // } else {
+ // this.queryParams["beginCreateTime"] = null;
+ // this.queryParams["endCreateTime"] = null;
+ // }
listReport(this.queryParams).then(response => {
this.reportList = response.data.records;
this.total = response.total;
@@ -470,6 +560,22 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
+ if (this.reportTimeRange && this.reportTimeRange.length > 0) {
+ this.queryParams.reportTimeStart = this.reportTimeRange[0]
+ this.queryParams.reportTimeEnd = this.reportTimeRange[1]
+ }else {
+ this.queryParams.reportTimeStart = null
+ this.queryParams.reportTimeEnd = null
+ }
+
+ if (this.effectiveTimeRange && this.effectiveTimeRange.length >0){
+ this.queryParams.effectTimeStart = this.effectiveTimeRange[0]
+ this.queryParams.effectTimeEnd = this.effectiveTimeRange[1]
+ }else {
+ this.queryParams.effectTimeStart = null
+ this.queryParams.effectTimeEnd = null
+ }
+
this.queryParams.pageNum = 1;
this.getList();
},
@@ -521,17 +627,26 @@
/** 瀹℃牳鎸夐挳鎿嶄綔 */
auditingSubmit() {
this.auditingForm.auditingTime = new Date();
- let data = {
- id: this.auditingForm.id,
- togetherList: this.selectedTo
- auditOpinion: this.auditingForm.auditOpinion,
- auditingResult: this.auditingForm.auditingResult
- }
+ this.auditingForm.togetherList = this.selectedTo
audit(this.auditingForm).then(response => {
this.$modal.msgSuccess("瀹℃牳鎴愬姛");
this.auditingOpen = false
this.getList();
- this.auditingForm = {}
+ this.auditingForm = {
+ id: null,
+ unitName: "",
+ pointName: "",
+ peopleName: "",
+ errorTypeList: [],
+ reportContent: "",
+ auditing: "",
+ auditOpinion: "",
+ reportType: "",
+ beginCreateTime: null,
+ endCreateTime: null,
+ auditingResult: false,
+ daterangeCreateTime: []
+ }
});
},
/** 鎻愪氦鎸夐挳 */
@@ -611,6 +726,9 @@
</script>
<style lang="scss" scoped>
+.material-spacer {
+ height: 50px; /* 鍙互璋冩暣绌鸿鐨勯珮搴� */
+}
.content {
height: 100px;
max-height: 300px;
--
Gitblit v1.8.0