From f31d6505363fa191fb715976826369484c26cf16 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期二, 03 十二月 2024 12:05:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/wel/homeConfig.vue | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/wel/homeConfig.vue b/Source/plt-web/plt-web-ui/src/views/wel/homeConfig.vue
index 58316cc..2aba3a8 100644
--- a/Source/plt-web/plt-web-ui/src/views/wel/homeConfig.vue
+++ b/Source/plt-web/plt-web-ui/src/views/wel/homeConfig.vue
@@ -8,8 +8,6 @@
@selection-change="selectChange"
@row-click="rowClickHandler"
@refresh-change="handleRefresh"
- @size-change="sizeChange"
- @current-change="currentChange"
>
<template slot="menuLeft">
<el-button icon="el-icon-plus" plain size="small" type="primary" @click="addClickHandler">鍒涘缓
@@ -36,7 +34,7 @@
width="500px"
@close="visibleCloseHandler"
>
- <el-form ref="form" :model="form" :rules="rules" label-width="90px" size="small">
+ <el-form ref="form" :model="form" :rules="rules" label-width="95px" size="small">
<el-row>
<el-col :span="24">
<el-form-item label="缁勪欢锛�" prop="id">
@@ -44,7 +42,12 @@
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="鍗犳嵁鍒楁暟锛�" prop="span">
+ <el-form-item label="鏍囬锛�" prop="title">
+ <el-input v-model="form.title"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鍗犳嵁鍒楁暟锛�" prop="span" tip="鎬诲垪鏁颁负24">
<avue-input-number v-model="form.span" precision="0" style="width: 100%" :max="24" :min="1" controls-position="" tip="鎬诲垪鏁颁负24锛屽鍗犳弧鏁磋璇疯緭鍏�24"></avue-input-number>
</el-form-item>
</el-col>
@@ -94,6 +97,10 @@
prop: 'id',
},
{
+ label: '鏍囬',
+ prop: 'title',
+ },
+ {
label: '鍗犳嵁鍒楁暟',
prop: 'span'
},
@@ -117,10 +124,13 @@
rules: {
id: [
{required: true, message: '璇烽�夋嫨缁勪欢', trigger: 'blur'},
+ ],
+ span:[
+ {required: true, message: '璇疯緭鍏ュ崰鎹垪鏁�', trigger: 'blur'},
]
},
dic:[{
- label:'寰呭姙浠诲姟',
+ label:'寰呭姙娴佺▼浠诲姟',
value:'UndoTaskPortlet'
},{
label:'閫夐」2',
@@ -136,13 +146,10 @@
},
methods: {
getList() {
- gridStatus(this.page.currentPage, this.page.pageSize).then(res => {
+ gridStatus().then(res => {
const data = res.data.data;
this.data = data;
- this.page.total = res.data.total;
this.loading = false;
- }).catch(err => {
- this.$message.error(err);
});
},
@@ -156,23 +163,11 @@
this.selectList = row;
},
- // 鏉℃暟
- sizeChange(val) {
- this.page.pageSize = val;
- this.getList();
- },
-
- // 椤电爜
- currentChange(val) {
- this.page.currentPage = val;
- this.getList();
- },
-
// 琛屽崟閫�
rowClickHandler(row) {
func.rowClickHandler(
row,
- this.$refs.useCrud,
+ this.$refs.crud,
this.lastIndex,
(newIndex) => {
this.lastIndex = newIndex;
--
Gitblit v1.9.3