Merge remote-tracking branch 'origin/master' into feature/syp_residentInfo

src/views/modules/partygroup/partygroupofficials-add-or-update.vue

@@ -50,6 +50,9 @@
                      :props="{ checkStrictly: true }"
                      clearable></el-cascader>
       </el-form-item>
+        <el-form-item prop="sort" label="排序">
+            <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" label="排序"></el-input-number>
+        </el-form-item>
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -81,7 +84,8 @@ export default {
         createdTime: '',
         updatedBy: '',
         updatedTime: '',
-        allDeptIdsShow: []
+        allDeptIdsShow: [],
+        sort: ''
       },
       groupOptions: [],
       loading: false,

src/views/modules/partygroup/partygroupofficials.vue

@@ -33,6 +33,7 @@
         <el-table-column prop="duty" label="职责" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="areaResponsibility" label="负责区域" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column prop="partyGroupName" label="所属党群" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button  type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>