补齐代码

src/views/nobleman/GuildInfo.vue

@@ -65,6 +65,14 @@
       />
       <el-table-column align="center" label="操作" width="300">
         <template v-slot="scope">
+          <el-button
+            @click="ediClick(scope)"
+            class="primary"
+            type="primary"
+            size="default"
+            :disabled="!scope.row.enable"
+            >编辑</el-button
+          >
           <el-button
             @click="
               delDialog = true;
@@ -76,13 +84,6 @@
             :disabled="!scope.row.enable"
             >{{ scope.row.enable ? "移除" : "已解散" }}</el-button
           >
-          <el-button
-            @click="ediClick(scope)"
-            class="primary"
-            type="primary"
-            size="default"
-            >编辑</el-button
-          >
         </template>
       </el-table-column>
     </el-table>
@@ -131,17 +132,6 @@
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
     />
-
-    <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="delDialog" title="提示" width="30%" center>
-      <span> 确定要解散该公会吗?</span>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="delDialog = false">取消</el-button>
-          <el-button type="primary" @click="delClick()"> 确认 </el-button>
-        </span>
-      </template>
-    </el-dialog>
     <!-- 编辑弹窗 -->
     <el-dialog v-model="editDialog" title="编辑" width="28%" center>
       <!-- 会长ID -->
@@ -208,10 +198,20 @@
         </span>
       </template>
     </el-dialog>
+    <!-- 二次确认删除弹窗 -->
+    <el-dialog v-model="delDialog" title="提示" width="30%" center>
+      <span> 确定要解散该公会吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="delDialog = false">取消</el-button>
+          <el-button type="primary" @click="delClick()"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { pageFamily, create, dismiss, update } from "@/api/nobleman/nobleman";
+import { pageFamily, create, update, dismiss } from "@/api/nobleman/nobleman";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
@@ -288,29 +288,6 @@ export default {
         this.getData();
       });
     },
-
-    delClick() {
-      console.log(this.delDialogData.id);
-      var familyId = this.delDialogData.id;
-      dismiss({ familyId }).then((res) => {
-        console.log();
-        if (res.code == 200) {
-          this.getData();
-          ElMessage({
-            showClose: true,
-            message: "解散成功",
-            type: "success",
-          });
-        } else {
-          ElMessage({
-            showClose: true,
-            message: res.message,
-            type: "error",
-          });
-        }
-        this.delDialog = false;
-      });
-    },
     // 编辑按钮
     ediClick(res) {
       var obj = res.row;
@@ -346,6 +323,29 @@ export default {
         this.delDialog = false;
       });
     },
+    // 解散按钮
+    delClick() {
+      console.log(this.delDialogData.id);
+      var familyId = this.delDialogData.id;
+      dismiss({ familyId }).then((res) => {
+        console.log();
+        if (res.code == 200) {
+          this.getData();
+          ElMessage({
+            showClose: true,
+            message: "解散成功",
+            type: "success",
+          });
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.delDialog = false;
+      });
+    },
     // 分页导航
     handleSizeChange() {
       this.getData();