前端

src/components/syClick.vue

@@ -1,14 +1,14 @@
 <template>
-    <div class="nav-click" v-if="$route.meta.showClick">
+    <div class="nav-click">
     	<ul :style="{'left':left + 'px'}">
-    		<li class="nav-click-body" v-for="(item,index) in titles" :key="index" :title="item.title + item.flag"
+    		<li class="nav-click-body" v-for="(item,index) in list" :key="index" :title="item.title + item.flag"
             :class="{'nav-click-show':item.curr,'nav-click-default':!item.curr}" >
     			<div class="nav-click-body-title hidden" @click="changeTag(index)">{{item.title}} {{item.flag}}</div>
     			<div v-if="index!=0" class="nav-click-body-close" @click="removeTag(index)" :class="{'nav-click-body-show':item.curr,'nav-click-body-default':!item.curr}">×</div>
     		</li>
     		<div class="nav-click-right">
-    			<sy-icon type="ellipsis-v" @click="UnNavClick" v-show="downIcon"></sy-icon>
-    			<sy-icon type="remove" @click="CloseNavClick" v-show="!downIcon"></sy-icon>
+    			<!-- <sy-icon type="ellipsis-v" @click="UnNavClick" v-show="downIcon"></sy-icon>
+    			<sy-icon type="remove" @click="CloseNavClick" v-show="!downIcon"></sy-icon> -->
     		</div>
     	</ul>
     </div>
@@ -27,6 +27,7 @@
         },
         data() {
             return {
+                list:[{title:'1111111111'},{title:'22222222222'}],
 				left: 0,
 				clickHeight:50,
 				downIcon: true,

src/layout/index/index.vue

@@ -4,6 +4,7 @@
     <div class="winseaview-header">
       <!-- 顶部导航栏 -->
       <top />
+      <!-- <div> <sy-Click :titles="history_list" @removeAll="removeAll" @removeTag="removeTab" @changeTag="changeTag"></sy-Click></div> -->
     </div>
 
     <div class="winseaview-layout">
@@ -33,6 +34,7 @@
     mapGetters
   } from 'vuex';
   import screenshot from './screenshot';
+  import syClick from '@/components/syClick'
   import tags from './tags';
   import top from './top/';
   import sidebar from './sidebar/';
@@ -46,7 +48,8 @@
       top,
       tags,
       sidebar,
-      screenshot
+      screenshot,
+      syClick,
     },
     name: 'index',
     data() {
@@ -55,6 +58,7 @@
         refreshLock: false,
         //刷新token的时间
         refreshTime: '',  
+         // 标签页
       };
     },
     created() {
@@ -68,6 +72,15 @@
     props: [],
     methods: {
       ...mapActions(['setScreen']),
+      removeAll(){
+
+      },
+      removeTab(){
+
+      },
+      changeTag(){
+
+      },
       showCollapse() {
         this.$store.commit('SET_COLLAPSE');
       },

src/layout/index/top/index.vue

@@ -120,7 +120,7 @@
         </el-dropdown-menu>
       </el-dropdown>
     </div>
-  <div> <sy-Click :titles="history_list" @removeAll="removeAll" @removeTag="removeTab" @changeTag="changeTag"></sy-Click></div>
+  
     <topSetting v-model="settingDrawer" @close="() => (settingDrawer = !settingDrawer)" />
 
     <!--个人信息-->
@@ -174,6 +174,7 @@
         }}</ws-button>
       </span>
     </WinseaContentModal>
+    
   </div>
 </template>
 <script>
@@ -185,7 +186,7 @@
   from '@/model/indexRx'
   import Cookies from 'js-cookie'
   import { setToken, getCompanyId, clearStorage } from '@/utils/auth'
