From cb8b1337e0a35534abc6ce653f0acce9b1515e16 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 08 四月 2024 18:01:40 +0800
Subject: [PATCH] 运维单位
---
src/views/system/report/index.vue | 41 ++++++++++++++++++++++++++++++++---------
src/views/system/unit/index.vue | 4 +++-
2 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index e4b92de..950f1e9 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -92,7 +92,7 @@
<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" />
+ <el-table-column label="鎶ュ鍐呭" align="center" prop="reportContent" show-overflow-tooltip="true" />
<el-table-column label="涓婃姤鏉愭枡" align="center" prop="reportMaterials" />
<el-table-column label="鏁呴殰绫诲瀷" align="center" prop="errorType" />
<el-table-column label="瀹℃牳鏃堕棿" align="center" prop="auditingTime" width="180">
@@ -115,6 +115,7 @@
icon="el-icon-edit"
@click="handleAuditing(scope.row)"
v-hasPermi="['system:report:audit']"
+ v-if="scope.row.status === 0"
>瀹℃牳</el-button>
<el-button
size="mini"
@@ -218,21 +219,23 @@
<el-date-picker v-model="auditingForm.endCreateTime" disabled />
</el-form-item>
<el-form-item label="鎶ュ鍐呭">
- <el-input v-model="auditingForm.pointName" disabled />
+ <el-input type="textarea" v-html="auditingForm.reportContent" disabled />
</el-form-item>
<el-form-item label="涓婃姤鏉愭枡">
- <el-upload v-model="auditingForm.reportMaterials" disabled/>
+ <el-link :href="auditingForm.reportMaterials" :underline="false">{{ auditingForm.reportMaterials }}</el-link>
</el-form-item>
- <el-form-item label="瀹℃牳缁撴灉" prop="auditing">
- <el-radio v-model="auditingForm.auditing" label="pass">閫氳繃</el-radio>
- <el-radio v-model="auditingForm.auditing" label="reject">椹冲洖</el-radio>
+ <el-form-item label="瀹℃牳缁撴灉">
+ <el-radio-group v-model="auditingForm.status">
+ <el-radio :label="1">閫氳繃</el-radio>
+ <el-radio :label="2">椹冲洖</el-radio>
+ </el-radio-group>
</el-form-item>
<el-form-item label="瀹℃牳鎰忚" prop="suggest">
- <el-input v-model="auditingForm.suggest"/>
+ <el-input v-model="auditingForm.auditOpinion"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary">纭� 瀹�</el-button>
+ <el-button type="primary" @click="auditingSubmit">纭� 瀹�</el-button>
<el-button @click="auditingCancel">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -321,6 +324,12 @@
reportType: [
{ required: true, message: "璇烽�夋嫨鎶ュ绫诲瀷", trigger: "blur" }
],
+ errorType: [
+ { required: true, message: "璇烽�夋嫨鏁呴殰绫诲瀷", trigger: "blur" }
+ ],
+ expirTime: [
+ { required: true, message: "璇烽�夋嫨鏈夋晥鏃堕棿", trigger: "blur" }
+ ],
}
};
},
@@ -334,6 +343,7 @@
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
@@ -342,6 +352,7 @@
this.auditingForm.reportType =row.reportType
this.auditingForm.endCreateTime =row.endCreateTime
this.auditingForm.beginCreateTime =row.beginCreateTime
+ this.auditingForm.reportMaterials =row.reportMaterials
},
// 杩滅▼鎼滅储鐐逛綅
remoteGetPoints(query) {
@@ -406,6 +417,8 @@
resetQuery() {
this.daterangeCreateTime = [];
this.daterangeAuditingTime = [];
+ this.queryParams["beginCreateTime"] = null;
+ this.queryParams["endCreateTime"] = null;
this.resetForm("queryForm");
this.handleQuery();
},
@@ -429,6 +442,16 @@
this.form = response.data;
this.open = true;
this.title = "淇敼鎶ュ";
+ });
+ },
+ /** 瀹℃牳鎸夐挳鎿嶄綔 */
+ auditingSubmit() {
+ this.auditingForm.auditingTime = new Date();
+ updateReport(this.auditingForm).then(response => {
+ this.$modal.msgSuccess("瀹℃牳鎴愬姛");
+ this.auditingOpen = false
+ this.getList();
+ this.auditingForm = {}
});
},
/** 鎻愪氦鎸夐挳 */
@@ -471,7 +494,7 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.download('system/report/export', {
+ this.download('report/export', {
...this.queryParams
}, `report_${new Date().getTime()}.xlsx`)
}
diff --git a/src/views/system/unit/index.vue b/src/views/system/unit/index.vue
index dc3bf74..4409bfa 100644
--- a/src/views/system/unit/index.vue
+++ b/src/views/system/unit/index.vue
@@ -261,6 +261,8 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.daterangeCreateTime = [];
+ this.queryParams.start = null;
+ this.queryParams.end = null;
this.resetForm("queryForm");
this.handleQuery();
},
@@ -318,7 +320,7 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.download('system/unit/export', {
+ this.download('yw-unit/export', {
...this.queryParams
}, `unit_${new Date().getTime()}.xlsx`)
}
--
Gitblit v1.8.0