From c958ebb34b91f17e52bcc9ca5de11e8087affda5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 18 十月 2023 11:17:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/status.vue | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/status.vue b/Source/UBCS-WEB/src/views/modeling/status.vue
index 9d7c465..7a78f42 100644
--- a/Source/UBCS-WEB/src/views/modeling/status.vue
+++ b/Source/UBCS-WEB/src/views/modeling/status.vue
@@ -56,8 +56,11 @@
],
form:{},
option:{
+ height:'auto',
+ calcHeight:20,
headerAlign:'center',
align: 'center',
+ columnBtn:false,
border: true,
index: true,
searchMenuSpan:5,
@@ -65,19 +68,30 @@
stripe:true,
column:[
{
- label: '',
+ label: '閫夋嫨',
prop: 'radio',
- width: 120
+ width: 120,
+ display: false
},
{
label:'鑻辨枃鍚嶇О',
prop: 'id',
- search: true
+ search: true,
+ rules: [{
+ required: true,
+ message: '鑻辨枃鍚嶇О涓嶈兘涓虹┖',
+ trigger: 'blur'
+ }]
},
{
label:'涓枃鍚嶇О',
prop:'name',
search:true,
+ rules: [{
+ required: true,
+ message: '涓枃鍚嶇О涓嶈兘涓虹┖',
+ trigger: 'blur'
+ }]
},
{
label: '鎻忚堪',
@@ -95,8 +109,8 @@
this.selectRowData = row;
},
applyRangeSearch(){
- if (!this.selectRow && this.selectRow != 0){
- console.log(this.selectRow);
+ console.log(this.selectRow);
+ if (!this.selectRow){
this.$message({
type:"warning",
message: "璇峰厛閫夋嫨灞炴��"
@@ -149,10 +163,22 @@
})
},
searchChange(params, done) {
- if (done) done();
- this.params = params;
+ this.loading = true;
this.page.currentPage = 1;
- this.getList();
+ const p = {};
+ if(params.id){
+ p["id_like"] = params.id;
+ }
+ if(params.name){
+ p["name_like"] = params.name
+ }
+ getPage(this.page.currentPage,this.page.pageSize,p).then(res => {
+ const data = res.data.data
+ this.loading = false;
+ this.page.total = data.total;
+ this.data = data.records;
+ done();
+ })
this.$message.success('鎼滅储鎴愬姛')
},
refreshChange() {
--
Gitblit v1.9.3