From c7fbf3fcd4a1d686077e20b25af1b0397412d951 Mon Sep 17 00:00:00 2001
From: wxz <wxz@qq.com>
Date: Tue, 30 Jul 2024 10:35:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95-=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8/=E6=96=B0=E5=A2=9E:=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/organization/organization.vue        | 69 +++++++++++--------
 1 file changed, 42 insertions(+), 27 deletions(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 60d7dfbcb..b4e2b6c03 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -100,6 +100,8 @@
                        label="联系人"></el-table-column>
       <el-table-column prop="mobile"
                        label="联系人电话"></el-table-column>
+      <el-table-column prop="sort"
+                       label="排序"></el-table-column>
       <el-table-column label="操作"
                        align="center"
                        class-name="small-padding fixed-width">
@@ -323,6 +325,8 @@
                  width="850"
                  :before-close="handleClose" destroy-on-close>
         <el-form label-width="120px"
+                    ref="addGridForm"
+                    :model="GridForm"
                  :rules="rules">
           <el-form-item label="网格名称"
                         prop="gridName">
@@ -349,6 +353,10 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="排序" prop="sort">
+            <el-input-number v-model="GridForm.sort" :min="1" :max="50" label="排序"></el-input-number>
+          </el-form-item>
+
           <el-form-item label="联系人"
                         prop="GridContacts">
             <el-input v-model.trim="GridForm.contacts"
@@ -1198,6 +1206,7 @@ export default {
         longitude: "", //经度
         latitude: "", //纬度
         centerAddress: "",
+        sort: 1,
       },
       // 新增组织
       agencyForm: {
@@ -1630,33 +1639,39 @@ export default {
     },
     // 添加网格
     async submitGrid () {
-      const url = "/gov/org/grid/addgrid";
-
-      let params = {
-        agencyId: this.GridForm.agencyId,
-        gridName: this.GridForm.gridName,
-        contacts: this.GridForm.contacts,
-        mobile: this.GridForm.mobile,
-        code: this.GridForm.code,
-        manageDistrict: this.GridForm.manageDistrict,
-        gridType: this.GridForm.gridType,
-        latitude: this.lat,
-        longitude: this.lng,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.$message.success("添加成功");
-        this.dialogVisibleGrid = false;
-        this.GridForm = [];
-        this.getAgencyList();
-        this.getDepartmentList();
-        this.getGridList();
-        this.getAgencyStaffListData();
-      } else {
-        this.$message.error(msg);
-      }
+        debugger
+        this.$refs.addGridForm.validate(async (result) => {
+            if (result === true) {
+                const url = "/gov/org/grid/addgrid";
+
+                let params = {
+                    agencyId: this.GridForm.agencyId,
+                    gridName: this.GridForm.gridName,
+                    contacts: this.GridForm.contacts,
+                    mobile: this.GridForm.mobile,
+                    code: this.GridForm.code,
+                    sort: this.GridForm.sort,
+                    manageDistrict: this.GridForm.manageDistrict,
+                    gridType: this.GridForm.gridType,
+                    latitude: this.lat,
+                    longitude: this.lng,
+                };
+
+                const { data, code, msg } = await requestPost(url, params);
+
+                if (code === 0) {
+                    this.$message.success("添加成功");
+                    this.dialogVisibleGrid = false;
+                    this.GridForm = [];
+                    this.getAgencyList();
+                    this.getDepartmentList();
+                    this.getGridList();
+                    this.getAgencyStaffListData();
+                } else {
+                    this.$message.error(msg);
+                }
+            }
+        })
     },
 
     async submitPeo () {