-  import syClick from '@/components/syClick'
+
   import {
     mapActions,
     mapGetters,
@@ -249,7 +250,7 @@
       topSetting,
       breadCrumb,
       smallTips,
-      syClick,
+      
     },
     name: 'top',
     data() {
@@ -268,38 +269,7 @@
         toPageData: {},
         userINfo: {},
         barCode: '',
-        // 标签页
-        history_list: [{
-                    "title": "系统首页",
-                    "path": "/home",
-                    "curr": true,
-                    "name": "home",
-                    "flag": "",
-                    _route: 'home', // 用来存储对应的路由只读实例对象
-                    "route": {
-                        "name": "home",
-                        "meta": {
-                            "title": "系统首页",
-                            "requireAuth": false,
-                            "showHeader": true,
-                            "showNav": true,
-                            "showtag": true,
-                            "showPosition": true,
-                            "showClick": true
-                        },
-                        "path": "/home",
-                        "query": {},
-                        "params": {},
-                        "fullPath": "/home"
-                    }
-                }],
- 
-                // 标签点击标识，用来控制切换路由时的缓存处理方式，如果是标签点击切换的路由，直接用缓存不需要处理，并且也不需要执行新增标签方法，
-                // 如果不是标签点击的，那么要判断当前缓存中是否已存在将要跳转的路由，如果存在要先清除缓存
-                isTabClick: false,
-                
-                // 键盘control是否被按下，用来控制F5刷新组件
-                isUpKey_Control: false,
+       
 
         compNameoptions:[],
         isOpenCodeGun: false,
@@ -423,15 +393,7 @@
     methods: {
       ...mapActions('common', ['setLocalVessels']),
       ...mapActions('user', ['getUserInfo','toSetShow']),
-      removeAll(){
-
-      },
-      removeTab(){
-
-      },
-      changeTag(){
-
-      },
+      
       payCode() {
 		  console.log('input', this.barCode)
         this.btnStatus = {

src/router/index.js

@@ -67,7 +67,7 @@ export const constantRoutes = [
     path: '/',
     component: Layout,
     redirect: { name: 'home' },
-    meta: { title: 'home', icon: '-index-copy' },
+    meta: { title: 'home', icon: '-index-copy',showClick:true },
     children: [
       {
         path: 'home',

src/views/profitable/component/routers/route.js

@@ -8,7 +8,7 @@ const profitableRouter = {
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'profitable',
-    module: 'contractManagement.exContract.exContractInfo.view',
+    module: 'lirunhesuan',
     icon: '-caigouguanli'
   },
   children: [
@@ -36,7 +36,7 @@ const profitableRouter = {
         meta: {
           title: 'contractprofits',
           shortcutEntrance: 'profitable',
-          module: 'contractManagement.exContract.exContractInfo.view',
+          module: 'lirunhesuan',
           permissicon: [],
           keepAlive: true
           // module: 'procurement.sparepart.applDetail'
@@ -51,7 +51,7 @@ const profitableRouter = {
       meta: {
         title: 'contractprofitsdetails',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -67,7 +67,7 @@ const profitableRouter = {
       meta: {
         title: 'contractinventory',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -83,7 +83,7 @@ const profitableRouter = {
       meta: {
         title: 'contractcost',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -99,7 +99,7 @@ const profitableRouter = {
       meta: {
         title: 'warehouseprofits',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -114,14 +114,14 @@ const profitableRouter = {
       meta: {
         title: 'warehouseprofitsdetails',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
       },
       hidden:true,
     }, 
-    // 合同利润库存
+    // 库点利润库存
     {
       path: 'warehouseinventory',
       component: () =>
@@ -130,7 +130,7 @@ const profitableRouter = {
       meta: {
         title: 'warehouseinventory',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -146,7 +146,7 @@ const profitableRouter = {
       meta: {
         title: 'warehousecost',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -162,7 +162,7 @@ const profitableRouter = {
       meta: {
         title: 'expensemanagement',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan.feiyongguanli.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -177,7 +177,7 @@ const profitableRouter = {
       meta: {
         title: 'expensemanagementdetails',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan.feiyongguanli.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -193,7 +193,7 @@ const profitableRouter = {
       meta: {
         title: 'cashout',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan.feiyongguanli.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -209,7 +209,7 @@ const profitableRouter = {
       meta: {
         title: 'cashoutedit',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan.feiyongguanli.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -225,7 +225,7 @@ const profitableRouter = {
       meta: {
         title: 'cashoutaduit',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan.feiyongguanli.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -241,7 +241,7 @@ const profitableRouter = {
       meta: {
         title: 'receipt',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan.feiyongguanli.shouk',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -258,7 +258,7 @@ const profitableRouter = {
       meta: {
         title: 'receiptaduit',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan.feiyongguanli.queshou',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -274,7 +274,7 @@ const profitableRouter = {
       meta: {
         title: 'payment',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan.feiyongguanli.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -290,7 +290,7 @@ const profitableRouter = {
       meta: {
         title: 'expenseallot',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan.feiyongguanli.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -306,7 +306,7 @@ const profitableRouter = {
       meta: {
         title: 'expenseallotaduit',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan.feiyongguanli.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -322,7 +322,7 @@ const profitableRouter = {
       meta: {
         title: 'expensemanagentlook',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan.feiyongguanli.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -338,7 +338,7 @@ const profitableRouter = {
       meta: {
         title: 'expensemanagentedit',
         shortcutEntrance: 'profitable',
-        module: 'contractManagement.exContract.exContractInfo.view',
+        module: 'lirunhesuan.feiyongguanli.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'

src/views/profitable/expensemanagementdetails.vue

@@ -33,7 +33,7 @@
         </el-col>
         <el-col style='text-align:right;' :span="6">
           <el-button style="margin-left:10px" @click="cashout('')">请款</el-button>
-          <el-button style="margin-right:10px" @click="receipt(1)" >收款</el-button>
+          <el-button v-hasPermission="`lirunhesuan.feiyongguanli.shouk`" style="margin-right:10px" @click="receipt(1)" >收款</el-button>
         </el-col>
       </el-row>
       <div class="fromdata">
@@ -110,7 +110,10 @@
           <el-table-column prop="address" label="操作" width="300">
             <template slot-scope="scope">
               <el-button @click="look(scope.row)" type="primary">查看</el-button>
-              <el-button v-if='scope.row.status=="待确认"&&scope.row.expensesType==1' @click="shoukuanqueren(scope.row)" type="primary">确认</el-button>
+              <div v-hasPermission="`lirunhesuan.feiyongguanli.queshou`" style='display:inline-block;'>
+                <el-button v-if='scope.row.status=="待确认"&&scope.row.expensesType==1' @click="shoukuanqueren(scope.row)" type="primary">确认</el-button>
+              </div>
+              
               <!-- <el-button v-if='scope.row.approveStatus=="待确认"' @click="accomplish(scope.row)" type="primary">完成</el-button> -->
               <el-button v-if='scope.row.expensesPurpose==1&&scope.row.status=="已收款"&&!scope.row.approveStatus||scope.row.expensesPurpose==1&&scope.row.status=="已付款"&&!scope.row.approveStatus' @click="accomplish(scope.row)" type="primary">完成</el-button>
               <el-button  v-if='scope.row.status=="已驳回"' @click="edit(scope.row)" type="primary">编辑</el-button>