优化页面

src/router/notKeepAliveList.js

@@ -38,4 +38,11 @@ export default [
   '/business/afterSchoolManager', // 课外训练
   '/business/afterSchoolDetail', // 课外训练详情
   '/insideSetting/staffManager', // 员工管理
+  '/insideSetting/branchManager', // 合作单位
+  '/insideSetting/addressManager', // 教学点管理
+  '/insideSetting/branchSetting', // 分部设置
+  '/insideSetting/chargeManager', // 收费管理
+  '/insideSetting/editionList', // 版本控制
+  '/insideSetting/adapayManager', // 汇仁账号管理
+  '/insideSetting/adapayOperation', //
 ]

src/views/adapayAccount/form.vue

@@ -242,9 +242,6 @@ export default {
   mounted () {
     this.__init()
   },
-  activated () {
-    this.__init()
-  },
   methods: {
     __init () {
       const query = this.$route.query

src/views/adapayAccount/index.vue

@@ -10,15 +10,16 @@
            @click="onOperationAccount('create')">创建账号</div>
     </div>
     <div class="m-core">
-      <el-form :inline="true"
+      <save-form :inline="true"
                class="searchForm"
-               v-model.trim="searchForm">
+               @submit="search"
+               :model="searchForm">
         <el-form-item>
-          <el-input v-model.trim="searchForm.memberId"
+          <el-input v-model.trim="searchForm.memberId" clearable
                     placeholder="请输入商户号"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-input v-model.trim="searchForm.name"
+          <el-input v-model.trim="searchForm.name" clearable
                     placeholder="请输入公司名称"></el-input>
         </el-form-item>
         <el-form-item>
@@ -35,10 +36,9 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getList"
-                     type="danger">搜索</el-button>
+          <el-button native-type="submit" type="danger">搜索</el-button>
         </el-form-item>
-      </el-form>
+      </save-form>
       <div class="tableWrap">
         <el-table :data="tableList"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
@@ -89,7 +89,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="rules.total"
+        <pagination sync :total.sync="rules.total"
                     :page.sync="rules.page"
                     :limit.sync="rules.limit"
                     :page-sizes="rules.page_size"
@@ -172,9 +172,6 @@ export default {
   mounted () {
     this.getList()
   },
-  activated () {
-    this.getList()
-  },
   methods: {
     getList () {
       try {
@@ -191,16 +188,26 @@ export default {
         //
       }
     },
+    search() {
+      this.rules.page = 1
+      this.getList()
+    },
     onFormClose (formName) {
       this.$refs[formName].resetFields()
     },
     onOperationAccount (type, row) {
+      let tagTitle = '创建'
+      if(type == 'update') {
+        tagTitle = '修改'
+      }
       this.$router.push({
         path: '/insideSetting/adapayOperation',
         query: {
           type: type,
           row: JSON.stringify(row)
         }
+      }, (route) => {
+        route.meta.title = tagTitle + '汇会账号'
       })
     },
     onUpdateAccount (row) {

src/views/categroyManager/insideSetting/addressManager.vue

@@ -7,14 +7,14 @@
       <div @click="openTeaching('create')"
            v-permission="'school/add'"
            class='newBand'>新建</div>
-      <el-form :inline="true"
+      <save-form :inline="true"
                class="searchForm"
-               @submit.native.prevent
+               @submit="search"
                v-model.trim="searchForm">
         <el-form-item>
           <el-input type="text"
+                    clearable
                     v-model.trim="searchForm.search"
-                    @keyup.enter.native='search'
                     placeholder="教学点名称"></el-input>
         </el-form-item>
         <el-form-item>
@@ -22,17 +22,16 @@
                      clearable
                      filterable
                      placeholder="请选择分部">
-            <el-option v-for="item in branchList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value"></el-option>
+            <el-option v-for="item in selects.branchs"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="search"
-                     type="danger">搜索</el-button>
+          <el-button native-type="submit" type="danger">搜索</el-button>
         </el-form-item>
-      </el-form>
+      </save-form>
       <!-- 列表 -->
       <div class="tableWrap">
         <el-table :data='tableList'
@@ -104,7 +103,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="pageInfo.total"
+        <pagination sync :total.sync="pageInfo.total"
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
                     :page-sizes="pageInfo.page_size"
@@ -130,6 +129,7 @@
                       :label-width="formLabelWidth">
           <template v-if="formActionTitle == 'update'">
             <el-select v-model.trim="form.source"
+                       style="width: 100% !important;"
                        filterable
                        clearable
                        disabled>
@@ -142,6 +142,7 @@
           <template v-else>
             <el-select v-model.trim="form.source"
                        filterable
+                       style="width: 100% !important;"
                        clearable>
               <el-option label="合作单位"
                          value="1"></el-option>
@@ -156,6 +157,7 @@
                       :label-width="formLabelWidth">
           <el-select v-model.trim="form.cooperationOrganId"
                      filterable
+                     style="width: 100% !important;"
                      clearable
                      @change="onCooperationChange">
             <el-option v-for="item in cooperationList"
@@ -177,11 +179,12 @@
                       :label-width="formLabelWidth">
           <el-select v-model.trim="form.organId"
                      clearable
+                     style="width: 100% !important;"
                      filterable>
-            <el-option v-for="item in branchList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value"></el-option>
+            <el-option v-for="item in selects.branchs"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item prop="address"
@@ -290,7 +293,7 @@ export default {
         create: '添加教学点',
         update: '修改教学点'
       },
-      teachingStatus: false, // 添加教学点 
+      teachingStatus: false, // 添加教学点
       formLabelWidth: '100px',
       addressDetail: {},
       form: {
@@ -326,7 +329,6 @@ export default {
         autoFitView: true // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
       },
       cooperationList: [], // 合作单位列表
-      branchList: [],
       searchValue: '测试'
     }
   },
@@ -464,40 +466,29 @@ export default {
         }
       })
     },
-    getBreachList () { // 获取分部列表
+    async getBreachList () { // 获取分部列表
       // 获取当前用户分部
-      getEmployeeOrgan().then(res => {
+      await this.$store.dispatch('setBranchs')
+
+      let branchIds = []
+      this.selects.branchs.forEach(item => {
+        branchIds.push(item.id)
+      })
+      await queryByOrganId({
+        organId: branchIds.join(',')
+      }).then(res => {
         if (res.code == 200) {
-          let branchIds = []
-          res.data.forEach(item => {
-            branchIds.push(item.id)
-            this.branchList.push({
-              label: item.name,
-              value: item.id
+          // 判断是否有数据
+          if (!res.data && res.data.length <= 0) return
+          res.data.forEach(r => {
+            this.cooperationList.push({
+              value: r.id,
+              organId: r.organId,
+              label: r.name
             })
           })
-
-          queryByOrganId({
-            organId: branchIds.join(',')
-          }).then(res => {
-            if (res.code == 200) {
-              // 判断是否有数据
-              if (!res.data && res.data.length <= 0) return
-              res.data.forEach(r => {
-                this.cooperationList.push({
-                  value: r.id,
-                  organId: r.organId,
-                  label: r.name
-                })
-              })
-            }
-          })
-
         }
       })
-
-
-
     },
     openTeaching (type, row) {
       // 重置数据

src/views/categroyManager/insideSetting/branchManager.vue

@@ -5,11 +5,13 @@
     </h2>
     <div class="m-core">
       <!-- 搜索类型 -->
-      <el-form :inline="true"
+      <save-form :inline="true"
                class="searchForm"
-               v-model.trim="searchForm">
+               @submit="search"
+               @reset="onReSet"
+               :model="searchForm">
         <el-form-item>
-          <el-input v-model="searchForm.search"
+          <el-input v-model="searchForm.search" clearable
                     placeholder="请输入合作单位名称"></el-input>
         </el-form-item>
         <el-form-item>
@@ -17,10 +19,10 @@
                      placeholder="请选择分部"
                      filterable
                      clearable>
-            <el-option v-for="item in userBranchList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value"></el-option>
+            <el-option v-for="item in selects.branchs"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -35,16 +37,14 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="search"
-                     type="danger">搜索</el-button>
-          <el-button @click="onReSet"
-                     type="primary">重置</el-button>
+          <el-button native-type="submit" type="danger">搜索</el-button>
+          <el-button native-type="reset" type="primary">重置</el-button>
           <!-- export/isSettlementCourseSalarys  -->
           <el-button @click="onExport"
                      v-permission="'export/cooperationOrgan'"
                      type="primary">导出</el-button>
         </el-form-item>
-      </el-form>
+      </save-form>
       <div @click="openTeaching('create')"
            v-permission="'cooperationOrgan/add'"
            class='newBand'>新建</div>
@@ -115,7 +115,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="pageInfo.total"
+        <pagination sync :total.sync="pageInfo.total"
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
                     :page-sizes="pageInfo.page_size"
@@ -142,10 +142,10 @@
           <el-select v-model.trim="form.organId"
                      filterable
                      clearable>
-            <el-option v-for="item in userBranchList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value"></el-option>
+            <el-option v-for="item in selects.branchs"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="状态"
@@ -201,7 +201,6 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import { cooperationOrganAdd, cooperationOrganUpdate, cooperationOrganDel, queryPage } from '@/api/systemManage'
-import { getEmployeeOrgan } from '@/api/buildTeam'
 import cleanDeep from 'clean-deep'
 import store from '@/store'
 import { isvalidPhone } from '@/utils/validate'
@@ -230,7 +229,6 @@ export default {
       },
       searchLsit: [],
       tableList: [],
-      userBranchList: [], // 用户当前分部列表
       pageInfo: {
         // 分页规则
         limit: 10, // 限制显示条数
@@ -238,7 +236,7 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      teachingStatus: false, // 添加教学点 
+      teachingStatus: false, // 添加教学点
       formActionTitle: 'create',
       formTitle: {
         create: '添加合作单位',
@@ -270,16 +268,7 @@ export default {
     this.getList() // 获取列表数据
 
     // 获取当前用户分部
-    getEmployeeOrgan().then(res => {
-      if (res.code == 200) {
-        res.data.forEach(item => {
-          this.userBranchList.push({
-            label: item.name,
-            value: item.id
-          })
-        })
-      }
-    })
+    this.$store.dispatch('setBranchs')
   },
   methods: {
     onDelete (rows) {

src/views/categroyManager/insideSetting/staffManager.vue

@@ -8,17 +8,19 @@
            v-permission="'employee/add'"
            class='newBand'>添加</div>
 
-      <el-form :inline="true"
+      <save-form :inline="true"
                class="searchForm"
-               @submit.native.prevent
-               v-model.trim="searchForm">
-        <el-form-item>
-          <el-input type="text"
+               ref="searchForm"
+               @submit="search"
+               @reset="reset"
+               :model="searchForm">
+        <el-form-item prop="search">
+          <el-input type="text" clearable
                     v-model.trim="searchForm.search"
                     @keyup.enter.native='search'
                     placeholder="姓名或手机号"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="jobNature">
           <el-select v-model.trim="searchForm.jobNature"
                      clearable
                      filterable
@@ -31,7 +33,7 @@
                        value="TEMPORARY"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="organId">
           <el-select v-model.trim="searchForm.organId"
                      clearable
                      filterable
@@ -42,7 +44,7 @@
                        :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="roleId">
           <!--   multiple -->
           <el-select v-model.trim="searchForm.roleId"
                      clearable
@@ -56,10 +58,10 @@
           <!-- collapse-tags -->
         </el-form-item>
         <el-form-item>
-          <el-button @click="search"
-                     type="danger">搜索</el-button>
+          <el-button native-type="submit" type="danger">搜索</el-button>
+          <el-button native-type="reset" type="primary">重置</el-button>
         </el-form-item>
-      </el-form>
+      </save-form>
 
       <!-- 列表 -->
       <div class="tableWrap">
@@ -68,20 +70,28 @@
           <el-table-column align='center'
                            prop="id"
                            label="员工编号">
+            <template slot-scope="scope">
+              <copy-text>{{ scope.row.id }}</copy-text>
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            prop="realName"
                            label="姓名">
+            <template slot-scope="scope">
+              <copy-text>{{ scope.row.realName }}</copy-text>
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            prop="phone"
                            label="手机号">
+            <template slot-scope="scope">
+              <copy-text>{{ scope.row.phone }}</copy-text>
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            label="角色分类">
             <template slot-scope="scope">
-              <span style="max-height: 68px;display: block;"
-                    :title="scope.row.roleNames | joinArray(',')">{{ scope.row.roleNames | joinArray(',') }}</span>
+              <tooltip :content="scope.row.roleNames | joinArray(',')"></tooltip>
             </template>
           </el-table-column>
           <el-table-column align='center'
@@ -93,16 +103,9 @@
           </el-table-column>
           <el-table-column align='center'
                            label="所属部门">
-            <span style="display: inline-block;width: 100%;overflow: hidden;white-space: nowrap; text-overflow: ellipsis;"
-                  slot-scope="scope">
-              <el-popover placement="top-start"
-                          width="200"
-                          trigger="hover"
-                          :content="scope.row.organNameList | joinArray(',')">
-                <span slot="reference">{{ scope.row.organNameList | joinArray(',') }}</span>
-              </el-popover>
-
-            </span>
+            <template slot-scope="scope">
+              <tooltip :content="scope.row.organNameList | joinArray(',')"></tooltip>
+            </template>
           </el-table-column>
           <el-table-column align='center'
                            label="状态"
@@ -139,7 +142,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="pageInfo.total"
+        <pagination sync :total.sync="pageInfo.total"
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
                     :page-sizes="pageInfo.page_size"
@@ -157,13 +160,14 @@
         <el-form-item label="姓名"
                       prop="realName"
                       :label-width="formLabelWidth">
-          <el-input v-model.trim="form.realName"
+          <el-input v-model.trim="form.realName" placeholder="请输入姓名"
                     autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="性别"
                       prop="gender"
                       :label-width="formLabelWidth">
           <el-select v-model.trim="form.gender"
+                     placeholder="请选择性别"
                      clearable
                      filterable>
             <el-option label="男"
@@ -175,22 +179,23 @@
         <el-form-item label="手机号"
                       prop="phone"
                       :label-width="formLabelWidth">
-          <el-input v-model.trim.number="form.phone"
+          <el-input v-model.trim.number="form.phone" placeholder="请输入手机号"
                     autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="角色分类"
                       prop="roleIds"
                       :label-width="formLabelWidth">
           <el-select v-model.trim="form.roleIds"
+                     placeholder="请选择角色分类"
                      clearable
                      filterable
+                     collapse-tags
                      multiple>
             <el-option v-for="item in roleList"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value"></el-option>
           </el-select>
-          <!-- collapse-tags -->
         </el-form-item>
         <el-form-item label="所属部门"
                       prop="organIdLists"
@@ -198,6 +203,7 @@
           <el-select style="width: calc(100% - 75px) !important;"
                      filterable
                      clearable
+                      placeholder="请选择部门"
                      collapse-tags
                      v-model.trim="form.organIdLists"
                      multiple>
@@ -213,6 +219,7 @@
                       :label-width="formLabelWidth">
           <el-select v-model.trim="form.jobNature"
                      clearable
+                     placeholder="请选择工作类型"
                      filterable>
             <el-option label="全职"
                        value="FULL_TIME"></el-option>
@@ -231,19 +238,19 @@
                             firstDayOfWeek:1
                           }"
                           value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择日期">
+                          placeholder="选择入职日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="通讯地址"
                       prop="contactAddress"
                       :label-width="formLabelWidth">
-          <el-input v-model.trim="form.contactAddress"
+          <el-input v-model.trim="form.contactAddress" placeholder="请输入通讯地址"
                     autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="邮政编码"
                       prop="postalCode"
                       :label-width="formLabelWidth">
-          <el-input v-model.trim="form.postalCode"
+          <el-input v-model.trim="form.postalCode" placeholder="请输入邮政编码"
                     autocomplete="off"></el-input>
         </el-form-item>
       </el-form>
@@ -294,9 +301,9 @@
 <script>
 import pagination from '@/components/Pagination/index'
 import { queryEmployByOrganId, employeeOperate, getUserRole, employeeAdd, employeeUpdate, hasCourseGroupRelation, updateEducationTeacherId } from '@/api/systemManage'
-import { branchQueryPage, findEducationTeacher } from '@/api/specialSetting'
+import { findEducationTeacher } from '@/api/specialSetting'
 import { findEducationUsers } from '@/api/buildTeam'
-import store from '@/store'
+import Tooltip from '@/components/Tooltip/index'
 import { isvalidPhone } from '@/utils/validate'
 let validPhone = (rule, value, callback) => {
   if (!value) {
@@ -309,7 +316,7 @@ let validPhone = (rule, value, callback) => {
 }
 export default {
   name: 'staffManager',
-  components: { pagination },
+  components: { pagination, Tooltip },
   data () {
     return {
       tableList: [],
@@ -367,17 +374,13 @@ export default {
     this.getList()
     this.getRoleList()
   },
-  activated () {
-    this.getList()
-    this.getRoleList()
-  },
   methods: {
 
     onBranchCheckAll () {
       this.form.organIdLists = []
 
       this.selects.branchs.forEach(item => {
-        this.form.organIdLists.push(item.value)
+        this.form.organIdLists.push(item.id)
       })
     },
     onRoleSubmit (formName) {
@@ -414,6 +417,10 @@ export default {
       this.pageInfo.page = 1
       this.getList()
     },
+    reset() {
+      this.$refs.searchForm.resetFields()
+      this.search()
+    },
     getList () {
       let searchForm = this.searchForm
       let params = {
@@ -445,7 +452,6 @@ export default {
         }
       })
       this.$store.dispatch('setBranchs')
-
     },
     roleOperation (type, data) {
       this.formActionTitle = type

src/views/chargeManager/index.vue

@@ -6,17 +6,19 @@
     </h2>
     <div class="m-core">
       <!-- navMenu -->
-      <el-tabs v-model.trim="activeIndex" type="card" @tab-click="handleClick">
-        <el-tab-pane label="分润" name="0" v-if="permissionList.share">
-            <three v-if="activeIndex == 0" />
-        </el-tab-pane>
-        <el-tab-pane label="比例" name="1" v-if="permissionList.scalc">
-            <one v-if="activeIndex == 1" />
-        </el-tab-pane>
-        <el-tab-pane label="金额" name="2" v-if="permissionList.money">
-            <two v-if="activeIndex == 2" />
-        </el-tab-pane>
-      </el-tabs>
+      <location-hash v-model="activeIndex" @change="handleClick">
+        <el-tabs v-model.trim="activeIndex" type="card" @tab-click="handleClick">
+          <el-tab-pane lazy label="分润" name="0" v-if="permissionList.share">
+              <three v-if="activeIndex == 0" />
+          </el-tab-pane>
+          <el-tab-pane lazy label="比例" name="1" v-if="permissionList.scalc">
+              <one v-if="activeIndex == 1" />
+          </el-tab-pane>
+          <el-tab-pane lazy label="金额" name="2" v-if="permissionList.money">
+              <two v-if="activeIndex == 2" />
+          </el-tab-pane>
+        </el-tabs>
+      </location-hash>
     </div>
   </div>
 </template>
@@ -33,8 +35,9 @@ export default {
   },
   name: 'chargeManager',
   data () {
+    const query = this.$route.query
     return {
-      activeIndex: '0',
+      activeIndex: query.opt || '0',
       permissionList: {
         scalc: permission('/chargeManager/scalc'),
         money: permission('/chargeManager/money'),

src/views/chargeManager/one.vue

@@ -36,7 +36,8 @@
           </el-table-column>
         </el-table>
         <pagination
-          :total="pageInfo.total"
+          sync
+          :total.sync="pageInfo.total"
           :page.sync="pageInfo.page"
           :limit.sync="pageInfo.limit"
           :page-sizes="pageInfo.page_size"
@@ -55,10 +56,10 @@
         <el-form-item label="所属分部" prop="organId" :label-width="formLabelWidth">
           <el-select v-model.trim="form.organId" :disabled="formActionTitle === 'update'" placeholder="请选择所属分部">
             <el-option
-              v-for="(item, index) in branchList"
+              v-for="(item, index) in selects.branchs"
               :key="index"
-              :label="item.label"
-              :value="item.value"
+              :label="item.name"
+              :value="item.id"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -188,7 +189,6 @@ import {
   paymentConfigDel
 } from "@/api/systemManage";
 import { getPaymentConfigs } from "./api";
-import { branchQueryPage } from "@/api/specialSetting";
 import store from "@/store";
 export default {
   name: "chargeProfitManager",
@@ -204,7 +204,6 @@ export default {
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
       chargeStatus: false,
-      branchList: [], // 分部列表
       calcBranchList: [], // 可选比例分部
       formActionTitle: "create",
       formLabelWidth: "100px",
@@ -516,20 +515,7 @@ export default {
     },
     getRoleList() {
       //
-      branchQueryPage({
-        // 获取分部
-        delFlag: 0,
-        rows: 9999
-      }).then(res => {
-        if (res.code == 200 && res.data && res.data.rows) {
-          res.data.rows.forEach(item => {
-            this.branchList.push({
-              label: item.name,
-              value: item.id
-            });
-          });
-        }
-      });
+      this.$store.dispatch('setBranchs')
     },
     chargeOperation(type, data) {
       this.formActionTitle = type;

src/views/chargeManager/share-model.vue

@@ -4,10 +4,10 @@
             <el-form-item label="所属分部" prop="organId" :label-width="formLabelWidth">
                 <el-select v-model.trim="form.organId" :disabled="formActionTitle === 'update'" placeholder="请选择所属分部">
                     <el-option
-                    v-for="item in branchList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
+                    v-for="item in selects.branchs"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
                     ></el-option>
                 </el-select>
             </el-form-item>
@@ -149,7 +149,7 @@ const validSale = (rule, value, callback) => {
   }
 };
 export default {
-    props:['detail', 'branchList', 'close', 'getList', 'formActionTitle'],
+    props:['detail', 'close', 'getList', 'formActionTitle'],
     data() {
         return {
             formLabelWidth: "100px",

src/views/chargeManager/three.vue

@@ -32,7 +32,8 @@
           </el-table-column>
         </el-table>
         <pagination
-          :total="pageInfo.total"
+          sync
+          :total.sync="pageInfo.total"
           :page.sync="pageInfo.page"
           :limit.sync="pageInfo.limit"
           :page-sizes="pageInfo.page_size"
@@ -48,7 +49,6 @@
       width="700px"
     >
       <share-model :detail.sync="rowDetail"
-              :branchList="branchList"
               :formActionTitle="formActionTitle"
               :close="onFormClose"
               :getList="getList" />
@@ -77,7 +77,6 @@ export default {
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
       chargeStatus: false,
-      branchList: [], // 分部列表
       formActionTitle: "create",
       formTitle: {
         create: "添加分润",
@@ -93,9 +92,9 @@ export default {
   methods: {
     getOrganToStr(id) {
       let name = null
-      this.branchList.forEach(item => {
-        if(item.value == id) {
-          name = item.label
+      this.selects.branchs.forEach(item => {
+        if(item.id == id) {
+          name = item.name
         }
       })
       return name
@@ -126,20 +125,7 @@ export default {
       });
     },
     async getRoleList(val) {
-      await branchQueryPage({
-        // 获取分部
-        delFlag: 0,
-        rows: 9999
-      }).then(res => {
-        if (res.code == 200 && res.data && res.data.rows) {
-          res.data.rows.forEach(item => {
-            this.branchList.push({
-              label: item.name,
-              value: item.id
-            });
-          });
-        }
-      });
+      this.$store.dispatch('setBranchs')
     },
     chargeOperation(type, data) {
       this.formActionTitle = type;

src/views/chargeManager/two.vue

@@ -23,10 +23,10 @@
               }">
               <el-select v-model.trim="domain.organId" clearable :disabled="domain.disabled" placeholder="请选择所属分部">
                 <el-option
-                  v-for="(item, index1) in branchList"
+                  v-for="(item, index1) in selects.branchs"
                   :key="index1"
-                  :label="item.label"
-                  :value="item.value"
+                  :label="item.name"
+                  :value="item.id"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -144,7 +144,6 @@ export default {
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
       roleList: [], // 角色列表
-      branchList: [], // 分部列表
       calcBranchList: [],
       formLabelWidth: "100px",
       result: {
@@ -186,21 +185,7 @@ export default {
   },
   methods: {
     async __init() {
-      await branchQueryPage({
-        // 获取分部
-        delFlag: 0,
-        rows: 9999
-      }).then(res => {
-        this.branchList = [];
-        if (res.code == 200 && res.data && res.data.rows) {
-          res.data.rows.forEach(item => {
-            this.branchList.push({
-              label: item.name,
-              value: item.id
-            });
-          });
-        }
-      });
+      this.$store.dispatch('setBranchs')
       await getPaymentConfigs().then(res => {
         if (res.code == 200 && res.data) {
           res.data.forEach(item => {

src/views/editionManager/editionList.vue

@@ -8,7 +8,8 @@
       <div class="newBand"
            @click="createEdi"
            v-permission="'appVersionInfo/add'">新建</div>
-      <el-form :inline="true"
+      <save-form :inline="true"
+               @submit="search"
                :model="searchForm">
         <el-form-item label="客户端">
           <el-select clearable
@@ -20,10 +21,9 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger"
-                     @click="search">搜索</el-button>
+          <el-button type="danger" native-type="submit">搜索</el-button>
         </el-form-item>
-      </el-form>
+      </save-form>
 
       <div class="tableWrap">
         <el-table :data="tableList"
@@ -77,7 +77,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="rules.total"
+        <pagination sync :total.sync="rules.total"
                     :page.sync="rules.page"
                     :limit.sync="rules.limit"
                     :page-sizes="rules.page_size"
@@ -94,12 +94,12 @@
                :rules="sectionRules"
                label-position="right"
                label-width="80px"
-               :inline="true"
                v-if="sectionVisible">
         <el-form-item label="客户端"
                       prop="platform"
                       v-if="isNew">
           <el-select v-model="sectionForm.platform"
+                     style="width: 100% !important"
                      clearable>
             <el-option v-for="(item,index) in sectionList"
                        :key="index"
@@ -116,6 +116,7 @@
         <el-form-item label="强制更新"
                       prop="isForceUpdate">
           <el-select clearable
+                      style="width: 100% !important"
                      v-model="sectionForm.isForceUpdate">
             <el-option label="是"
                        :value="true"></el-option>
@@ -126,6 +127,7 @@
         <el-form-item label="状态"
                       prop="status">
           <el-select clearable
+                      style="width: 100% !important"
                      v-model="sectionForm.status">
             <el-option label="最新"
                        value="newest"></el-option>