Merge branch 'mail_list_dev'

src/views/modules/base/organization/organization.vue

@@ -794,6 +794,11 @@
           </el-select>
         </el-form-item>
 
+        <!-- 排序 -->
+        <el-form-item label="排序">
+          <el-input-number v-model="modifyGridFrom.gridSort" :min="1" label="排序"></el-input-number>
+        </el-form-item>
+
         <el-form-item label="负责人">
           <el-input v-model="modifyGridFrom.contacts"
                     placeholder="请输入负责人名字"></el-input>
@@ -1009,7 +1014,9 @@ export default {
         agencyId: '',
         gridType: '',
         manageDistrict: '',
-        griId: ''
+        griId: '',
+        // 排序
+        gridSort: 0,
       },
       judgeOrgInfoLevel: [],
       keyWords: '',
@@ -1597,6 +1604,7 @@ export default {
         this.modifyGridFrom.gridType = '',
         this.modifyGridFrom.manageDistrict = '',
         this.modifyGridFrom.griId = ''
+        
     },
     // 社区新增弹框取消按钮
     cancel () {
@@ -2355,6 +2363,7 @@ export default {
         this.modifyGridFrom.gridType = data.gridType
         this.modifyGridFrom.manageDistrict = data.manageDistrict
         this.modifyGridFrom.griId = data.grid
+        this.modifyGridFrom.gridSort = data.gridSort
       } else {
         this.$message.error(msg)
       }
@@ -2424,7 +2433,8 @@ export default {
         contacts: this.modifyGridFrom.contacts,
         mobile: this.modifyGridFrom.mobile,
         code: this.modifyGridFrom.code,
-        gridType: this.modifyGridFrom.gridType
+        gridType: this.modifyGridFrom.gridType,
+        sort:this.modifyGridFrom.gridSort
       }
 
       const { data, code, msg } = await requestPost(url, params)