From d18dd7951c236a56e4a100406fde5b7ceb7d3e07 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 11 四月 2024 15:46:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/report/index.vue | 12 ++++++++++--
src/views/system/unit/index.vue | 6 +++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index 950f1e9..f58d886 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -93,7 +93,11 @@
<el-table-column label="鐐逛綅" align="center" prop="pointName" />
<el-table-column label="鎶ュ绫诲瀷" align="center" prop="reportType" />
<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="reportMaterials" show-overflow-tooltip="true">
+ <template slot-scope="scope">
+ <div v-for="(item, index) in scope.row.reportMaterials.split(',')" :key="index">{{ item.substring(item.lastIndexOf("/") + 1) }}</div>
+ </template>
+ </el-table-column>
<el-table-column label="鏁呴殰绫诲瀷" align="center" prop="errorType" />
<el-table-column label="瀹℃牳鏃堕棿" align="center" prop="auditingTime" width="180">
<template slot-scope="scope">
@@ -222,7 +226,7 @@
<el-input type="textarea" v-html="auditingForm.reportContent" disabled />
</el-form-item>
<el-form-item label="涓婃姤鏉愭枡">
- <el-link :href="auditingForm.reportMaterials" :underline="false">{{ auditingForm.reportMaterials }}</el-link>
+ <el-link v-for="item in auditingForm.reportMaterials != null ? auditingForm.reportMaterials.split(',') : auditingForm.reportMaterials" :underline="false" :key="item" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
</el-form-item>
<el-form-item label="瀹℃牳缁撴灉">
<el-radio-group v-model="auditingForm.status">
@@ -497,6 +501,10 @@
this.download('report/export', {
...this.queryParams
}, `report_${new Date().getTime()}.xlsx`)
+ },
+ /** 涓嬭浇鎸夐挳鎿嶄綔 */
+ handleDownload (data) {
+ this.$download.resource(data);
}
}
};
diff --git a/src/views/system/unit/index.vue b/src/views/system/unit/index.vue
index 4409bfa..1cf35f6 100644
--- a/src/views/system/unit/index.vue
+++ b/src/views/system/unit/index.vue
@@ -123,7 +123,7 @@
<el-input v-model="form.unitName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" />
</el-form-item>
<el-form-item label="鍗曚綅璐﹀彿" prop="unitAdminAccount">
- <el-input v-model="form.unitAdminAccount" placeholder="璇疯緭鍏ュ崟浣嶇鐞嗗憳璐﹀彿" />
+ <el-input v-model="form.unitAdminAccount" placeholder="璇疯緭鍏ュ崟浣嶇鐞嗗憳璐﹀彿" :disabled="account" />
</el-form-item>
<el-form-item label="鍗曚綅鑱旂郴浜�" prop="unitContact">
<el-input v-model="form.unitContact" placeholder="璇疯緭鍏ュ崟浣嶈仈绯讳汉" />
@@ -150,6 +150,8 @@
name: "Unit",
data() {
return {
+ // 璐﹀彿涓嶅彲淇敼
+ account: true,
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -274,12 +276,14 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
+ this.account = false;
this.reset();
this.open = true;
this.title = "娣诲姞杩愮淮鍗曚綅";
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
+ this.account = true;
this.reset();
const id = row.id || this.ids
getUnit(id).then(response => {
--
Gitblit v1.8.0