From 9e8d1bd0b6fb495920921214775b84d490e032a3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 16:43:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/report/index.vue | 113 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 65 insertions(+), 48 deletions(-)
diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index 3f10afc..ed883e4 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -35,7 +35,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"
@@ -87,7 +88,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)"
@@ -163,35 +164,41 @@
<!-- 鏌ョ湅瀹℃牳璁板綍 -->
<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="鎶ュ鏉愭枡">
+ <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>
+ <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">
@@ -227,12 +234,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">
@@ -252,7 +260,7 @@
<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>
@@ -373,9 +381,9 @@
if (item.result === 0) {
return '瀹℃牳涓�'
} else if (item.status === 1) {
- return '瀹℃牳閫氳繃'
+ return '閫氳繃'
} else if (item.status === 2) {
- return '瀹℃牳鏈�氳繃'
+ return '鏈�氳繃'
}
},
auditingCancel() {
@@ -394,7 +402,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 +440,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;
@@ -521,17 +529,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: []
+ }
});
},
/** 鎻愪氦鎸夐挳 */
--
Gitblit v1.8.0