From c4ec0fac48c9bef59fadba87404ea3d4bf9e087c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 11 二月 2025 16:05:42 +0800
Subject: [PATCH] 工单、报备，图片预览功能
---
src/views/system/report/index.vue | 390 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 245 insertions(+), 145 deletions(-)
diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index 3e386a8..df53f4e 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -1,13 +1,18 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <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>
<el-option label="浜嬪墠鎶ュ" value="浜嬪墠鎶ュ" />
<el-option label="浜嬪悗鎶ュ" value="浜嬪悗鎶ュ" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鏁呴殰绫诲瀷" prop="errorTypeList">
+ <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="瀹℃牳鐘舵��">
@@ -27,10 +32,11 @@
<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>
+ 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"
@@ -48,18 +54,25 @@
<template slot-scope="scope">
<div class="info-container">
<div class="info-item">
- <div class="info-label">涓婃姤鍐呭</div>
+ <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-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 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>
</div>
</div>
@@ -67,19 +80,24 @@
</template>
</el-table-column>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="杩愮淮鍗曚綅" width="200" align="center" prop="unitName" />
- <el-table-column label="鎶ュ浜哄憳" align="center" prop="peopleName" />
+ <el-table-column label="鎶ュ鍗曚綅" width="200" align="center" prop="unitName" />
+<!-- <el-table-column label="鎶ュ浜哄憳" align="center" prop="peopleName" />-->
<el-table-column label="鐐逛綅" width="250" align="center" prop="pointName" />
<el-table-column label="鎶ュ绫诲瀷" align="center" prop="reportType" />
- <el-table-column label="涓婃姤鏃堕棿" width="200" align="center" prop="createTime" />
- <el-table-column label="鏁呴殰绫诲瀷" align="center" prop="errorType" />
+ <el-table-column label="鎶ュ鏃堕棿" width="200" align="center" prop="createTime" />
+ <el-table-column label="鏁呴殰绫诲瀷" width="250" align="center" prop="errorType" />
+ <el-table-column label="鏈夋晥鏃堕棿" width="250" align="center">
+ <template slot-scope="scope">
+ {{scope.row.beginCreateTime}}鑷硔{scope.row.endCreateTime}}
+ </template>
+ </el-table-column>
<el-table-column label="瀹℃牳缁撴灉" align="center" prop="status" :formatter="formatStatus" />
<el-table-column label="鎿嶄綔" fixed="right" width="250" 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']" 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">瀹℃牳</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)"
@@ -92,51 +110,63 @@
@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" v-if="addOrImport === 'add'">
- <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="鐐逛綅瀵煎叆" v-if="addOrImport === 'import'">
- <el-upload accept=".xlsx, .xls" :limit="1" :action="url" drag :before-upload="beforeUpload" :file-list="fileList">
- <i class="el-icon-upload"></i>
- <div class="el-upload__text">
- 灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em>
- </div>
- <div class="el-upload__tip" slot="tip">
- <span>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span>
- <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
- @click="importTemplate">涓嬭浇妯℃澘</el-link>
- </div>
- </el-upload>
- </el-form-item>
- <el-form-item label="鎶ュ绫诲瀷" prop="reportType">
- <el-select v-model="form.reportType">
- <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" multiple>
- <el-option v-for="dict in dict.type.error_type" :value="dict.value" :key="dict.value" :label="dict.label" />
- </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="缁撴潫鏃ユ湡"
- @change="handleExpirTimeChange"></el-date-picker>
- </el-form-item>
- <el-form-item label="鎶ュ鍐呭" prop="reportContent">
- <editor v-model="form.reportContent" :min-height="192" />
- </el-form-item>
- <el-form-item label="涓婃姤鏉愭枡" prop="reportMaterials">
- <file-upload v-model="form.reportMaterials" :fileType='fileType' />
- </el-form-item>
- </el-form>
+ <el-dialog :title="title" :visible.sync="open" width="980px" :close-on-click-modal="false" append-to-body>
+ <div style="display: flex;flex-direction: row">
+ <div style="flex: 5">
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form-item label="鐐逛綅" prop="pointId" v-if="addOrImport === 'add'">
+ <el-select v-model="form.pointId" @change="pointChange" 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="鐐逛綅瀵煎叆" v-if="addOrImport === 'import'">
+ <el-upload accept=".xlsx, .xls" :limit="1" :action="url" drag :before-upload="beforeUpload" :file-list="fileList">
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">
+ 灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em>
+ </div>
+ <div class="el-upload__tip" slot="tip">
+ <span>浠呭厑璁稿鍏ls銆亁lsx鏍煎紡鏂囦欢銆�</span>
+ <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+ @click="importTemplate">涓嬭浇妯℃澘</el-link>
+ </div>
+ </el-upload>
+ </el-form-item>
+ <el-form-item label="鎶ュ绫诲瀷" prop="reportType">
+ <el-select v-model="form.reportType">
+ <el-option label="浜嬪墠鎶ュ" value="浜嬪墠鎶ュ" />
+ <el-option label="浜嬪悗鎶ュ" value="浜嬪悗鎶ュ" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鏁呴殰绫诲瀷" prop="errorTypeList">
+ <el-select v-model="form.errorTypeList" multiple>
+ <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="鎶ュ鏃堕棿" prop="daterangeCreateTime">
+ <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>
+ </el-form>
+ </div>
+ <div style="flex: 5">
+ <el-form :rules="rules">
+ <el-form-item label="鎶ュ鍐呭" prop="reportContent">
+ <editor v-model="form.reportContent" :min-height="192" />
+ </el-form-item>
+ <el-form-item label="鎶ュ鏉愭枡" prop="reportMaterials">
+ <file-upload v-model="form.reportMaterials" :fileType='fileType' />
+ </el-form-item>
+ </el-form>
+ </div>
+ </div>
+
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">鍙� 娑�</el-button>
<el-button type="primary" @click="submitForm">鎻愪氦瀹℃牳</el-button>
@@ -144,39 +174,54 @@
</el-dialog>
<!-- 鏌ョ湅瀹℃牳璁板綍 -->
- <el-dialog title="鎶ュ瀹℃牳璁板綍" :visible.sync="recordOpen" width="900px">
+ <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.createTime" 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="鏁呴殰绫诲瀷">{{ record.errorType }}</el-descriptions-item>
- <el-descriptions-item label="瀹℃牳缁撴灉">{{ formatStatus(record) }}</el-descriptions-item>
- <el-descriptions-item label="瀹℃牳鎰忚">{{ record.auditOpinion }}</el-descriptions-item>
- <el-descriptions-item label="瀹℃牳鏃堕棿">{{ record.auditingTime }}</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" 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">
@@ -196,10 +241,10 @@
<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">
@@ -212,16 +257,39 @@
</el-form-item>
</el-form>
</div>
+ <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">
<el-form>
<el-form-item label="鎶ュ鍐呭">
<span v-html="auditingForm.reportContent"></span>
</el-form-item>
- <el-form-item label="涓婃姤鏉愭枡">
- <el-link
+ <el-form-item label="鎶ュ鏉愭枡">
+ <!-- 娣诲姞绌鸿 -->
+ <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>
@@ -229,22 +297,25 @@
<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>
<script>
-import { listReport, getReport, delReport, addReport, updateReport, auditing, audit, importReport } from "@/api/platform/report";
+import { listReport, getReport, delReport, addReport, updateReport, auditing, audit, importReport, getTogether } from "@/api/platform/report";
import { pointSelectData } from "@/api/platform/point";
export default {
- dicts: ['error_type'],
+ dicts: ['report_error_type'],
name: "Report",
data() {
return {
+ // 閫変腑鐨勫悓涓�鎵规鍙锋姤澶�
+ selectedTo: [],
+ // 鍚屼竴鎵规鍙风殑鎶ュ
+ togetherList: [],
fileList: [],
url: process.env.VUE_APP_BASE_API + '/report/import',
addOrImport: 'add',
@@ -273,8 +344,6 @@
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
recordOpen: false,
- // 鎶ュ鏃堕棿鑼冨洿
- daterangeCreateTime: [],
expirTime: [],
auditingOpen: false,
auditingForm: {
@@ -282,14 +351,15 @@
unitName: "",
pointName: "",
peopleName: "",
- errorType: "",
+ errorTypeList: [],
reportContent: "",
auditing: "",
auditOpinion: "",
reportType: "",
beginCreateTime: null,
endCreateTime: null,
- auditingResult: false
+ auditingResult: false,
+ daterangeCreateTime: []
},
// 鏌ヨ鍙傛暟
queryParams: {
@@ -297,8 +367,9 @@
pageSize: 10,
keyword: null,
errorType: null,
- status: 0,
- reportType: null
+ status: '',
+ reportType: null,
+ errorTypeList: []
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -316,15 +387,16 @@
{ required: true, message: "鎶ュ鍐呭涓嶈兘涓虹┖", trigger: "blur" }
],
reportMaterials: [
- { required: true, message: "涓婃姤鏉愭枡涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, message: "鎶ュ鏉愭枡涓嶈兘涓虹┖", trigger: "blur" }
],
reportType: [
{ required: true, message: "璇烽�夋嫨鎶ュ绫诲瀷", trigger: "blur" }
],
- errorType: [
+ errorTypeList: [
{ required: true, message: "璇烽�夋嫨鏁呴殰绫诲瀷", trigger: "blur" }
],
- expirTime: [
+ // 鎶ュ鏃堕棿鑼冨洿
+ daterangeCreateTime: [
{ required: true, message: "璇烽�夋嫨鎶ュ鏃堕棿", trigger: "blur" }
],
}
@@ -334,6 +406,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
@@ -342,12 +424,12 @@
}
},
formatStatus(item) {
- if (item.status === 0) {
+ if (item.result === 0) {
return '瀹℃牳涓�'
} else if (item.status === 1) {
- return '瀹℃牳閫氳繃'
+ return '閫氳繃'
} else if (item.status === 2) {
- return '瀹℃牳鏈�氳繃'
+ return '鏈�氳繃'
}
},
auditingCancel() {
@@ -361,6 +443,15 @@
})
},
handleAuditing(row) {
+ if (row.importBatchNumber) {
+ getTogether(row.importBatchNumber).then(res => {
+ 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.id)
+ }
+ })
+ }
this.auditingOpen = true;
this.auditingForm.id = row.id
this.auditingForm.pointId = row.pointId
@@ -373,6 +464,9 @@
this.auditingForm.endCreateTime = row.endCreateTime
this.auditingForm.beginCreateTime = row.beginCreateTime
this.auditingForm.reportMaterials = row.reportMaterials
+ },
+ pointChange(value) {
+ // this.remoteGetPoints(value)
},
// 杩滅▼鎼滅储鐐逛綅
remoteGetPoints(query) {
@@ -392,13 +486,13 @@
/** 鏌ヨ鎶ュ鍒楄〃 */
getList() {
this.loading = true;
- if (this.daterangeCreateTime && this.daterangeCreateTime.length > 0) {
- this.queryParams["beginCreateTime"] = this.daterangeCreateTime[0];
- this.queryParams["endCreateTime"] = this.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;
@@ -412,8 +506,8 @@
},
// 琛ㄥ崟閲嶇疆
reset() {
- this.daterangeCreateTime = [];
this.form = {
+ daterangeCreateTime: [],
id: null,
unitId: null,
peopleId: null,
@@ -424,7 +518,7 @@
reportContent: null,
reportMaterials: null,
deleted: null,
- errorType: null,
+ errorTypeList: [],
};
// this.resetForm("form");
},
@@ -435,7 +529,6 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
- this.daterangeCreateTime = [];
this.daterangeAuditingTime = [];
this.queryParams["beginCreateTime"] = null;
this.queryParams["endCreateTime"] = null;
@@ -453,14 +546,14 @@
this.reset();
this.addOrImport = 'add';
this.open = true;
- this.title = "娣诲姞鎶ュ";
+ this.title = "灏戦噺鎶ュ";
},
/** 瀵煎叆鎸夐挳鎿嶄綔 */
handleImport() {
this.reset();
this.addOrImport = 'import';
this.open = true;
- this.title = "瀵煎叆鎶ュ";
+ this.title = "鎵归噺鎶ュ";
},
beforeUpload(file) {
this.fileList = [file];
@@ -471,9 +564,9 @@
this.reset();
const id = row.id || this.ids
getReport(id).then(response => {
- this.daterangeCreateTime = [response.data.beginCreateTime, response.data.endCreateTime]
this.form = response.data;
- this.form.errorType = this.form.errorType.split(',');
+ this.form.daterangeCreateTime = [this.form.beginCreateTime, this.form.endCreateTime]
+ this.remoteGetPoints(this.form.pointId)
this.addOrImport = 'add';
this.open = true;
this.title = "淇敼鎶ュ";
@@ -482,47 +575,51 @@
/** 瀹℃牳鎸夐挳鎿嶄綔 */
auditingSubmit() {
this.auditingForm.auditingTime = new Date();
- let data = {
- id: this.auditingForm.id,
- 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: []
+ }
});
- },
- handleExpirTimeChange() {
- if (null != this.form.expirTime && '' != this.form.expirTime) {
- this.form["beginCreateTime"] = this.form.expirTime[0];
- this.form["endCreateTime"] = this.form.expirTime[1];
- }
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
this.form.pointId = this.form.pointId ? this.form.pointId : this.form.serialNumber;
this.$refs["form"].validate(valid => {
if (valid) {
- this.form.beginCreateTime = this.daterangeCreateTime[0]
- this.form.endCreateTime = this.daterangeCreateTime[1]
+ this.form.beginCreateTime = this.form.daterangeCreateTime[0]
+ this.form.endCreateTime = this.form.daterangeCreateTime[1]
if (this.addOrImport === 'import') {
let formData = new FormData();
formData.append("importPointId", this.fileList[0]);
formData.append("pointId", this.form.importPointId);
formData.append("reportType", this.form.reportType);
- formData.append("errorType", this.form.errorType);
+ formData.append("errorTypeList", this.form.errorTypeList);
formData.append("reportContent", this.form.reportContent);
formData.append("reportMaterials", this.form.reportMaterials);
- formData.append("expirTime", this.form.expirTime);
+ formData.append("beginCreateTimeStr", this.form.daterangeCreateTime[0]);
+ formData.append("endCreateTimeStr", this.form.daterangeCreateTime[1]);
importReport(formData).then(() => {
- this.$modal.msgSuccess("鎴愬姛瀵煎叆鎶ュ");
+ this.$modal.msgSuccess("鎴愬姛鎻愪氦鎶ュ");
this.open = false;
this.getList();
});
} else {
- this.form.errorType = this.form.errorType.join(',');
if (this.form.id != null) {
updateReport(this.form).then(() => {
this.$modal.msgSuccess("淇敼鎴愬姛");
@@ -567,16 +664,19 @@
formatFileList(data) {
if (!data) return [];
- return data.split(',');
+ return data.split(',').map(item => process.env.VUE_APP_BASE_API + item);
},
showFile(filePath) {
- console.log(process.env.VUE_APP_FILE_URL + filePath);
+ console.log(process.env.VUE_APP_BASE_API + filePath);
}
}
};
</script>
<style lang="scss" scoped>
+.material-spacer {
+ height: 50px; /* 鍙互璋冩暣绌鸿鐨勯珮搴� */
+}
.content {
height: 100px;
max-height: 300px;
--
Gitblit v1.8.0