From 6817c96db53ac16f5d5eca72b73230d898f32126 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期四, 11 四月 2024 09:43:32 +0800
Subject: [PATCH] Merge branch 'master' into dev-threejs
---
src/views/system/report/index.vue | 78 +++++++++++++++++++++++++++++++++------
1 files changed, 66 insertions(+), 12 deletions(-)
diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index 6f360b9..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"
@@ -149,9 +150,9 @@
:loading="selectLoading">
<el-option
v-for="item in pointList"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ :key="item.id"
+ :label="item.value"
+ :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -167,6 +168,17 @@
<el-option label="璁惧鏁呴殰" value="璁惧鏁呴殰"/>
<el-option label="璁惧閬楀け" value="璁惧閬楀け"/>
</el-select>
+ </el-form-item>
+ <el-form-item label="鏈夋晥鏃堕棿">
+ <el-date-picker
+ v-model="expirTime"
+ style="width: 240px"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="鐢熸晥鏃ユ湡"
+ end-placeholder="澶辨晥鏃ユ湡"
+ ></el-date-picker>
</el-form-item>
<el-form-item label="鎶ュ鍐呭" prop="reportContent">
<editor v-model="form.reportContent" :min-height="192"/>
@@ -200,19 +212,30 @@
<el-form-item label="鏁呴殰绫诲瀷">
<el-input v-model="auditingForm.errorType" disabled />
</el-form-item>
- <el-form-item label="鎶ュ鍐呭">
- <el-input v-model="auditingForm.pointName" disabled />
+ <el-form-item label="鐢熸晥鏃堕棿">
+ <el-date-picker v-model="auditingForm.beginCreateTime" disabled />
</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-date-picker v-model="auditingForm.endCreateTime" disabled />
+ </el-form-item>
+ <el-form-item label="鎶ュ鍐呭">
+ <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-form-item>
+ <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>
@@ -252,6 +275,7 @@
open: false,
// 鏁呴殰绫诲瀷鏃堕棿鑼冨洿
daterangeCreateTime: [],
+ expirTime: [],
// 鏁呴殰绫诲瀷鏃堕棿鑼冨洿
daterangeAuditingTime: [],
auditingOpen: false,
@@ -265,6 +289,8 @@
auditing: "",
suggest: "",
reportType: "",
+ beginCreateTime: null,
+ endCreateTime: null
},
// 鏌ヨ鍙傛暟
queryParams: {
@@ -298,6 +324,12 @@
reportType: [
{ required: true, message: "璇烽�夋嫨鎶ュ绫诲瀷", trigger: "blur" }
],
+ errorType: [
+ { required: true, message: "璇烽�夋嫨鏁呴殰绫诲瀷", trigger: "blur" }
+ ],
+ expirTime: [
+ { required: true, message: "璇烽�夋嫨鏈夋晥鏃堕棿", trigger: "blur" }
+ ],
}
};
},
@@ -311,12 +343,16 @@
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
this.auditingForm.errorType =row.errorType
this.auditingForm.reportContent =row.reportContent
this.auditingForm.reportType =row.reportType
+ this.auditingForm.endCreateTime =row.endCreateTime
+ this.auditingForm.beginCreateTime =row.beginCreateTime
+ this.auditingForm.reportMaterials =row.reportMaterials
},
// 杩滅▼鎼滅储鐐逛綅
remoteGetPoints(query) {
@@ -381,6 +417,8 @@
resetQuery() {
this.daterangeCreateTime = [];
this.daterangeAuditingTime = [];
+ this.queryParams["beginCreateTime"] = null;
+ this.queryParams["endCreateTime"] = null;
this.resetForm("queryForm");
this.handleQuery();
},
@@ -406,8 +444,24 @@
this.title = "淇敼鎶ュ";
});
},
+ /** 瀹℃牳鎸夐挳鎿嶄綔 */
+ auditingSubmit() {
+ this.auditingForm.auditingTime = new Date();
+ updateReport(this.auditingForm).then(response => {
+ this.$modal.msgSuccess("瀹℃牳鎴愬姛");
+ this.auditingOpen = false
+ this.getList();
+ this.auditingForm = {}
+ });
+ },
/** 鎻愪氦鎸夐挳 */
submitForm() {
+
+ if (null != this.expirTime && '' != this.expirTime) {
+ this.form["beginCreateTime"] = this.expirTime[0];
+ this.form["endCreateTime"] = this.expirTime[1];
+ }
+
// todo 鍒ゆ柇鏄簨鍓嶆姤澶�
this.$refs["form"].validate(valid => {
@@ -440,7 +494,7 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.download('system/report/export', {
+ this.download('report/export', {
...this.queryParams
}, `report_${new Date().getTime()}.xlsx`)
}
--
Gitblit v1.8.0