From 699249fb4085261104d1756150f403305716b472 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 01 十一月 2024 17:30:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue | 59 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
index 41fe5ec..797cd39 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
@@ -2,10 +2,10 @@
<basic-container>
<avue-crud
ref="useCrud"
- :table-loading="loading"
:data="data"
:option="option"
:page.sync="page"
+ :table-loading="loading"
@selection-change="selectChange"
@row-click="rowClickHandler"
@refresh-change="handleRefresh"
@@ -21,8 +21,7 @@
</el-button>
<el-button icon="el-icon-upload2" plain size="small" type="primary" @click="uploadClickHandler">瀵煎叆
</el-button>
- <el-button icon="el-icon-check" plain size="small" type="primary"
- @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
+ <el-button icon="el-icon-view" plain size="small" type="primary" @click="checkViewClickHandler">鏌ョ湅浣跨敤鑼冨洿
</el-button>
</template>
@@ -32,8 +31,6 @@
<el-button icon="el-icon-delete" plain size="small" type="text" @click="delRowClickHandler(row)">鍒犻櫎
</el-button>
</template>
-
-
</avue-crud>
<!-- 鏂板 淇敼 -->
@@ -43,10 +40,10 @@
:visible.sync="visible"
append-to-body="true"
class="avue-dialog"
- width="40%"
+ width="500px"
@close="visibleCloseHandler"
>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px" size="small">
<el-row>
<el-col :span="24">
<el-form-item label="鍚嶇О锛�" prop="id">
@@ -66,8 +63,8 @@
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button @click="visibleCloseHandler">鍙� 娑�</el-button>
<el-button type="primary" @click="addSaveHandler">纭� 瀹�</el-button>
+ <el-button @click="visibleCloseHandler">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -107,7 +104,7 @@
name: "index",
data() {
return {
- loading:false,
+ loading: false,
data: [],
option: {
...basicOption,
@@ -143,6 +140,7 @@
searchMenuSpan: 8,
refreshBtn: false,
selection: false,
+ header:false,
column: [
{
label: '鍚嶇О',
@@ -178,8 +176,8 @@
]
},
visible: false,
- selectList:[],
- lastIndex:null,
+ selectList: [],
+ lastIndex: null,
page: {
currentPage: 1,
pageSize: 15,
@@ -205,12 +203,12 @@
},
// 琛ㄦ牸鍒锋柊
- handleRefresh(){
+ handleRefresh() {
this.getTreeList();
},
// 琛ㄦ牸澶氶��
- selectChange(row){
+ selectChange(row) {
this.selectList = row;
},
@@ -232,8 +230,12 @@
row,
this.$refs.useCrud,
this.lastIndex,
- (newIndex) => { this.lastIndex = newIndex; },
- () => { this.selectList = []; }
+ (newIndex) => {
+ this.lastIndex = newIndex;
+ },
+ () => {
+ this.selectList = [];
+ }
);
},
@@ -277,7 +279,7 @@
},
// 琛屽崟涓垹闄�
- delRowClickHandler(row){
+ delRowClickHandler(row) {
this.$confirm('鎮ㄧ‘瀹氳鍒犻櫎鎵�閫夋嫨鐨勬暟鎹悧锛�', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -315,18 +317,23 @@
// 鍒涘缓鎴栫紪杈戜繚瀛�
addSaveHandler() {
const saveFunction = this.dialogTitle === 'add' ? addSave : editSave;
-
- saveFunction(this.form).then(res => {
- if (res.data.code === 200) {
- this.$message.success(res.data.obj);
- this.loading = true;
- this.getTreeList();
- this.visible = false;
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ saveFunction(this.form).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.loading = true;
+ this.getTreeList();
+ this.visible = false;
+ } else {
+ this.$message.error(res.data.obj);
+ }
+ }).catch(error => {
+ this.$message.error(error);
+ });
} else {
- this.$message.error(res.data.obj);
+ return false;
}
- }).catch(error => {
- this.$message.error(error);
});
},
--
Gitblit v1.10.0