From 8e6c58eec222c4bbea613e02703d9af22da72bee Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 15 六月 2023 18:17:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/modeling/status.vue |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/modeling/status.vue b/Source/UBCS-WEB/src/views/modeling/status.vue
index 9d7c465..63e257a 100644
--- a/Source/UBCS-WEB/src/views/modeling/status.vue
+++ b/Source/UBCS-WEB/src/views/modeling/status.vue
@@ -65,19 +65,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: '鎻忚堪',
@@ -149,10 +160,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