From 319d2d82e78cfaf951178f238e9bb2a9ecafb9c6 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期五, 26 四月 2024 14:02:45 +0800
Subject: [PATCH] chore:合并分支
---
src/views/system/report/index.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index f58d886..f399ce2 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -52,6 +52,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
+ v-hasPermi="['system:report:add']"
>鏂板</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
@@ -72,6 +73,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
+ v-hasPermi="['system:report:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -81,6 +83,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
+ v-hasPermi="['system:report:export']"
>瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -118,7 +121,7 @@
type="text"
icon="el-icon-edit"
@click="handleAuditing(scope.row)"
- v-hasPermi="['system:report:audit']"
+ v-hasPermi="['system:report:edit']"
v-if="scope.row.status === 0"
>瀹℃牳</el-button>
<el-button
@@ -173,15 +176,16 @@
<el-option label="璁惧閬楀け" value="璁惧閬楀け"/>
</el-select>
</el-form-item>
- <el-form-item label="鏈夋晥鏃堕棿">
+ <el-form-item label="鎶ュ鏃堕棿" prop="expirTime">
<el-date-picker
- v-model="expirTime"
+ v-model="form.expirTime"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
- start-placeholder="鐢熸晥鏃ユ湡"
- end-placeholder="澶辨晥鏃ユ湡"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ @change="handleExpirTimeChange"
></el-date-picker>
</el-form-item>
<el-form-item label="鎶ュ鍐呭" prop="reportContent">
@@ -332,7 +336,7 @@
{ required: true, message: "璇烽�夋嫨鏁呴殰绫诲瀷", trigger: "blur" }
],
expirTime: [
- { required: true, message: "璇烽�夋嫨鏈夋晥鏃堕棿", trigger: "blur" }
+ { required: true, message: "璇烽�夋嫨鎶ュ鏃堕棿", trigger: "blur" }
],
}
};
@@ -458,13 +462,14 @@
this.auditingForm = {}
});
},
+ handleExpirTimeChange() {
+ if (null != this.form.expirTime && '' != this.form.expirTime) {
+ this.form["beginCreateTime"] = this.form.expirTime[0];
+ this.form["endCreateTime"] = this.form.expirTime[1];
+ }
+ },
/** 鎻愪氦鎸夐挳 */
submitForm() {
-
- if (null != this.expirTime && '' != this.expirTime) {
- this.form["beginCreateTime"] = this.expirTime[0];
- this.form["endCreateTime"] = this.expirTime[1];
- }
// todo 鍒ゆ柇鏄簨鍓嶆姤澶�
--
Gitblit v1.8.0