Merge branch '03/12permission' into dev

src/views/HumanResources/index.vue

@@ -127,9 +127,10 @@
           <el-button
             @click="onReSet"
             type="primary"
-            style="background-color: #409eff; border-color: #409eff"
+
             >重置</el-button
           >
+          <!--  style="background-color: #409eff; border-color: #409eff" -->
         </el-form-item>
       </saveform>
       <div class="tableWrap">

src/views/businessManager/orderManager/financeManager-taoqi.vue

@@ -333,7 +333,7 @@
             label="操作"
           >
             <template slot-scope="scope">
-              <div v-if="scope.row.groupType == 'OUTORDER' && $helper.permission('routeOrder/getOrderInfo/taoqi')">
+              <div v-if="scope.row.groupType == 'OUTORDER' && $helpers.permission('routeOrder/getOrderInfo/taoqi')">
                 <el-button type="text" @click="lookOrderInfo(scope.row)"
                   >查看</el-button
                 >

src/views/businessManager/orderManager/financeManager.vue

@@ -336,7 +336,7 @@
             label="操作"
           >
             <template slot-scope="scope">
-              <div v-if="scope.row.groupType == 'OUTORDER' && $helper.permission('routeOrder/getOrderInfo')">
+              <div v-if="scope.row.groupType == 'OUTORDER' && $helpers.permission('routeOrder/getOrderInfo')">
                 <el-button type="text" @click="lookOrderInfo(scope.row)"
                   >查看</el-button
                 >

src/views/categroyManager/specialSetup/musicalManager.vue

@@ -47,7 +47,7 @@
                   :key="s.id"
                   type="info"
                   effect="dark"
-                  :closable="$helper.permission('subject/upset/del')"
+                  :closable="$helpers.permission('subject/upset/del')"
                   :disable-transitions="false"
                   @close="subjectDelete(s)"> {{s.name}}</el-tag>
           <span style="display: inline-block;">

src/views/categroyManager/specialSetup/musicalManagerOut.vue

@@ -47,7 +47,7 @@
                   :key="s.id"
                   type="info"
                   effect="dark"
-                  :closable="$helper.permission('subject/upset/del2')"
+                  :closable="$helpers.permission('subject/upset/del2')"
                   :disable-transitions="false"
                   @close="subjectDelete(s)"> {{s.name}}</el-tag>
           <span style="display: inline-block;">

src/views/setSilder/addSilder.vue

@@ -82,13 +82,25 @@
       <el-form :model="form"
                :rules="rules"
                ref="ruleForm">
+        <el-form-item label="菜单类型"
+                      :label-width="formLabelWidth">
+          <el-select v-model.trim.number="form.type" style="width: 100% !important;">
+            <el-option label="菜单"
+                       :value="0"></el-option>
+            <el-option label="按钮"
+                       :value="1"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="菜单名"
                       prop="name"
+                      v-if="form.type == 0"
                       :label-width="formLabelWidth">
           <el-input v-model.trim="form.name"
                     autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="文件路径"
+                      prop="path"
+                      v-if="form.type == 0"
                       :label-width="formLabelWidth">
           <el-input v-model.trim="form.path"
                     autocomplete="off"></el-input>
@@ -106,11 +118,14 @@
                     autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="高亮路径"
+                      v-if="form.type == 0"
                       :label-width="formLabelWidth">
           <el-input v-model.trim="form.parentPermission"
                     autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="组件名"
+                      prop="component"
+                      v-if="form.type == 0"
                       :label-width="formLabelWidth">
           <el-input v-model.trim="form.component"
                     autocomplete="off"></el-input>
@@ -118,8 +133,6 @@
         <el-form-item label="父元素ID"
                       prop="parentId"
                       :label-width="formLabelWidth">
-          <!-- <el-input v-model.trim="form.parentId"
-                    autocomplete="off"></el-input> -->
           <el-cascader v-model="form.parentId"
                        style="width:100%"
                        :options="cascaderList"
@@ -127,7 +140,7 @@
         </el-form-item>
         <el-form-item label="是否隐藏"
                       :label-width="formLabelWidth">
-          <el-select v-model.trim="form.hid">
+          <el-select v-model.trim="form.hid" style="width: 100% !important;">
             <el-option label="否"
                        :value="0"></el-option>
             <el-option label="是"
@@ -136,22 +149,13 @@
         </el-form-item>
         <el-form-item label="是否缓存"
                       :label-width="formLabelWidth">
-          <el-select v-model.trim="form.keepAlive">
+          <el-select v-model.trim="form.keepAlive" style="width: 100% !important;">
             <el-option label="是"
                        :value="0"></el-option>
             <el-option label="否"
                       :value="1"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="菜单类型"
-                      :label-width="formLabelWidth">
-          <el-select v-model.trim.number="form.type">
-            <el-option label="菜单"
-                       :value="0"></el-option>
-            <el-option label="按钮"
-                       :value="1"></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="排序"
                       :label-width="formLabelWidth">
           <el-input v-model.trim="form.sort"
@@ -189,13 +193,15 @@ export default {
         parentId: null,
         sort: 1,
         component: null,
-        hid: 1,
-        type: 1,
+        hid: 0,
+        type: 0,
         parentPermission: null,
         keepAlive: 1
       },
       rules: {
         name: [{ required: true, message: "请输入菜单名", trigger: "blur" }],
+        path: [{ required: true, message: "请输入文件路径", trigger: "blur" }],
+        component: [{ required: true, message: "请输入组件名", trigger: "blur" }],
         permission: [{ required: true, message: "请输入接口权限", trigger: "blur" }],
         memo: [{ required: true, message: "请输入页面权限", trigger: "blur" }],
         parentId: [{ required: true, message: "请输入父元素ID", trigger: "blur" }],
@@ -358,8 +364,8 @@ export default {
         parentId: null,
         sort: 1,
         component: null,
-        hid: 1,
-        type: 1,
+        hid: 0,
+        type: 0,
         parentPermission: null,
         keepAlive: 1
       }

src/views/teamBuild/components/teamBaseInfo.vue

@@ -528,6 +528,8 @@ export default {
               return b;
             })
             .catch(() => {
+              localStorage.removeItem(`${this.teamid}base`)
+              return true
               // localStorage.setItem(`${this.teamid}base`,JSON.stringify(this.topFrom));
             })
         } else {