新增权限

src/api/index.js

@@ -240,3 +240,11 @@ export const offGoods = query => {
       data: query
   });
 };
+//获取用户信息
+export const getUserData = query => {
+  return request({
+      url: '/admin/user.User/getUserData',
+      method: 'get',
+      params: query
+  });
+};

src/components/Header.vue

@@ -9,7 +9,7 @@
     <div class="header_right">
       <div class="header_right_item">
         <img src="../assets/icons/svg/user.svg" alt="" >
-        <span class="f_title">王甜甜</span>
+        <span class="f_title">{{name}}</span>
       </div>
       <a href="http://58.30.231.137:8035/#/cache/index">
         <div class="header_right_item">
@@ -23,6 +23,11 @@
 <script>
 import "../assets/icons/svg/user.svg"
 export default {
+  props:{
+    name:{
+      type:String
+    }
+  },
   data() {
     return{
 

src/components/Home.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="wrapper">
-    <v-head></v-head>
+    <v-head :name="data.accountName"></v-head>
     <div class="bootm">
-      <v-sidebar></v-sidebar>
+      <v-sidebar :auth="data.auth"></v-sidebar>
       <div class="content-box">
         <div class="content">
           <transition name="move" mode="out-in">
@@ -17,10 +17,11 @@
 <script>
 import vHead from './Header.vue';
 import vSidebar from './Sidebar.vue';
+import {getUserData} from '../api/index'
 export default {
   data () {
     return {
-      msg: 'Welcome to Your Vue.js App'
+      data:{}
     }
   },
   components: {
@@ -36,8 +37,19 @@ export default {
     if(url){
       localStorage.setItem('wenhua_url',url)
     }
+    this.getUserData()
+
   },
   methods:{
+    getUserData(){
+      getUserData().then(res=>{
+        if(res.code==200){
+          this.data=res.data
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
     getQueryString(name){
       var after = window.location.hash.split("?")[1];
       if(after){

src/components/Sidebar.vue

@@ -2,7 +2,7 @@
   <div class="sidebar_body">
     <a-menu theme="dark" mode="inline" :default-selected-keys="[key]"  class="sidebar" :defaultOpenKeys="[openKey]" :open-keys="openKeys" @openChange="onOpenChange">
       <template v-for="item in items">
-        <a-menu-item v-if="!item.children" :key="item.key">
+        <a-menu-item v-if="!item.children && item.isShow" :key="item.key">
           <router-link :to="item.url">
             <!-- <a-icon :type="item.icon" /> -->
             <span class="f_title">{{ item.title }}</span>
@@ -14,7 +14,7 @@
             <span class="f_title">{{ item.title }}</span>
           </span>
           <template v-for="item1 in item.children">
-            <a-menu-item v-if="!item1.children" :key="item1.key">
+            <a-menu-item v-if="!item1.children && item1.isShow" :key="item1.key">
               <router-link :to="item1.url">
                 <!-- <a-icon :type="item1.icon" /> -->
                 <span>{{ item1.title }}</span>
@@ -28,6 +28,11 @@
 </template>
 <script>
 export default {
+  props:{
+    auth:{
+      type:Array
+    }
+  },
   data() {
     return{
       key:'',
@@ -40,8 +45,8 @@ export default {
           key:'1',
           title:'文化数据分类管理',
           children:[
-            {icon:'',url:"DataQuery",title:"全部文化数据查询",key:'/DataQuery'},
-            {icon:'',url:"Category",title:"文化数据类别管理",key:'/Category'},
+            {icon:'',url:"DataQuery",title:"全部文化数据查询",key:'/DataQuery',auth:'NationalCulturalDataQuery'},
+            {icon:'',url:"Category",title:"文化数据类别管理",key:'/Category',auth:'CulturalDataCategoryManagement'},
           ]
         },
         {
@@ -49,6 +54,7 @@ export default {
           url:'admission',
           key:'/admission',
           title:'文化数据入场管理',
+          auth:'CulturalDataAdmissionManagement'
         },
         {
           icon:'',
@@ -56,12 +62,12 @@ export default {
           key:'3',
           title:'交易订单管理',
           children:[
-            {icon:'',url:"allOrder",title:"全部交易订单",key:'/allOrder'},
-            {icon:'',url:"pendingPayment",title:"待付款订单",key:'/pendingPayment'},
-            {icon:'',url:"toBeDelivered",title:"待交付订单",key:'/toBeDelivered'},
-            {icon:'',url:"toBeSettled",title:"待结算订单",key:'/toBeSettled'},
-            {icon:'',url:"completed",title:"已完成订单",key:'/completed'},
-            {icon:'',url:"closed",title:"已关闭订单",key:'/closed'},
+            {icon:'',url:"allOrder",title:"全部交易订单",key:'/allOrder',auth:'AllTradeOrders'},
+            {icon:'',url:"pendingPayment",title:"待付款订单",key:'/pendingPayment',auth:'PendingPayment'},
+            {icon:'',url:"toBeDelivered",title:"待交付订单",key:'/toBeDelivered',auth:'PendDelivery'},
+            {icon:'',url:"toBeSettled",title:"待结算订单",key:'/toBeSettled',auth:'PendBalance'},
+            {icon:'',url:"completed",title:"已完成订单",key:'/completed',auth:'OrderCompleted'},
+            {icon:'',url:"closed",title:"已关闭订单",key:'/closed',auth:'OrderClosed'},
           ]
         },
         {
@@ -70,7 +76,7 @@ export default {
           key:'4',
           title:'交易订单售后服务管理',
           children:[
-            {icon:'',url:"invoice",title:"服务发票",key:'/invoice'},
+            {icon:'',url:"invoice",title:"服务发票",key:'/invoice',auth:'ServiceInvoice'},
           ]
         },
         {
@@ -79,9 +85,9 @@ export default {
           key:'5',
           title:'资金结算分账管理',
           children:[
-            {icon:'',url:"fundSettlement",title:"资金结算对账单",key:'/fundSettlement'},
-            {icon:'',url:"splitProportion",title:"分账比例设置",key:'/splitProportion'},
-            {icon:'',url:"paymentMethod",title:"支付方式设置",key:'/paymentMethod'},
+            {icon:'',url:"fundSettlement",title:"资金结算对账单",key:'/fundSettlement',auth:'FundsSettlementStatement'},
+            {icon:'',url:"splitProportion",title:"分账比例设置",key:'/splitProportion',auth:'AccountSharingRatioSetting'},
+            {icon:'',url:"paymentMethod",title:"支付方式设置",key:'/paymentMethod',auth:'PaymentMethodSettings'},
           ]
         },
         {
@@ -89,13 +95,13 @@ export default {
           url:'layout',
           key:'/layout',
           title:'数据展示布局管理',
+          auth:'DataDisplayLayoutManagement'
         },
       ]
     }
   },
   created(){
     this.key=this.$route.path
-
     this.showMenu()
   },
   methods:{
@@ -111,19 +117,35 @@ export default {
       }
     },
     showMenu(){
-      this.items.map(item=>{
+      for(let i3 in this.items){
+        let item=this.items[i3]
+      // this.items.map(item=>{
         if(item.children){
           for(let i in item.children){
             let item1=item.children[i]
             if(item1.key==this.key){
               this.openKey=item.key
               this.openKeys.push(item.key)
-              console.info(this.openKeys)
-              break
+            }
+            for(let i1 in this.auth){
+              let item2=this.auth[i1]
+              if(item2==item1.auth){
+                this.items[i3].children[i].isShow=true
+                // item1.isShow=true
+              }
+            }
+          }
+        }else{
+          for(let i1 in this.auth){
+            let item2=this.auth[i1]
+            if(item2==item.auth){
+              this.items[i3].isShow=true
+              // item.isShow=true
+            }
           }
         }
       }
-      })
+      // console.info(this.items)
     },
   },
   watch:{

src/components/page/admission/index.vue

@@ -61,9 +61,9 @@
       <div class="table">
         <div class="table_title">
           <span>查询结果</span>
-          <a-button type="primary" class="query_button">获 取</a-button>
+          <a-button type="primary" class="query_button" @click="getGoods">下 架</a-button>
         </div>
-        <a-table :columns="columns" :data-source="data" bordered :pagination="false">
+        <a-table :columns="columns" :data-source="data" bordered :pagination="false" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
           <template slot="goods_status" slot-scope="goods_status">
             <span>{{goods_status==1?'上架中':goods_status==2?'下架中':goods_status==3?'已转让':'已失效'}}</span>
           </template>
@@ -103,7 +103,7 @@
 import dataSelect from '../../dateSelect/index.vue'
 import operationRecords from '../../operationRecords/index.vue'
 import Operation from '../../Operation.vue'
-import {getAllDate,getLog} from '../../../api/index'
+import {getAllDate,getLog,offGoods} from '../../../api/index'
 export default {
   data() {
     return{
@@ -116,6 +116,7 @@ export default {
         data_type:'',
         createtime:[],
       },
+      selectedRowKeys:[],
       logDate:[],
       visible:false,
       visible1:false,
@@ -183,6 +184,20 @@ export default {
     this.getAllDate()
   },
   methods:{
+    onSelectChange(selectedRowKeys) {
+      this.selectedRowKeys = selectedRowKeys;
+    },
+    getGoods(){
+      let data={goods_isli:this.selectedRowKeys}
+      offGoods(data).then(res=>{
+        if(res.code==200){
+          this.getAllDate()
+          this.$message.success('下架成功');
+        }else{
+          this.$message.error(res.msg);
+        }
+      })
+    },
     //关联订单
     associatedOrder(val){
       this.$router.push({path:'/allOrder',query:{goods_islicode:val}})
@@ -203,6 +218,7 @@ export default {
           this.startTotal=res.data.start
           this.endTotal=res.data.end
           this.total=res.data.total
+          this.selectedRowKeys=[]
         }else{
           this.$message.error(res.msg);
         }

src/components/page/afterService/invoice.vue

@@ -58,7 +58,7 @@
       <div class="table">
         <div class="table_title">
           <span>查询结果</span>
-          <a-button type="primary" class="query_button">获 取</a-button>
+          <!-- <a-button type="primary" class="query_button">获 取</a-button> -->
         </div>
         <a-table :columns="columns" :data-source="data" bordered :pagination="false">
           <template slot="operation">

src/components/page/classification/DataQuery.vue

@@ -72,9 +72,9 @@
       <div class="table">
         <div class="table_title">
           <span >查询结果</span>
-          <a-button type="primary" class="query_button" @click="getGoods">下 架</a-button>
+          <a-button type="primary" class="query_button" @click="getGoods">获 取</a-button>
         </div>
-        <a-table :columns="columns" :data-source="data" bordered :pagination="false" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
+        <a-table :columns="columns" :data-source="data" bordered :pagination="false" >
           <template slot="goods_status" slot-scope="goods_status">
             <span>{{goods_status==1?'上架中':goods_status==2?'下架中':goods_status==3?'已转让':'已失效'}}</span>
           </template>
@@ -113,7 +113,7 @@
 import Operation from '../../Operation.vue'
 import dataSelect from '../../dateSelect/index.vue'
 import operationRecords from '../../operationRecords/index.vue'
-import {getAllDate,getLog,offGoods} from '../../../api/index'
+import {getAllDate,getLog,manualGetGoods} from '../../../api/index'
 export default {
   data() {
     return{
@@ -126,7 +126,6 @@ export default {
         data_type:'',
         createtime:[],
       },
-      selectedRowKeys:[],
       visible:false,
       //数据查看所需要的数据
       goods_islicode:'',
@@ -201,19 +200,15 @@ export default {
     this.getAllDate()
   },
   methods:{
-    onSelectChange(selectedRowKeys) {
-      this.selectedRowKeys = selectedRowKeys;
-    },
     getGoods(){
-      let data={goods_isli:this.selectedRowKeys}
-      offGoods(data).then(res=>{
+      manualGetGoods().then(res=>{
         if(res.code==200){
-          // if(res.data.count==0){
-          //   this.$message.success('无新增委托数据');
-          // }else{
-            this.$message.success('下架成功');
+          if(res.data.count==0){
+            this.$message.success('无新增委托数据');
+          }else{
+            this.$message.success('成功获取'+res.data.count+'个委托数据！');
             this.getAllDate()
-          // }
+          }
         }else{
           this.$message.error(res.msg);
         }
@@ -235,7 +230,6 @@ export default {
           this.startTotal=res.data.start
           this.endTotal=res.data.end
           this.total=res.data.total
-          this.selectedRowKeys=[]
         }else{
           this.$message.error(res.msg);
         }