Merge branch 'test' of 47.94.45.65:angelo/web-retail-admin into base-online

src/router/index.js

@@ -3256,7 +3256,13 @@ export const constantRoutes = [
             meta: { title: '前台权限配置' },
             hidden: true
           },
-
+          {
+            path: 'AddMenuRole',
+            name: 'addMenuRole',
+            component: () => import('@/views/system/addMenuRole/index'),
+            meta: { title: i18n.t('新增权限') },
+            hidden: true
+          },
           {
             path: 'fieldRole',
             name: 'FieldRole',

src/views/information/member/index.vue

@@ -62,9 +62,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item :label="'结算等级'" prop="pkSettleGrade">
+            <el-form-item :label="'结算等级'" prop="pkMaxAwards">
               <el-select
-                v-model="queryParams.pkSettleGrade"
+                v-model="queryParams.pkMaxAwards"
                 clearable
                 :placeholder="'请选择'"
               >
@@ -96,9 +96,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item :label="$t('荣誉奖衔')" prop="pkSettleGrade">
+            <el-form-item :label="$t('荣誉奖衔')" prop="pkMaxAwards">
               <el-select
-                v-model="queryParams.pkSettleGrade"
+                v-model="queryParams.pkMaxAwards"
                 clearable
                 :placeholder="'请选择'"
               >
@@ -447,7 +447,7 @@
           />
           <el-table-column
             align="center"
-            prop="pkSettleGradeVal"
+            prop="pkMaxAwardsVal"
             :label="$t('荣誉奖衔')"
             width="180"
           />
@@ -466,9 +466,9 @@
             width="180"
           />
           <el-table-column
-            v-if="menuList[4].checked == true && allTxt.pkSettleGradeVal"
+            v-if="menuList[4].checked == true && allTxt.pkMaxAwardsVal"
             align="center"
-            prop="pkSettleGradeVal"
+            prop="pkMaxAwardsVal"
             :label="'结算等级'"
             width="180"
           />
@@ -775,7 +775,7 @@ export default {
           id: 4,
           text: '结算等级',
           checked: true,
-          prop: 'pkSettleGradeVal'
+          prop: 'pkMaxAwardsVal'
         },
         {
           id: 5,
@@ -869,7 +869,7 @@ export default {
         phone: '', // 联系方式
         changeNumber: '', // 变更次数
         pkRegisterGrade: '', // 注册等级
-        pkSettleGrade: '', // 结算等级
+        pkMaxAwards: '', // 结算等级
         pkAwards: '', // 真实奖衔
         vertexId: '', // 隶属体系
         teamId: '', // 隶属团队

src/views/marketing/plantCommonweal/commonRoles.vue

@@ -546,7 +546,7 @@ export default {
     },
     cancel() {
       this.$router.push({
-        name: 'superStudioGift'
+        name: 'addMenuRole'
       })
     },
     addNewGoods() {

src/views/system/addMenuRole/index.vue

@@ -207,11 +207,11 @@ export default {
         roleAllList: [],
         menuAllList: []
       },
-      moren: 'superStudioGift',
+      moren: 'addMenuRole',
       topList: [
         {
           name: '后台菜单权限',
-          path: 'superStudioGift'
+          path: 'addMenuRole'
         }
       ]
     }

src/views/system/limits/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="page">
     <div class="contain">
-      <topBar v-if="topList.length > 0" :top-list="topList" :moren="moren"/>
+      <topBar v-if="topList.length > 0" :top-list="topList" :moren="moren" />
       <div class="thetopbox">
         <el-form ref="form" :model="queryParams" label-width="80px">
           <el-row>
@@ -20,7 +20,7 @@
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'管理名称'">
-                <el-input v-model="queryParams.nickName" clearable/>
+                <el-input v-model="queryParams.nickName" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="4" style="margin-left: 0px">
@@ -93,7 +93,7 @@
             :span-method="objectSpanMethod"
             @selection-change="handleSelectionChange"
           >
-            <el-table-column type="selection" width="55"/>
+            <el-table-column type="selection" width="55" />
             <el-table-column
               align="center"
               prop="roleIdVal"
@@ -127,12 +127,12 @@
             >
               <template slot-scope="scope">
                 <el-button
+                  v-show="user.userName == 'admin'"
                   type="text"
                   size="small"
                   class="button-s"
                   style="color: #c73030"
                   @click="toLogin(scope.row)"
-                  v-show="user.userName == 'admin'"
                 >登录
                 </el-button>
 
@@ -184,12 +184,12 @@
 <script>
 import topBar from '@/components/topBarRole'
 import * as api from '@/api/notice'
-import {Message} from 'element-ui'
-import {getRouters} from '@/api/settle'
-import {freeLogin} from "@/api/manage";
-import {setToken} from "@/utils/auth";
-import {login} from "@/api/user";
-import {mapGetters} from "vuex";
+import { Message } from 'element-ui'
+import { getRouters } from '@/api/settle'
+import { freeLogin } from '@/api/manage'
+import { setToken } from '@/utils/auth'
+import { login } from '@/api/user'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'Qxpz',
@@ -202,12 +202,12 @@ export default {
       forms: '',
       rules: {
         nickName: [
-          {required: true, message: '请输入管理姓名', trigger: 'blur'}
-        ],
+          { required: true, message: '请输入管理姓名', trigger: 'blur' }
+        ]
       },
       table: {
         nickName: '',
-        status: '',
+        status: ''
       },
       moren: 'limitsList',
       topList: [
@@ -248,7 +248,7 @@ export default {
     this.getUserRoute()
   },
   computed: {
-    ...mapGetters(["user"]),
+    ...mapGetters(['user'])
   },
   methods: {
     getUserRoute() {
@@ -282,17 +282,17 @@ export default {
     },
     addRules() {
       this.$router.push({
-        path: '/system/limits/superStudioGift'
+        path: '/system/limits/addMenuRole'
       })
     },
     updateShow(item) {
       this.$router.push({
-        path: '/system/limits/superStudioGift?id=' + item.userId
+        path: '/system/limits/addMenuRole?id=' + item.userId
       })
     },
     updateShows(item) {
       this.$router.push({
-        path: '/system/limits/superStudioGift?id=' + item.userId + '&check=1'
+        path: '/system/limits/addMenuRole?id=' + item.userId + '&check=1'
       })
     },
     delRole(item) {
@@ -375,7 +375,7 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val
     },
-    objectSpanMethod({row, column, rowIndex, columnIndex}) {
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       // if (columnIndex === 0) {
       //   if (rowIndex % 2 === 0) {
       //     return {
@@ -390,7 +390,7 @@ export default {
       //   }
       // }
     },
-    tableRowClassName({row, rowIndex}) {
+    tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 === 1) {
         return 'warning-row'
       } else if (rowIndex % 2 === 0) {

src/views/system/role/index.vue

@@ -268,7 +268,7 @@ export default {
   methods: {
     checkShow(item) {
       this.$router.push({
-        path: '/system/limits/superStudioGift?id=' + item.roleId
+        path: '/system/limits/addMenuRole?id=' + item.roleId
       })
     },
     checkShow1(item) {