From a7d09900629902c8170f639f070fc6da8d168e0b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 20 二月 2024 17:55:50 +0800
Subject: [PATCH] 测试
---
ruoyi-ui/src/views/collection/index.vue | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index a389964..08df003 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -4,7 +4,7 @@
<el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
- style="width: 197px;
+ style="width: 240px;
height: 30px;
background: #FFFFFF;
border-radius: 14px 14px 14px 14px;
@@ -169,7 +169,7 @@
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
- <el-col :span="1.2">
+ <el-col :span="1.5">
<el-upload
action=""
@@ -180,7 +180,7 @@
>
<el-button size="mini" type="primary"
plain
- icon="el-icon-plus" >瀵煎叆</el-button>
+ icon="el-icon-top" >瀵煎叆</el-button>
</el-upload>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -249,6 +249,7 @@
size="mini"
type="text"
icon="el-icon-edit"
+ :disabled="!scope.row.ownData"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
>
@@ -258,6 +259,7 @@
size="mini"
type="text"
icon="el-icon-delete"
+ :disabled="!scope.row.ownData"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
><span style="font-size: 14px;">鍒犻櫎</span></el-button>
@@ -582,14 +584,20 @@
// console.log(this.queryParams)
this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
-
+ let _this = this
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listCollection(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.collectionList = response.data.data;
- this.total = response.data.total;
- this.loading = false;
+ if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�")
+ {
+ _this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ _this.loading = false;
+ }else{
+ _this.collectionList = response.data.data;
+ _this.total = response.data.total;
+ _this.loading = false;
+ }
}
);
listType(this.queryParams).then(response => {
@@ -859,7 +867,7 @@
}
};
</script>
-<style>
+<style scoped>
.app-container{
background-color: #FEF7FC;
}
--
Gitblit v1.9.1