diff --git a/src/views/modules/custom/gridforceinfo-add-or-update.vue b/src/views/modules/custom/gridforceinfo-add-or-update.vue
index a23b1c9b..4ba35ee9 100755
--- a/src/views/modules/custom/gridforceinfo-add-or-update.vue
+++ b/src/views/modules/custom/gridforceinfo-add-or-update.vue
@@ -17,12 +17,12 @@
           <el-input v-model="dataForm.identityNo" placeholder="身份证号码" style="width: 300px;"></el-input>
       </el-form-item>
       <template v-if="!dataForm.id">
-        <el-form-item label="所属社区">
+        <el-form-item label="所属社区" prop="deptId">
           <el-cascader v-model="dataForm.deptId" :props="{ checkStrictly: true }" :options="options" clearable></el-cascader>
         </el-form-item>
       </template>
       <template v-if="dataForm.id">
-        <el-form-item label="所属社区">
+        <el-form-item label="所属社区" prop="deptId">
           <el-cascader v-model="dataForm.deptId" :options="options" :props="{ checkStrictly: true }" clearable></el-cascader>
         </el-form-item>
       </template>
@@ -50,8 +50,12 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item prop="sort" :label="$t('dict.sort')">
+        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0"
+                  :label="$t('dict.sort')" style="width:220px"></el-input-number>
+      </el-form-item>
       <el-form-item label="备注" prop="remark">
-          <el-input v-model="dataForm.remark" placeholder="备注" style="width: 300px;"></el-input>
+          <el-input type="textarea" aria-colspan="2" v-model="dataForm.remark" placeholder="备注" style="width: 80%"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
@@ -77,6 +81,7 @@ export default {
         faceImg: '',
         workUnit: '',
         dutyCategoryId: '',
+        sort: '',
         remark: '',
         deptId: '',
         allDeptIds: [],
@@ -109,6 +114,9 @@ export default {
         dutyCategoryId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        sort: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         deptId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
diff --git a/src/views/modules/custom/gridforceinfo.vue b/src/views/modules/custom/gridforceinfo.vue
index 7ac03dba..c608a0d7 100644
--- a/src/views/modules/custom/gridforceinfo.vue
+++ b/src/views/modules/custom/gridforceinfo.vue
@@ -92,34 +92,19 @@ export default {
   watch: {
     'ids': function (val) {
       if (val.length === 0 || val.length === 1) {
-        this.dataForm.streetId = val[0]
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-        this.dataForm.deptId = ''
+        this.dataForm.deptId = val[0]
       }
       if (val.length === 2) {
-        this.dataForm.streetId = ''
-        this.dataForm.communityId = val[1]
-        this.dataForm.gridId = ''
-        this.dataForm.deptId = ''
+        this.dataForm.deptId = val[1]
       }
       if (val.length === 3) {
-        this.dataForm.streetId = ''
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = val[2]
-        this.dataForm.deptId = ''
+        this.dataForm.deptId = val[2]
       }
       if (val.length === 4) {
-        this.dataForm.streetId = ''
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-        this.dataForm.deptId = val[val.length - 2]
+        this.dataForm.deptId = val[3]
       }
       if (val.length === 5) {
-        this.dataForm.streetId = ''
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-        this.dataForm.deptId = val[val.length - 1]
+        this.dataForm.deptId = val[4]
       }
     }
   },