From 799f206549b25ca0ae8dee94d21b987fc1e6e26c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 19 十一月 2024 15:21:12 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-ui/src/views/clanManager/clan/index.vue |   62 ++++++++++++++++++++++---------
 1 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/ruoyi-ui/src/views/clanManager/clan/index.vue b/ruoyi-ui/src/views/clanManager/clan/index.vue
index 6835b36..e0ed7c6 100644
--- a/ruoyi-ui/src/views/clanManager/clan/index.vue
+++ b/ruoyi-ui/src/views/clanManager/clan/index.vue
@@ -56,13 +56,13 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="roleList" :row-key="getRowId" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="roleList" :row-key="getRowId" @selection-change="handleSelectionChange">
     <el-table-column type="selection" width="55"  align="center" />
 
     <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="100"/>
     <el-table-column label="瀹舵棌鍙峰悕绉�" prop="clanName" sortable :show-overflow-tooltip="true" width="150" />
 
-      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" >
+      <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" >
         <template slot-scope="scope"  v-if="scope.row.id !== 1">
           <el-button
             size="mini"
@@ -71,13 +71,13 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:role:edit']"
           >淇敼</el-button>
-          <el-button
+     <!--     <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
-          >鍒犻櫎</el-button>
+          >鍒犻櫎</el-button> -->
 
         </template>
       </el-table-column>
@@ -203,6 +203,7 @@
       },
       personInfos:[],
       personInfos1:[],
+	  res: false, 
       // 琛ㄥ崟鍙傛暟
       form: {
 		  clanId: undefined,
@@ -221,26 +222,37 @@
       }
     };
   },
+  watch: {
+            'form.clanName': function(newVal, oldVal){
+				// alert(newVal)
+				// alert(oldVal)
+	
+                if(newVal==oldVal||oldVal==undefined)
+					this.res = false; 
+				else
+					this.res = true; 
+            },
+			},
   created() {
     this.getList();
-    this.getAllUser();
+    //this.getAllUser();
   },
   methods: {
     chongf(){
       //alert(2)
-      if(this.form.name!=""){
-      findByFname(this.form.name).then(response => {
-          console.log(response.data)
-       //   alert(response.data!=null)
-          if(response.data!=null)
-          {
-            this.$set(this.form,'name',"")
-            this.$modal.msgSuccess("瀹跺涵鍙峰凡缁忓瓨鍦紒")
-          }
+      // if(this.form.name!=""){
+      // findByFname(this.form.name).then(response => {
+      //     console.log(response.data)
+      //  //   alert(response.data!=null)
+      //     if(response.data!=null)
+      //     {
+      //       this.$set(this.form,'name',"")
+      //       this.$modal.msgSuccess("瀹跺涵鍙峰凡缁忓瓨鍦紒")
+      //     }
          
 
-      });
-      }
+      // });
+      // }
     },
     handleChange(){
       let _this = this;
@@ -372,7 +384,8 @@
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
-      this.dateRange = [];
+      //this.dateRange = [];
+	  this.queryParams.clanName = undefined
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -475,16 +488,29 @@
     /** 鎻愪氦鎸夐挳 */
     submitForm: function() {
       let _this = this
+	  //alert(this.res)
+	  if(this.res == false)
+	  {
+		  this.$modal.msgSuccess("瀹舵棌鍚嶇О娌℃湁淇敼锛屼笉鑳芥彁浜�")
+		  
+		return;
+		}
       this.$refs["form"].validate(valid => {
         if (valid) {
-        //  alert(this.form.id)
+         //alert(this.form.id)
           if (this.form.clanId != undefined) {
           //  alert(this.form.name)
            // this.form.menuIds = this.getMenuAllCheckedKeys();
             updateClan(this.form).then(response => {
+				console.log(response)
+			  this.res = false; 
+			  if(response.msg=="瀹舵棌鍚嶇О涓嶈兘閲嶅锛�")
+				this.$modal.msgSuccess("瀹舵棌鍚嶇О涓嶈兘閲嶅")
+				else{
               this.$modal.msgSuccess("淇敼鎴愬姛");
               this.open = false;
               this.getList();
+			  }
             });
           } else {
      

--
Gitblit v1.9.1