Merge branch 'dev' into dongming

src/views/modules/communityParty/communityNews/add.vue

@@ -41,8 +41,8 @@
           <el-switch v-model="formData.top" :active-value="1" :inactive-value="0"
             @change="handleOnlineRegistration"></el-switch>
         </el-form-item>
-        <el-form-item label="显示排序" style="display: block" prop="top" label-width="150px">
-          <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+        <el-form-item label="显示排序" style="display: block" prop="sort" label-width="150px">
+          <el-input-number v-model="formData.sort" @change="handleChange" :min="1" :max="100" label="描述文字"></el-input-number>
         </el-form-item>
         <el-form-item label="消息推送" label-width="150px" prop="sendMsg">
           <el-checkbox v-model="formData.sendMsg" @change="checkbox1" label="是否通过公众号推送给社区居民"></el-checkbox>
@@ -103,7 +103,7 @@ export default {
           searchOptions: [],
           searchValue: '',
           resultList: [],
-          num: 0,
+          sort: 1,
           loading: false,
           timeRange: [],
           online: false,
@@ -113,6 +113,7 @@ export default {
           keyWords: '',
           activityId: '',
           formData: {
+            sort: 1,
             title: "",//标题
             content: "",//内容
             tagId: "communityNews",//标签id

src/views/modules/communityParty/communityNews/index.vue

@@ -74,10 +74,7 @@
             <span>{{ scope.row.top === 0 ? '否' : '是' }}</span>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="top" header-align="center" align="center" label="排序">
-          <template slot-scope="scope">
-            <span>{{ scope.row.top === 0 ? '否' : '是' }}</span>
-          </template>
+        <el-table-column :show-overflow-tooltip="true" prop="sort" header-align="center" align="center" label="排序">
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="status" header-align="center" align="center" label="状态">
           <template slot-scope="scope">

src/views/modules/communityParty/employmentService/add.vue

@@ -41,8 +41,8 @@
           <el-switch v-model="formData.top" :active-value="1" :inactive-value="0"
             @change="handleOnlineRegistration"></el-switch>
         </el-form-item>
-        <el-form-item label="显示排序" style="display: block" prop="top" label-width="150px">
-          <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+        <el-form-item label="显示排序" style="display: block" prop="sort" label-width="150px">
+          <el-input-number v-model="formData.sort" @change="handleChange" :min="1" :max="1000" label="描述文字"></el-input-number>
         </el-form-item>
         <el-form-item label="消息推送" label-width="150px" prop="sendMsg">
           <el-checkbox v-model="formData.sendMsg" @change="checkbox1" label="是否通过公众号推送给社区居民"></el-checkbox>
@@ -103,7 +103,7 @@ export default {
           searchOptions: [],
           searchValue: '',
           resultList: [],
-          num: 0,
+          sort: 1,
           loading: false,
           timeRange: [],
           online: false,
@@ -113,6 +113,7 @@ export default {
           keyWords: '',
           activityId: '',
           formData: {
+            sort: 1,
             title: "",//标题
             content: "",//内容
             tagId: "employmentService",//标签id

src/views/modules/communityParty/employmentService/index.vue

@@ -74,10 +74,7 @@
             <span>{{ scope.row.top === 0 ? '否' : '是' }}</span>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="top" header-align="center" align="center" label="排序">
-          <template slot-scope="scope">
-            <span>{{ scope.row.top === 0 ? '否' : '是' }}</span>
-          </template>
+        <el-table-column :show-overflow-tooltip="true" prop="sort" header-align="center" align="center" label="排序">
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="status" header-align="center" align="center" label="状态">
           <template slot-scope="scope">

src/views/modules/communityParty/noticeAnnouncement/add.vue

@@ -41,8 +41,8 @@
           <el-switch v-model="formData.top" :active-value="1" :inactive-value="0"
             @change="handleOnlineRegistration"></el-switch>
         </el-form-item>
-        <el-form-item label="显示排序" style="display: block" prop="top" label-width="150px">
-          <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+        <el-form-item label="显示排序" style="display: block" prop="sort" label-width="150px">
+          <el-input-number v-model="formData.sort" @change="handleChange" :min="1" :max="1000" label="描述文字"></el-input-number>
         </el-form-item>
         <el-form-item label="消息推送" label-width="150px" prop="sendMsg">
           <el-checkbox v-model="formData.sendMsg" @change="checkbox1" label="是否通过公众号推送给社区居民"></el-checkbox>
@@ -103,7 +103,7 @@ export default {
           searchOptions: [],
           searchValue: '',
           resultList: [],
-          num: 0,
+          sort: 1,
           loading: false,
           timeRange: [],
           online: false,
@@ -119,6 +119,7 @@ export default {
             coverPic: "",//封面图
             releaseTime: "",//发布时间
             sendMsg: false,//是否推送
+            sort: 1,
             top: 1,//是否置顶
             status: 0 //状态
         },

src/views/modules/communityParty/noticeAnnouncement/index.vue

@@ -74,10 +74,7 @@
             <span>{{ scope.row.top === 0 ? '否' : '是' }}</span>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="top" header-align="center" align="center" label="排序">
-          <template slot-scope="scope">
-            <span>{{ scope.row.top === 0 ? '否' : '是' }}</span>
-          </template>
+        <el-table-column :show-overflow-tooltip="true" prop="sort" header-align="center" align="center" label="排序">
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="status" header-align="center" align="center" label="状态">
           <template slot-scope="scope">

src/views/modules/communityParty/policeCivilianInteraction/add.vue

@@ -41,8 +41,8 @@
           <el-switch v-model="formData.top" :active-value="1" :inactive-value="0"
             @change="handleOnlineRegistration"></el-switch>
         </el-form-item>
-        <el-form-item label="显示排序" style="display: block" prop="top" label-width="150px">
-          <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+        <el-form-item label="显示排序" style="display: block" prop="sort" label-width="150px">
+          <el-input-number v-model="formData.sort" @change="handleChange" :min="1" :max="1000" label="描述文字"></el-input-number>
         </el-form-item>
         <el-form-item label="消息推送" label-width="150px" prop="sendMsg">
           <el-checkbox v-model="formData.sendMsg" @change="checkbox1" label="是否通过公众号推送给社区居民"></el-checkbox>
@@ -103,7 +103,7 @@ export default {
           searchOptions: [],
           searchValue: '',
           resultList: [],
-          num: 0,
+          sort: 1,
           loading: false,
           timeRange: [],
           online: false,
@@ -120,6 +120,7 @@ export default {
             releaseTime: "",//发布时间
             sendMsg: false,//是否推送
             top: 1,//是否置顶
+            sort: 1,
             status: 0 //状态
         },
           serviceList: [],

src/views/modules/communityParty/policeCivilianInteraction/index.vue

@@ -74,10 +74,7 @@
             <span>{{ scope.row.top === 0 ? '否' : '是' }}</span>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="top" header-align="center" align="center" label="排序">
-          <template slot-scope="scope">
-            <span>{{ scope.row.top === 0 ? '否' : '是' }}</span>
-          </template>
+        <el-table-column :show-overflow-tooltip="true" prop="sort" header-align="center" align="center" label="排序">
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="status" header-align="center" align="center" label="状态">
           <template slot-scope="scope">

src/views/modules/communityParty/threeAffairsDisclosure/add.vue

@@ -41,8 +41,8 @@
           <el-switch v-model="formData.top" :active-value="1" :inactive-value="0"
             @change="handleOnlineRegistration"></el-switch>
         </el-form-item>
-        <el-form-item label="显示排序" style="display: block" prop="top" label-width="150px">
-          <el-input-number v-model="num" @change="handleChange" :min="1" :max="10" label="描述文字"></el-input-number>
+        <el-form-item label="显示排序" style="display: block" prop="sort" label-width="150px">
+          <el-input-number v-model="formData.sort" @change="handleChange" :min="1" :max="1000" label="描述文字"></el-input-number>
         </el-form-item>
         <el-form-item label="消息推送" label-width="150px" prop="sendMsg">
           <el-checkbox v-model="formData.sendMsg" @change="checkbox1" label="是否通过公众号推送给社区居民"></el-checkbox>
@@ -103,7 +103,7 @@ export default {
           searchOptions: [],
           searchValue: '',
           resultList: [],
-          num: 0,
+          sort: 1,
           loading: false,
           timeRange: [],
           online: false,
@@ -120,6 +120,7 @@ export default {
             releaseTime: "",//发布时间
             sendMsg: false,//是否推送
             top: 1,//是否置顶
+            sort: 1,
             status: 0 //状态
         },
           serviceList: [],

src/views/modules/communityParty/threeAffairsDisclosure/index.vue

@@ -74,10 +74,7 @@
             <span>{{ scope.row.top === 0 ? '否' : '是' }}</span>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="top" header-align="center" align="center" label="排序">
-          <template slot-scope="scope">
-            <span>{{ scope.row.top === 0 ? '否' : '是' }}</span>
-          </template>
+        <el-table-column :show-overflow-tooltip="true" prop="sort" header-align="center" align="center" label="排序">
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="status" header-align="center" align="center" label="状态">
           <template slot-scope="scope">
@@ -147,8 +144,6 @@
           unitList:[],
           loading: false,
           total: 0,
-          pageSize: 10,
-          pageNo: 0,
           tableLoading: false,
 
           typeName:'',