Merge remote-tracking branch 'origin/develop' into develop

src/pages/config/pages/mechanismManage/index.vue

@@ -122,7 +122,7 @@
         </el-table>
       </div>
       <loading :loading="Loading">加载中...</loading>
-      <pagination :page="page" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+      <pagination :page="page" :total="total" :pageSize="pageSize" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
     </div>
     <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
     <el-drawer
@@ -278,13 +278,18 @@ export default {
         _this: this,
         loading: 'treeLoading'
       }, res => {
+        console.log(res);
         this.treeData = res.data
         this.id = res.data[0].id
         this.getData()
+      }, e => {
+        console.log(e);
       })
     },
     getData () {
       this.$http.post('SarInstitution/institution/user', {
+        current:this.page,
+        size: this.pageSize,
         institutionId: this.id,
         uname: this.searchForm.uname,
         email: this.searchForm.email
@@ -293,7 +298,7 @@ export default {
         loading: 'Loading'
       }, res => {
         console.log(res.data)
-        res.data.forEach((item) => {
+        res.data.records.forEach((item) => {
           var NameList = ''
           item.positions.forEach((items) => {
             if (NameList.length > 0) {
@@ -303,8 +308,8 @@ export default {
           })
           item.NameList = NameList
         })
-        this.data = res.data
+        this.data = res.data.records
-        this.total = res.data.length
+        this.total = res.data.total
       })
     },
     pageChange (page) {
@@ -312,7 +317,7 @@ export default {
       this.getData()
     },
     pageSizeChange (pageSize) {
-      this.$store.getters.userInfo.configContent = pageSize
+      this.pageSize = pageSize
       this.getData()
     },
   },

src/pages/config/pages/postManage/index.vue

@@ -1,6 +1,30 @@
 <!-- 配置管理 - 岗位管理 -->
 <template>
     <div id="post-manage">
+      <div class="search-area">
+        <div class="left">
+          <el-form ref="" :model="sarPost" inline>
+            <el-form-item label="岗位名称" class="search-item">
+              <el-input v-model="sarPost.name"
+                        placeholder="岗位名称查找"
+                        clearable></el-input>
+            </el-form-item>
+
+            <el-form-item label="" class="search-item btn-box">
+              <el-button class="common-button-primary" type="primary" size="mini" @click="searchPostName"
+                         v-btn-permission="">查询
+              </el-button>
+            </el-form-item>
+            <el-form-item label="" class="search-item btn-box">
+              <el-button class="common-button-default" @click="resetSelect" size="mini"
+                         v-btn-permission="">清空
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="right">
+        </div>
+      </div>
         <div class="action-bar">
             <el-button type="primary"
                        class="common-button-primary add-button"
@@ -65,6 +89,7 @@
                     </template>
                 </el-table-column>
             </el-table>
+          <pagination :page="page" :pageSize="pageSize" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
         </div>
         <loading :loading="Loading">加载中...</loading>
         <el-dialog
@@ -133,7 +158,13 @@
         name: 'PostManage',
         data () {
             return {
-                editId: '',
+              sarPost: {
+                name: "", // 岗位名称
+              },
+              pageSize: this.$store.getters.userInfo.configContent,
+              page: 1,
+              total: 0,
+              editId: '',
                 type: '', // 1为新增 2为编辑
                 dialogTitle: '',
                 nodeList: [],
@@ -160,6 +191,24 @@
             }
         },
         methods: {
+          searchPostName() {
+            this.page = 1;
+            this.getData();
+          }, // 查询
+          pageChange(page) {
+            this.page = page;
+            this.getData();
+          },
+          pageSizeChange(pageSize) {
+            this.pageSize = pageSize;
+            this.getData();
+          },
+          // 分页查询
+          resetSelect() {
+            this.sarPost.name = "";
+            this.getData();
+          }, // 外层清空条件查询
+
             handleCommand (command) {
                 switch (command[1]) {
                     case '删除':
@@ -177,7 +226,10 @@
                     if (res.ok) {
                         this.$message.success('删除成功')
                         this.getData()
+                    } else {
+                      this.$message.warning(res.message)
                     }
+                  this.submitLoading = false
                 })
             },
             editData (row) {
@@ -225,11 +277,15 @@
                 }
             },
             getData () { // 获取岗位数据
-                this.$http.get('sarPosition/position', {}, {
+                this.$http.get('sarPosition/position', {
+                  current: this.page,
+                  pageSize: this.pageSize,
+                  ...this.sarPost,
+                }, {
                     _this: this,
                     loading: 'Loading'
                 }, res=> {
-                    res.data.forEach((item)=>{
+                    res.data.records.forEach((item)=>{
                         var idList = []
                         var NameList = ''
                         item.roles.forEach((items)=>{
@@ -242,7 +298,9 @@
                         item.idList = idList
                         item.NameList = NameList
                     })
-                    this.data = res.data
+                    // this.data = res.data
+                  this.data = res.data.records
+                  this.total = res.data.total
                 })
             },
             addModal () { // 点击新增按钮
@@ -317,7 +375,7 @@
     #post-manage {
         height: 100%;
         .content {
-            height: calc(~'100% - 53px')
+            height: calc(~'100% - 105px - 56px')
         }
         .filter-tree {
             height: calc(~'100% - 50px')

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -433,7 +433,7 @@
                             label="企标编号"
                             prop="standCode"
                             label-width="150px"
-                            class="add-form-item form-item-disabled"
+                            class="add-form-item"
                     >
                         <el-input
                                 v-model="sarBussionessStandEO.standCode"