From 7ff4b3e519ca214668e335547f9a570d37b8ba24 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期三, 03 四月 2024 11:45:08 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui
---
src/views/system/report/index.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index e78d801..0a7e73b 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -17,6 +17,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+ <el-form-item label="鎶ュ绫诲瀷" prop="reportType">
+ <el-select
+ v-model="queryParams.reportType"
+ placeholder="鎶ュ绫诲瀷"
+ clearable
+ >
+ <el-option label="浜嬪墠鎶ュ" value="浜嬪墠鎶ュ" />
+ <el-option label="浜嬪悗鎶ュ" value="浜嬪悗鎶ュ" />
+ </el-select>
+ </el-form-item>
<el-form-item label="鎶ュ鏃堕棿">
<el-date-picker
v-model="daterangeCreateTime"
@@ -81,6 +91,7 @@
<el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" />
<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="reportMaterials" />
<el-table-column label="鏁呴殰绫诲瀷" align="center" prop="errorType" />
@@ -103,7 +114,7 @@
type="text"
icon="el-icon-edit"
@click="handleAuditing(scope.row)"
- v-hasPermi="['system:report:auditing']"
+ v-hasPermi="['system:report:audit']"
>瀹℃牳</el-button>
<el-button
size="mini"
@@ -138,10 +149,16 @@
: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>
+ <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">
@@ -150,6 +167,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"/>
@@ -177,6 +205,9 @@
<el-form-item label="鎶ュ浜哄憳">
<el-input v-model="auditingForm.peopleName" disabled />
</el-form-item>
+ <el-form-item label="鎶ュ绫诲瀷">
+ <el-input v-model="auditingForm.reportType" disabled />
+ </el-form-item>
<el-form-item label="鏁呴殰绫诲瀷">
<el-input v-model="auditingForm.errorType" disabled />
</el-form-item>
@@ -196,6 +227,7 @@
<el-button @click="auditingCancel">鍙� 娑�</el-button>
</div>
</el-dialog>
+
</div>
</template>
@@ -231,6 +263,7 @@
open: false,
// 鏁呴殰绫诲瀷鏃堕棿鑼冨洿
daterangeCreateTime: [],
+ expirTime: [],
// 鏁呴殰绫诲瀷鏃堕棿鑼冨洿
daterangeAuditingTime: [],
auditingOpen: false,
@@ -242,7 +275,8 @@
errorType: "",
reportContent: "",
auditing: "",
- suggest: ""
+ suggest: "",
+ reportType: "",
},
// 鏌ヨ鍙傛暟
queryParams: {
@@ -273,6 +307,9 @@
reportMaterials: [
{ required: true, message: "涓婃姤鏉愭枡涓嶈兘涓虹┖", trigger: "blur" }
],
+ reportType: [
+ { required: true, message: "璇烽�夋嫨鎶ュ绫诲瀷", trigger: "blur" }
+ ],
}
};
},
@@ -291,6 +328,7 @@
this.auditingForm.peopleName =row.peopleName
this.auditingForm.errorType =row.errorType
this.auditingForm.reportContent =row.reportContent
+ this.auditingForm.reportType =row.reportType
},
// 杩滅▼鎼滅储鐐逛綅
remoteGetPoints(query) {
@@ -382,6 +420,14 @@
},
/** 鎻愪氦鎸夐挳 */
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 => {
if (valid) {
if (this.form.id != null) {
@@ -392,7 +438,7 @@
});
} else {
addReport(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.$modal.msgSuccess("鎴愬姛鎻愪氦鎶ュ");
this.open = false;
this.getList();
});
--
Gitblit v1.8.0