菜单调整

src/components/HomeNav/HomeNavLeft.vue

@@ -108,7 +108,7 @@
         active-text-color="#409efe" :router="true"
         :default-active="$route.path">
         <template v-for="(item,index) in navList">
-          <template v-if="item.list&&item.list.length>0&&item.GCode!='默认'">
+          <template v-if="item.GCode!='默认'">
             <el-submenu :index="item.list[0].MenuUrl">
               <template slot="title">
                 <i class="iconfont iconText"></i>
@@ -122,7 +122,7 @@
           </template>
           <template v-else>
             <template v-for="(Child,i) in item.list">
-              <el-menu-item :index="Child.MenuUrl" :route="{path:Child.MenuUrl}"
+              <el-menu-item :index="Child.MenuUrl" @click="goUrl(Child)"
                 >{{ Child.MenuName }}</el-menu-item>
             </template>
           </template>
@@ -187,6 +187,15 @@
         ],
       };
     },
+    watch:{
+      '$route':{
+        handler(n,o){
+
+        },
+        deep: true,
+        immediate: true
+      }
+    },
     mounted() {
       let userInfo = this.getLocalStorage();
       this.userInfo = userInfo;
@@ -222,6 +231,12 @@
       });
     },
     methods: {
+      goUrl(item){
+        if(!item.MenuUrl) return
+        this.$router.push({
+          path: item.MenuUrl,
+        });
+      },
       changeMenu: function (item, ind) {
         this.activeIndex = ind;
         this.$router.push({

src/components/approval/customerApr.vue

@@ -14,7 +14,7 @@
     </div>
     <div class="query-box" :style="{'padding-bottom': '10px'}">
          <el-row v-if="!multipleSelection.length" :gutter="30">
-            <el-col :span="4">
+            <el-col :span="5">
                 <span class="font-size-12" style="padding-right: 10px">客户类型</span>
                 <el-select size="mini" v-model="msg.CustomerStatus" placeholder="请选择" @change="getList">
                     <el-option

src/components/dev/payroll.vue

@@ -118,7 +118,7 @@
                             @click="scope.row.Commission>=0?commissionDetails(scope.row):''">{{scope.row.Commission}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="本次年终比例">
+                <!-- <el-table-column label="本次年终比例">
                     <template slot-scope="scope">
                         {{scope.row.BonusRate}}%
                     </template>
@@ -132,7 +132,7 @@
                     <template slot-scope="scope">
                         {{scope.row.TotalBonus}}
                     </template>
-                </el-table-column>
+                </el-table-column> -->
 
                 <el-table-column label="备注" show-overflow-tooltip min-width="100">
                     <template slot-scope="scope">

src/components/watersManagement/watersManagement.vue

@@ -44,7 +44,7 @@
                         </el-select>
                     </el-popover>
                 </el-col>
-                <!-- <el-col :span="4">
+                <!-- <el-col :span="5">
                 <span class="font-size-12" style="padding-right: 10px">客户类型</span>
                 <el-select size="mini" v-model="msg.CustomerType" placeholder="请选择" @change="getList">
                     <el-option key="0" label="客户" :value="0"></el-option>