From 10ec0d1db5179d90a82e7d534cda6e9bcf597c08 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 01 九月 2024 22:41:52 +0800
Subject: [PATCH] 报备功能优化
---
src/views/system/report/index.vue | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index 6f4b8bc..3f10afc 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -32,7 +32,7 @@
<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>
@@ -227,6 +227,14 @@
</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">
+ <el-checkbox v-for="item in togetherList" :label="item.id">{{item.pointName}}</el-checkbox>
+ </el-checkbox-group>
+ </div>
+ </div>
<div style="flex: 5; padding-left: 20px">
<el-form>
<el-form-item label="鎶ュ鍐呭">
@@ -252,7 +260,7 @@
</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 {
@@ -260,6 +268,10 @@
name: "Report",
data() {
return {
+ // 閫変腑鐨勫悓涓�鎵规鍙锋姤澶�
+ selectedTo: [],
+ // 鍚屼竴鎵规鍙风殑鎶ュ
+ togetherList: [],
fileList: [],
url: process.env.VUE_APP_BASE_API + '/report/import',
addOrImport: 'add',
@@ -377,6 +389,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.pointId)
+ }
+ })
+ }
this.auditingOpen = true;
this.auditingForm.id = row.id
this.auditingForm.pointId = row.pointId
@@ -502,6 +523,7 @@
this.auditingForm.auditingTime = new Date();
let data = {
id: this.auditingForm.id,
+ togetherList: this.selectedTo
auditOpinion: this.auditingForm.auditOpinion,
auditingResult: this.auditingForm.auditingResult
}
@@ -524,10 +546,11 @@
formData.append("importPointId", this.fileList[0]);
formData.append("pointId", this.form.importPointId);
formData.append("reportType", this.form.reportType);
- formData.append("errorType", this.form.errorTypeList);
+ 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.open = false;
--
Gitblit v1.8.0