前端sdy

src/components/base/BaseTabsRouterLayout/index-V2.vue

@@ -114,10 +114,10 @@ export default {
       </BaseTabPane>
     </BaseTabs>
     <section v-if="isRouter">
-      <keep-alive>
+      <!-- <keep-alive> -->
         <router-view v-if="$route.meta.keepAlive"></router-view>
-      </keep-alive>
-      <router-view v-if="!$route.meta.keepAlive"></router-view>
+      <!-- </keep-alive> -->
+      <!-- <router-view v-if="!$route.meta.keepAlive"></router-view> -->
     </section>
   </section>
 </template>

src/enums/permissions.js

@@ -7,10 +7,11 @@
  */
 
 export default {
-  PURSPPURCHASINFO_UPDATEPURCHASINFO: 'procurement.sparepart.purchasDetail.save',
-  PURSPAPPLINFO_SUBMITTOENQUIRY: 'procurement.sparepart.purSpApplInfo.enquiry',
-  PURSPQUOTESINFO_UPDATEQUOTES: 'procurement.sparepart.quotesDetail.saveQuotation',
-  PURSPPARITYINFO_UPDATEPARITYINFO: 'procurement.sparepart.spparity.save',
+  // 合同管理
+  BUYCONTRACTINFO_ADD: 'contractManagement.buyContract.buyContractInfo.add',
+  BUYCONTRACTINFO_DELETE: 'contractManagement.buyContract.buyContractInfo.delete',
+  BUYCONTRACTINFO_EDIT: 'contractManagement.buyContract.buyContractInfo.edit',
+  BUYCONTRACTINFO_EDIT_VIEW: 'contractManagement.buyContract.buyContractInfo.view',
   PURSPBILLINFO_UPDATEBILL: 'procurement.sparepart.billDetail.save',
   PURMAPARITYINFO_UPDATEPARITYINFO: 'procurement.spareMaterial.spparityMa.save',
   PURMABILLINFO_UPDATEBILL: 'procurement.spareMaterial.billDetailMa.save',

src/store/modules/permission.js

@@ -19,12 +19,13 @@ function filterAsyncRoutes(routes, roles) {
     };
     if (currentRoute.meta && currentRoute.meta.module) {
       const routeModule = currentRoute.meta.module;
-      // if (roles.some(role => role.indexOf(routeModule) === 0)) {
+      // console.log(roles)
+      if (roles.some(role => role.indexOf(routeModule) === 0)) {
       if (Array.isArray(currentRoute.children) && currentRoute.children.length > 0) {
         currentRoute.children = filterAsyncRoutes(currentRoute.children, roles);
       }
       res.push(currentRoute);
-      // }
+      }
     } else {
       res.push(currentRoute);
     }
@@ -40,12 +41,17 @@ function filterAsyncRoutes(routes, roles) {
  * @param {*} parentModule
  */
 function handleRoles(roles, res, parentModule) {
+  console.log(roles, res, parentModule)
   roles.forEach((role) => {
     if (Array.isArray(role.children) && role.children.length > 0) {
       handleRoles(role.children, res, parentModule + role.name + '.')
     } else {
       const lastIndex = role.name.lastIndexOf('.');
-      res.push(`${parentModule}${role.name.substring(lastIndex + 1)}`)
+      if(parentModule.indexOf(role.name.split('.')[0])!=-1){
+        res.push(`${parentModule}${role.name.substring(lastIndex + 1)}`)
+      }else{
+        res.push(`${parentModule}${role.name}`)
+      } 
     }
   })
 }

src/utils/getHasPermission.js

@@ -10,6 +10,7 @@ export function getHp (data) {
  */
 export function hasPermission (data) {
   let userPermissionList = Array.isArray(data) ? data : [data];
+  console.log(userPermissionList)
   // 当前用户的权限列表
   return userPermissionList.some(e => store.getters.roles.includes(e))
 }

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

@@ -28,14 +28,14 @@ const contractManagementRouter = {
     },
     // 采购合同
     {
-      path: 'purchaseContract',
+      path: 'buyContract',
       component: () =>
         import(/* webpackChunkName: "sparepartList" */ '@/views/contractManagement/purchaseContract'),
-      name: 'purchaseContract',
+      name: 'buyContract',
       meta: {
         title: 'purchaseContract',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.purchaseContract',
+        module: 'contractManagement.buyContract',
         permissicon: [],
         keepAlive: true
       }
@@ -48,7 +48,7 @@ const contractManagementRouter = {
       meta: {
         title: 'purchaseContractExamine',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract.purchaseContractExamine',
+        module: 'contractManagement.buyContract.buyContractInfo.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -63,7 +63,7 @@ const contractManagementRouter = {
       meta: {
         title: 'purchaseContractEdit',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract.purchaseContractEdit',
+        module: 'contractManagement.buyContract.buyContractInfo.edit',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -78,7 +78,7 @@ const contractManagementRouter = {
       meta: {
         title: 'purchaseContractAdd',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract.purchaseContractAdd',
+        module: 'contractManagement.buyContract.buyContractInfo.add',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -93,7 +93,7 @@ const contractManagementRouter = {
       meta: {
         title: 'salesContractExamine',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract.salesContractExamine',
+        module: 'contractManagement.salesContract.salesContractInfo.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -108,7 +108,7 @@ const contractManagementRouter = {
       meta: {
         title: 'salesContractEdit',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract.salesContractEdit',
+        module: 'contractManagement.salesContract.salesContractInfo.edit',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -123,7 +123,7 @@ const contractManagementRouter = {
       meta: {
         title: 'salesContractAdd',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract.salesContractAdd',
+        module: 'contractManagement.salesContract.salesContractInfo.add',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'

src/views/contractManagement/purchaseContract.vue

@@ -5,6 +5,9 @@
     <BaseHeaderLayout :leftSpan="10">
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()"
+        v-hasPermission="
+            `contractManagement.buyContract.buyContractInfo.add`
+          "
           ><img
             width="13"
             height="13"
@@ -21,7 +24,7 @@
         <ws-button
           @click="exportlist()"
           v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+           `contractManagement.buyContract.buyContractInfo.view`
           "
           >导出</ws-button
         >
@@ -150,7 +153,7 @@
             </template>
             <div>
               <p style="margin-top: 0; padding-left: 10px">操作历史</p>
-              <div v-for="(item, index) in historyList" class="flex">
+              <div v-for="(item, index) in historyList" :key='index' class="flex">
                 <div class="vertical-text vertical-text-left">
                   {{ item.updateDate }}
                 </div>
@@ -205,6 +208,9 @@
             style="vertical-align: text-top; margin: 0 6px"
             src="../../../public/img/chakan.png"
             @click="handleExamine(scope.row)"
+            v-hasPermission="
+           `contractManagement.buyContract.buyContractInfo.view`
+          "
             alt=""
           />
           <img
@@ -213,6 +219,9 @@
             style="vertical-align: text-top; margin: 0 6px"
             src="../../../public/img/bianji.png"
             @click="handleEdit(scope.row)"
+            v-hasPermission="
+           `contractManagement.buyContract.buyContractInfo.edit`
+          "
             alt=""
           />
           <img
@@ -225,6 +234,9 @@
               margin: 0 6px;
             "
             src="../../../public/img/shanchu.png"
+            v-hasPermission="
+           `contractManagement.buyContract.buyContractInfo.delete`
+          "
             @click="handleDelete(scope.row)"
             alt=""
           />
@@ -272,7 +284,7 @@ import {
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import { dayjs,  EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -383,6 +395,7 @@ export default {
     }
   },
   activated() {
+    console.log(this.$permission('PERMISSIONS.BUYCONTRACTINFO_ADD'))
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();

src/views/contractManagement/purchaseContractAdd.vue

@@ -713,7 +713,7 @@ export default {
       this.deptBudgetList.finalTradingVolume = e
     },
     returnsales() {
-      this.$router.push({ path: 'purchaseContract' })
+      this.$router.push({ path: 'buyContract' })
     },
     loaddata() {
       // 包装方式
@@ -1252,7 +1252,7 @@ export default {
                 },
                 contractProcessInfo: {},
               }
-              this.$router.push({ path: 'purchaseContract' })
+              this.$router.push({ path: 'buyContract' })
             })
             .catch((req) => {
               EventBus.$emit('error', req.message)

src/views/contractManagement/purchaseContractEdit.vue

@@ -759,7 +759,7 @@ export default {
     handleExamine() {},
     approve() {},
     returnsales() {
-      this.$router.push({ path: 'purchaseContract' })
+      this.$router.push({ path: 'buyContract' })
     },
     selectChapterTwo(e) {
       for (var i = 0; i < this.ChapterTwoList.length; i++) {
@@ -1322,7 +1322,7 @@ export default {
             .toPromise()
             .then((response) => {
               this.$message.success('编辑成功')
-              this.$router.push({ path: 'purchaseContract' })
+              this.$router.push({ path: 'buyContract' })
             })
         } else {
           EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

src/views/contractManagement/purchaseContractExamine.vue

@@ -203,14 +203,9 @@
 <script>
 import {
   packList,
-  addList,
   xiala,
-  addxiala,
-  editxiala,
-  delxiala,
   examineList,
 } from '@/model/contarct/index'
-import { dayjs } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   watch: {
@@ -321,7 +316,7 @@ export default {
     handleExamine() {},
     approve() {},
     returnsales() {
-      this.$router.push({ path: 'purchaseContract' })
+      this.$router.push({ path: 'buyContract' })
     },
   },
 }

src/views/contractManagement/salesContract.vue

@@ -8,6 +8,9 @@
         <ws-button
           type="primary"
           @click="handleAdd()"
+          v-hasPermission="
+            `contractManagement.salesContract.salesContractInfo.add`
+          "
           ><img
             width="13"
             height="13"
@@ -24,7 +27,7 @@
         <ws-button
           @click="exportlist()"
           v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
+            `contractManagement.salesContract.salesContractInfo.view`
           "
           >导出</ws-button
         >
@@ -215,6 +218,9 @@
             style="vertical-align: text-top; margin: 0 6px"
             src="../../../public/img/chakan.png"
             @click="handleExamine(scope.row)"
+            v-hasPermission="
+            `contractManagement.salesContract.salesContractInfo.view`
+          "
             alt=""
           />
           <img
@@ -222,6 +228,9 @@
             height="16"
             style="vertical-align: text-top; margin: 0 6px"
             src="../../../public/img/bianji.png"
+            v-hasPermission="
+            `contractManagement.salesContract.salesContractInfo.edit`
+          "
             @click="handleEdit(scope.row)"
             alt=""
           />
@@ -235,6 +244,9 @@
               margin: 0 6px;
             "
             src="../../../public/img/shanchu.png"
+            v-hasPermission="
+            `contractManagement.salesContract.salesContractInfo.delete`
+          "
             @click="handleDelete(scope.row)"
             alt=""
           />

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

@@ -2,14 +2,14 @@ import Layout from '@/layout/index';
 
 const tranManagementRouter = {
 
-  path: '/taskManagement',
+  path: '/transportationTask',
   component: Layout,
   redirect: '/taskManagement',
-  name: 'taskManagement',
+  name: 'transportationTask',
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'taskManagement',
-    module: 'taskManagement',
+    module: 'transportationTask',
     icon: 'cg'
   },
   children: [
@@ -22,7 +22,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementTransport',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementTransport',
+        module: 'transportationTask.transportation.transportationInfo',
         permissicon: [],
         keepAlive: true
       },
@@ -38,7 +38,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementLook',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementLook',
+        module: 'transportationTask.transportation.transportationInfo.view',
         permissicon: [],
         keepAlive: true
       },
@@ -53,7 +53,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementTransportAdd',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementTransportAdd',
+        module: 'transportationTask.transportation.transportationInfo.add',
         permissicon: [],
         keepAlive: true
       },
@@ -68,7 +68,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementTransportEdit',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementTransportEdit',
+        module: 'transportationTask.transportation.transportationInfo.view',
         permissicon: [],
         keepAlive: true
       },
@@ -109,7 +109,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementWarehouseInOutTask',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementWarehouseInOutTask',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask',
         permissicon: [],
         keepAlive: true
       },
@@ -123,7 +123,7 @@ const tranManagementRouter = {
       meta: {
         title: 'inOutWarehouseTaskEdit',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.inOutWarehouseTaskEdit',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask.view',
       },
       hidden: true
     },
@@ -136,7 +136,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementWarehouseInOutTaskAdd',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementWarehouseInOutTaskAdd',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask.add',
         permissicon: [],
         keepAlive: true
       },
@@ -151,7 +151,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementWarehouseInOutTaskEdit',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementWarehouseInOutTaskEdit',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask.edit',
         permissicon: [],
         keepAlive: true
       },

src/views/taskManagement/tranManagementTransport.vue

@@ -46,6 +46,9 @@
       </template>
       <template slot="right">
         <ws-button class="but" type="primary" @click="handleAdd()"
+        v-hasPermission="
+           `transportationTask.transportation.transportationInfo.add`
+          "
           >添加</ws-button
         >
       </template>
@@ -82,7 +85,7 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="taskNo" label="运输任务编号" width="160">
+        <el-table-column prop="taskNo" label="运输任务编号" width="140">
         </el-table-column>
         <el-table-column prop="contractNo" label="合同编号" width="160">
         </el-table-column>
@@ -178,13 +181,22 @@
               编辑
             </ws-button>
             <ws-button @click="deleteclick(scope.row)"> 删除 </ws-button> -->
-            <div class="record" @click="nocomplete(scope.row)">
+            <div class="record" @click="nocomplete(scope.row)"
+            v-hasPermission="
+           `transportationTask.transportation.transportationInfo.view`
+          ">
               查看
             </div>
-            <div class="record" @click="delivery(scope.row)">
+            <div class="record" @click="delivery(scope.row)"
+            v-hasPermission="
+           `transportationTask.transportation.transportationInfo.edit`
+          ">
               编辑
             </div>
-            <div class="record" @click="deleteclick(scope.row)">
+            <div class="record" @click="deleteclick(scope.row)"
+            v-hasPermission="
+           `transportationTask.transportation.transportationInfo.delete`
+          ">
               删除
             </div>
           </template>
@@ -308,7 +320,6 @@ export default {
       } else {
         this.primary = 3
       }
-
       this.getList()
     },
     //编辑

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -3,6 +3,9 @@
    <div class="container">
       <div class="nav">
         <ws-button class="butt" type="primary" @click="handleAdd()"
+        v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfoTask.add`
+          "
           ><img
             width="13"
             height="13"
@@ -41,15 +44,15 @@
     <div class="nav2" >
        </div> 
     <div class="navv">
-        <ws-button class="but"  @click="handlestatus()">
+        <ws-button class="but" :type="primary == 1 ? 'primary' : ''"  @click="handlestatus(1)">
           待审核</ws-button>
-          <ws-button class="but"  @click="handlestatus()">
+          <ws-button class="but" :type="primary == 2 ? 'primary' : ''" @click="handlestatus(2)">
           已驳回</ws-button>
-        <ws-button class="but"  @click="handlestatus(1)">
+        <ws-button class="but" :type="primary == 3 ? 'primary' : ''"  @click="handlestatus(3)">
           执行中</ws-button
         >
-        <ws-button class="but" @click="handlestatus(2)">已完成</ws-button>
-        <ws-button class="but" type="primary" @click="handlestatus('')">全部任务</ws-button>
+        <ws-button class="but" :type="primary == 4 ? 'primary' : ''" @click="handlestatus(4)">已完成</ws-button>
+        <ws-button class="but" :type="primary == 5 ? 'primary' : ''" @click="handlestatus('')">全部任务</ws-button>
       <el-table
         class="wenzi"
         :data="gainList.records"
@@ -136,10 +139,15 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <div class="record" @click="nocomplete(scope.row)">
+            <div class="record" @click="nocomplete(scope.row)" v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfoTask.view`
+          ">
               查看
             </div>
             <div
+            v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfoTask.audit`
+          "
               v-if="scope.row.taskStatus == '待审核'"
               class="adjustment"
               @click="delivery(scope.row)"
@@ -147,6 +155,9 @@
               审核
             </div>
             <div
+            v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfoTask.edit`
+          "
               v-if="
                 scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
@@ -157,6 +168,9 @@
               编辑
             </div>
             <div
+            v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfoTask.delete`
+          "
               v-if="
                 scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
@@ -217,6 +231,7 @@ export default {
       year: '',
       gainList: [],
       currentPage: 1,
+      primary:'1',
       pageSize: 10,
       searchType: 1,
       searchTypeText: '未完成',
@@ -290,7 +305,7 @@ export default {
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        // searchType: this.searchType,
+        searchType: this.searchType,
         searchKeyWord: this.searchKeyWord,
       })
         .toPromise()
@@ -303,6 +318,17 @@ export default {
         })
     },
     handlestatus(status) {
+      if (status == 1) {
+        this.primary = 1
+      } else if (status == 2) {
+        this.primary = 2
+      }else if (status == 3) {
+        this.primary = 3
+      }else if (status == 4) {
+        this.primary = 4
+      } else {
+        this.primary = 5
+      }
       this.searchType = status
       this.getList()
     },

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

@@ -1,42 +1,42 @@
 import Layout from '@/layout/index';
 
 const tranManagementRouter = {
-  path: '/tranManagement',
+  path: '/transportationTask/transportation',
   component: Layout,
-  redirect: '/tranManagement',
-  name: 'tranManagement',
+  redirect: '/transportationTask',
+  name: 'transportationTask',
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'tranManagement',
-    module: 'tranManagement',
+    module: 'transportationTask.transportation',
     icon: 'cg'
   },
   children: [
 
     //火运调度
     {
-      path: 'tranManagementTransporTationFire',
+      path: 'fireDispatching',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransporTationFire'),
-      name: 'tranManagementTransporTationFire',
+      name: 'fireDispatching',
       meta: {
         title: 'tranManagementTransporTationFire',
-        shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementTransporTationFire',
+        shortcutEntrance: 'transportationTask',
+        module: 'transportationTask.transportation.fireDispatching',
         permissicon: [],
         keepAlive: true
       },
     },
     //车次安排
     {
-      path: 'tranManagementTransporTrainNo',
+      path: 'fireDispatching/car',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransporTrainNo'),
-      name: 'tranManagementTransporTrainNo',
+      name: 'fireDispatchingcar',
       meta: {
         title: 'tranManagementTransporTrainNo',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementTransporTrainNo',
+        module: 'transportationTask.transportation.fireDispatching.car',
         permissicon: [],
         keepAlive: true
       },
@@ -44,14 +44,14 @@ const tranManagementRouter = {
     },
     //火运调度详情
     {
-      path: 'tranManagementTransporTrainDetails',
+      path: 'fireDispatching/view',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransporTrainDetails'),
-      name: 'tranManagementTransporTrainDetails',
+      name: 'fireDispatchingview',
       meta: {
         title: 'tranManagementTransporTrainDetails',
-        shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementTransporTrainDetails',
+        shortcutEntrance: 'transportationTask',
+        module: 'transportationTask.transportation.fireDispatching.view',
         permissicon: [],
         keepAlive: true
       },
@@ -59,14 +59,14 @@ const tranManagementRouter = {
     },
     //船次安排
     {
-      path: 'tranManagementShippingArrangemen',
+      path: 'shippingDispatching/car',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementShippingArrangemen'),
-      name: 'tranManagementShippingArrangemen',
+      name: 'shippingDispatchingcar',
       meta: {
         title: 'tranManagementShippingArrangemen',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementShippingArrangemen',
+        module: 'transportationTask.transportation.shippingDispatching.car',
         permissicon: [],
         keepAlive: true
       },
@@ -75,14 +75,14 @@ const tranManagementRouter = {
     },
     //船运调度详情
     {
-      path: 'tranManagementShippingLook',
+      path: 'shippingDispatching/view',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementShippingLook'),
-      name: 'tranManagementShippingLook',
+      name: 'tshippingDispatchingview',
       meta: {
         title: 'tranManagementShippingLook',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementShippingLook',
+        module: 'transportationTask.transportation.shippingDispatching.view',
         permissicon: [],
         keepAlive: true
       },
@@ -104,31 +104,16 @@ const tranManagementRouter = {
       },
       hidden: true
     },
-    //编辑司机
-    {
-      path: 'tranManagementDriverEdit',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverEdit'),
-      name: 'tranManagementDriverEdit',
-      meta: {
-        title: 'tranManagementDriverEdit',
-        shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementDriverEdit',
-        permissicon: [],
-        keepAlive: true
-      },
-      hidden: true
-    },
     //汽运调度
     {
-      path: 'tranManagementVehicle',
+      path: 'vehicleDispatching',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementVehicle'),
-      name: 'tranManagementVehicle',
+      name: 'vehicleDispatching',
       meta: {
         title: 'tranManagementVehicle',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementVehicle',
+        module: 'transportationTask.transportation.vehicleDispatching',
         permissicon: [],
         keepAlive: true
       },
@@ -136,14 +121,14 @@ const tranManagementRouter = {
     },
     //船运调度
     {
-      path: 'tranManagementShipping',
+      path: 'shippingDispatching',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementShipping'),
-      name: 'tranManagementShipping',
+      name: 'shippingDispatching',
       meta: {
         title: 'tranManagementShipping',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementShipping',
+        module: 'transportationTask.transportation.shippingDispatching',
         permissicon: [],
         keepAlive: true
       },
@@ -151,14 +136,14 @@ const tranManagementRouter = {
     },
     //编辑司机
     {
-      path: 'tranManagementDriverEdit',
+      path: 'driverManagement/edit',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverEdit'),
-      name: 'tranManagementDriverEdit',
+      name: 'driverManagementedit',
       meta: {
         title: 'tranManagementDriverEdit',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementDriverEdit',
+        module: 'transportationTask.transportation.driverManagement.edit',
         permissicon: [],
         keepAlive: true
       },
@@ -166,28 +151,28 @@ const tranManagementRouter = {
     },
     //司机查看
     {
-      path: 'tranManagementDriverLook',
+      path: 'driverManagement/view',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverLook'),
-      name: 'tranManagementDriverLook',
+      name: 'driverManagementview',
       meta: {
         title: 'tranManagementDriverLook',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementDriverLook',
+        module: 'transportationTask.transportation.driverManagement.edit',
         permissicon: [],
         keepAlive: true
       },
       hidden: true
     }, //司机添加
     {
-      path: 'tranManagementDriverAdd',
+      path: 'driverManagement/add',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverAdd'),
-      name: 'tranManagementDriverAdd',
+      name: 'driverManagementadd',
       meta: {
         title: 'tranManagementDriverAdd',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementDriverAdd',
+        module: 'transportationTask.transportation.driverManagement.add',
         permissicon: [],
         keepAlive: true
       },
@@ -195,14 +180,14 @@ const tranManagementRouter = {
     },
     //汽车调度
     {
-      path: 'tranManagementVehicleDispatching',
+      path: 'vehicleDispatching/car',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementVehicleDispatching'),
-      name: 'tranManagementVehicleDispatching',
+      name: 'vehicleDispatchingcar',
       meta: {
         title: 'tranManagementVehicleDispatching',
-        shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementVehicleDispatching',
+        shortcutEntrance: 'transportationTask',
+        module: 'transportationTask.transportation.vehicleDispatching.car',
         permissicon: [],
         keepAlive: true
       },
@@ -210,14 +195,14 @@ const tranManagementRouter = {
     },
     //查看派车详情
     {
-      path: 'tranManagementVehicleLook',
+      path: 'vehicleDispatching/view',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementVehicleLook'),
-      name: 'tranManagementVehicleLook',
+      name: 'vehicleDispatchingview',
       meta: {
         title: 'tranManagementVehicleLook',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementVehicleLook',
+        module: 'transportationTask.transportation.vehicleDispatching.view',
         permissicon: [],
         keepAlive: true
       },
@@ -225,14 +210,14 @@ const tranManagementRouter = {
     },
     //司机管理
     {
-      path: 'tranManagementDriver',
+      path: 'driverManagement',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriver'),
-      name: 'tranManagementDriver',
+      name: 'driverManagement',
       meta: {
         title: 'tranManagementDriver',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver',
+        module: 'transportationTask.transportation.driverManagement',
         permissicon: [],
         keepAlive: true
       }
@@ -246,7 +231,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementTransporHairRespond',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementTransporHairRespond',
+        module: 'transportationTask.transportation',
         permissicon: [],
         keepAlive: true
       }
@@ -260,7 +245,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementTransporFeedback',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementTransporFeedback',
+        module: 'transportationTask.transportation',
         permissicon: [],
         keepAlive: true
       },
@@ -276,7 +261,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementTransporFeedbackLook',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementTransporFeedbackLook',
+        module: 'transportationTask.transportation',
       },
       hidden: true
     },
@@ -290,7 +275,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementReceivingFeedback',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementDriver.tranManagementReceivingFeedback',
+        module: 'transportationTask.transportation',
         permissicon: [],
 
       },
@@ -304,7 +289,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementReceivingloading',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementReceivingloading',
+        module: 'transportationTask.transportation',
         permissicon: [],
         keepAlive: true
       },
@@ -319,7 +304,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementReceivingloadingLook',
         shortcutEntrance: 'tranManagement',
-        module: 'tranManagement.tranManagementReceivingloadingLook',
+        module: 'transportationTask.transportation',
         permissicon: [],
         keepAlive: true
       },

src/views/tranManagement/tranManagementDriver.vue

@@ -237,7 +237,6 @@
             <el-button
               v-if="scope.row.disableStatusFlag != 1"
               size="medium"
-              class="record"
               type="text"
               @click="stop(scope.row)"
               >禁用</el-button
@@ -441,7 +440,7 @@ export default {
     },
     edit(row) {
       this.$router.push({
-        name: 'tranManagementDriverEdit',
+        name: 'driverManagementedit',
         query: { id: row.id },
       })
     },
@@ -459,16 +458,14 @@ export default {
     },
     look(row) {
       this.$router.push({
-        name: 'tranManagementDriverLook',
+        name: 'driverManagementview',
         query: { id: row.id },
       })
     },
     //添加
     handleAdd() {
-      this.$router.push({ path: 'tranManagementDriverAdd' })
-    },
-    handleDelete() {
-      this.$router.push({ path: 'warehouseManagementDelete' })
+      console.log(11111)
+      this.$router.push({ name: 'driverManagementadd' })
     },
     selectcar(e, row) {
       console.log(e, row)

src/views/tranManagement/tranManagementDriverAdd.vue

@@ -745,7 +745,7 @@ export default {
       this.selectedOptions = value
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementDriver' })
+      this.$router.go(-1)
     },
     // confirmPosition() {
     //   this.draggable = false
@@ -964,7 +964,7 @@ export default {
                   bankCard: '',
                 },
               ]
-              this.$router.push({ path: 'tranManagementDriver' })
+              this.$router.go(-1)
             })
         } else {
           EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

src/views/tranManagement/tranManagementDriverLook.vue

@@ -348,7 +348,7 @@ export default {
       this.selectedOptions = value
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementDriver' })
+      this.$router.go(-1)
     },
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -3,11 +3,11 @@
   <div>
     <BaseHeaderLayout :leftSpan="13">
       <template slot="left">
-        <ws-button class="but"  @click="statusquery(1)">
+        <ws-button class="but" :type="primary == 1 ? 'primary' : ''" @click="statusquery(1)">
           执行中</ws-button
         >
-        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
-        <ws-button class="but" @click="statusquery()">全部任务</ws-button>
+        <ws-button class="but" :type="primary == 2 ? 'primary' : ''" @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but" :type="primary == 3 ? 'primary' : ''" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="right">
@@ -54,7 +54,7 @@
         class="wenzi"
         :data="warehouseList.records"
         style="width: 100%; margin-top: 20px"
-        height="780"
+        height="650"
       >
         <el-table-column type="index" label="序号" width="80">
           <template scope="scope">
@@ -207,7 +207,7 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
-      searchType: 1,
+      feedbackFlag: 1,
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
@@ -215,6 +215,7 @@ export default {
       // 提交类型
       submitType: true,
       size: 10,
+      primary:'1',
       spanArr: [],
       warehouseName: '',
       deptBudgetTotal: 0,
@@ -239,13 +240,11 @@ export default {
   methods: {
       //接口
     getList() {
-        console.log(765)
       shippingList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        contractType: this.contractType,
-        searchType: this.searchType,
+        feedbackFlag: this.feedbackFlag,
         
       })
         .toPromise()
@@ -257,7 +256,14 @@ export default {
         })
     },
     statusquery(status){
-      this.searchType = status
+      if (status == 1) {
+        this.primary = 1
+      } else if (status == 2) {
+        this.primary = 2
+      } else {
+        this.primary = 3
+      }
+      this.feedbackFlag = status
       this.getList()
     },
     delivery(item) {
@@ -432,29 +438,6 @@ export default {
       this.currentPage = 1
       this.getList()
     },
-    async exportlist() {
-      const { data } = await export1(
-        {
-          compId: sessionStorage.getItem('ws-pf_compId'),
-          contractType: this.contractType,
-          currentPage: this.currentPage,
-          pageSize: this.pageSize,
-          searchType: this.searchType,
-          searchKeyWord: this.searchKeyWord,
-          startDate: this.startDate,
-          endDate: this.endDate,
-        },
-        {},
-        { responseType: 'blob' }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }_采购合同`,
-        type: 'xls',
-      })
-    },
   },
 }
 </script>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -3,11 +3,6 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" type="primary" @click="statusquery(1)">
-          执行中</ws-button
-        >
-        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
-        <ws-button class="but" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="right">
@@ -50,11 +45,16 @@
       </template>
     </BaseHeaderLayout>
     <div class="container">
+       <ws-button class="but"  :type="primary == 1 ? 'primary' : ''" @click="statusquery(1)">
+          执行中</ws-button
+        >
+        <ws-button class="but"  :type="primary == 2 ? 'primary' : ''" @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but"  :type="primary == 3 ? 'primary' : ''" @click="statusquery()">全部任务</ws-button>
       <el-table
         class="wenzi"
         :data="tranManagementList.records"
         style="width: 100%; margin-top: 20px"
-        height="780"
+        height="680"
       >
         <el-table-column type="index" label="序号" width="80">
           <template scope="scope">
@@ -141,18 +141,17 @@
         <el-table-column prop="receivingDate" class="table_td" label="接单日期">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
-          <template slot-scope="scope">
-            <div class="record" @click="trainSee(scope.row)">查看</div>
-            <div
-              class="adjustment"
-              @click="feedback(scope.row)"
-              v-show="
+          <template  slot-scope="scope">
+              <template v-if="
                 scope.row.tranType == '汽运' &&
                 scope.row.feedbackStatus != '已完成'
-              "
-            >
-              反馈
-            </div>
+              ">
+                <div class="record" @click="trainSee(scope.row)">查看</div>
+                <div class="adjustment" @click="feedback(scope.row)">反馈</div>
+              </template>
+              <template v-else>
+                <div class="record1" @click="trainSee(scope.row)">查看</div>
+              </template>
           </template>
         </el-table-column>
       </el-table>
@@ -199,11 +198,12 @@ export default {
       searchKeyWord: '',
       contractType: 2,
       tranTypeKey: 2,
-      searchTypeFeedback: 1,
+      feedbackFlag: 1,
       searchTypeOne: 1,
       // 提交类型
       submitType: true,
       size: 10,
+      primary:'1',
       spanArr: [],
       warehouseName: '',
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -272,7 +272,14 @@ export default {
       })
     },
     statusquery(status) {
-      this.searchTypeFeedback = status
+       if (status == 1) {
+        this.primary = 1
+      } else if (status == 2) {
+        this.primary = 2
+      } else {
+        this.primary = 3
+      }
+      this.feedbackFlag = status
       this.getList()
     },
     dateFormat(fmt, date) {
@@ -313,8 +320,7 @@ export default {
     getList() {
       automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
-        searchTypeFeedback: this.searchTypeFeedback,
+        feedbackFlag: this.feedbackFlag,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
       })
@@ -399,7 +405,7 @@ export default {
 }
 
 //操作按钮
-.record,
+.record,.record1,
 .adjustment {
   display: inline-block;
   color: #5878e8;
@@ -453,23 +459,19 @@ export default {
 /deep/.el-table tr th.is-leaf:first-child {
   border-left: 1px solid #e9ecf7;
 }
-
-.el-row {
-  height: 150px;
-}
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
 //待完成三按钮
 .but {
-  margin-top: 150px;
-  margin-left: 110px;
+  margin-top: 10px;
+  margin-left: 10px;
 }
 .el-input--small .el-input__inner {
   margin-left: 20px;
 }
 .el-range-editor--small.el-input__inner {
   height: 32px;
-  margin: 0 10px;
+margin:0 10px;
 }
 </style>

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -157,8 +157,20 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <div class="record" @click="trainSee(scope.row)">查看</div>
-            <div class="adjustment" @click="trainNumber(scope.row)">车次</div>
+             <div
+              class="record"
+              @click="trainSee(scope.row)"
+              v-hasPermission="'transportationTask.transportation.fireDispatching.view'"
+            >
+              查看
+            </div>
+             <div
+              class="adjustment"
+              @click="trainNumber(scope.row)"
+              v-hasPermission="'transportationTask.transportation.fireDispatching.car'"
+            >
+              车次
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -169,7 +181,10 @@
 import { automobileList, alsostate } from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import {  EventBus } from 'base-core-lib'
+import {
+  billoperatehis,
+} from '@/model/contarct/index'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -263,7 +278,7 @@ export default {
     //查看火运调度详细
     trainSee(row) {
       this.$router.push({
-        path: 'tranManagementTransporTrainDetails',
+        name: 'fireDispatchingview',
         query: {
           id: row.id,
         },
@@ -272,7 +287,7 @@ export default {
     //车次
     trainNumber(row) {
       this.$router.push({
-        path: 'tranManagementTransporTrainNo',
+        name: 'fireDispatchingcar',
         query: {
           id: row.id,
         },

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -92,6 +92,7 @@
       <div
         class="liaison"
         v-for="(item, index) in deptBudgetList.tranCarInfoList"
+        :key='index'
       >
         <ws-info-table>
           <!--姓名-->
@@ -214,7 +215,7 @@
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
+import { regionData } from 'element-china-area-data'
 import { seeCat, dispatchCat, packList } from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
@@ -355,7 +356,7 @@ export default {
       this.deptBudgetList = {}
       this.freightspace = []
       this.selectedOptions = ''
-      this.$router.push({ path: 'tranManagementTransporTationFire' })
+      this.$router.go(-1)
     },
     // confirmPosition() {
     //   this.draggable = false
@@ -466,9 +467,7 @@ export default {
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''
-                  this.$router.push({
-                    path: 'tranManagementTransporTationFire',
-                  })
+                  this.$router.go(-1)
                 })
             } else {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
@@ -573,36 +572,6 @@ export default {
         }
       }
     },
-    // 编辑
-    editClick(item, index) {
-      const map = JSON.parse(JSON.stringify(item))
-      if (Object.is(item.id, 1)) {
-        return
-      }
-      if (Object.is(this.unitList[index].flag, 'delete')) {
-        map.flag = 'check'
-        this.$set(this.unitList, index, map)
-      } else {
-        map.flag = 'delete'
-        this.$set(this.unitList, index, map)
-      }
-    },
-    // 删除
-    deleteClick(item, index) {
-      if (Object.is(item.constKey, 1)) {
-        return
-      }
-      if (!item.constValue) {
-        this.unitList.splice(index, 1)
-        return
-      }
-      delxiala({ id: this.unitList[index].id })
-        .toPromise()
-        .then((response) => {
-          this.getUnitList()
-          this.pleaseChoose = ''
-        })
-    },
   },
 }
 </script>

src/views/tranManagement/tranManagementVehicle.vue

@@ -98,7 +98,7 @@
               </template>
               <div>
                 <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
-                <div v-for="(item, index) in historyList" class="flex">
+                <div v-for="(item, index) in historyList" :key='index' class="flex">
                   <div class="vertical-text vertical-text-left">
                     {{ item.updateDate }}
                   </div>
@@ -149,10 +149,12 @@
 </template>
 <script>
 import { automobileList,alsostate } from '@/model/transport/index'
-import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import {  EventBus } from 'base-core-lib'
+import {
+  billoperatehis,
+} from '@/model/contarct/index'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -214,23 +216,10 @@ export default {
     this.showType = this.isShow
   },
   methods: {
-    //出库
-    delivery(item) {
-      this.$router.push({
-        path: 'warehouseManagementDelivery',
-        query: {
-          baseId: item.warehouseId,
-          positionId: item.binNumberId,
-          warehouseName: item.warehouseName,
-          binNumber: item.binNumber,
-          capacity: item.capacity,
-        },
-      })
-    },
     //派车
     warehousing(item) {
       this.$router.push({
-        path: 'tranManagementVehicleDispatching',
+        name: 'vehicleDispatchingcar',
         query: {
           id: item.id,
         },
@@ -270,7 +259,7 @@ export default {
     //查看//传参
     nocomplete(row) {
       this.$router.push({
-        path: 'tranManagementVehicleLook',
+        name: 'vehicleDispatchingview',
         query: {
           id: row.id,
         },

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -103,6 +103,7 @@
           <div
             class="driver position liaison"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
+            :key='index'
           >
             <ws-info-table>
               <div class="catNos">
@@ -364,7 +365,7 @@ export default {
   methods: {
     //返回按钮
     revert() {
-      this.$router.push({ path: 'tranManagementVehicle' })
+      this.$router.go(-1)
     },
     del(index) {
       if (this.deptBudgetList.tranCarInfoList.length > 1) {

src/views/tranManagement/tranManagementVehicleLook.vue

@@ -89,6 +89,7 @@
         style="width: 100%"
         class="driver"
         v-for="(item, index) in deptBudgetList.tranCarInfoList"
+        :key='index'
       >
         <ws-info-table>
           <div class="catNos">
@@ -136,12 +137,11 @@
   </div>
 </template>
 <script>
-import { pullDown, addstorageputList } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import { seeCat } from '@/model/transport/index'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
-import { dayjs, EventBus } from 'base-core-lib'
+import { dayjs } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -225,7 +225,7 @@ export default {
   methods: {
     //返回按钮
     revert() {
-      this.$router.push({ path: 'tranManagementVehicle' })
+      this.$router.go(-1)
     },
     del(index) {
       if (this.freightspace.length > 1) {

src/views/warehouse/component/router/index.js

@@ -8,7 +8,7 @@ const warehouseManagementRouter = {
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'warehouseManagementList',
-    module: 'warehouse',
+    module: 'warehouseManagement',
     icon: 'cg'
   },
   children: [
@@ -20,7 +20,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementList',
         shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouse.warehouseManagementList',
+        module: 'warehouseManagement.warehouse',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -36,7 +36,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementAdd',
         shortcutEntrance: 'warehouseManagementAdd',
-        module: 'warehouse.warehouseManagementAdd',
+        module: 'warehouseManagement.warehouse.warehouseInfo.add',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -53,7 +53,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementEdit',
         shortcutEntrance: 'warehouseManagementEdit',
-        module: 'warehouse.warehouseManagementEdit',
+        module: 'warehouseManagement.warehouse.warehouseInfo.edit',
         permissicon: [],
         keepAlive: true
       },
@@ -67,7 +67,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementLook',
         shortcutEntrance: 'warehouseManagementLook',
-        module: 'warehouse.warehouseManagementLook',
+        module: 'warehouseManagement.warehouse.warehouseInfo.view',
 
         permissicon: [],
         keepAlive: true
@@ -84,7 +84,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementPut',
         shortcutEntrance: 'warehouseManagementPut',
-        module: 'warehouse.warehouseManagementPut',
+        module: 'warehouseManagement.warehouse.warehouseInfo.in',
       },
       hidden: true
     },
@@ -96,7 +96,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementDelete',
         shortcutEntrance: 'warehouseManagementDelete',
-        module: 'warehouse.warehouseManagementDelete',
+        module: 'warehouseManagement.warehouse.warehouseInfo.delete',
 
         permissicon: [],
         keepAlive: true
@@ -113,7 +113,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementDelivery',
         shortcutEntrance: 'warehouseManagementDelivery',
-        module: 'warehouse.warehouseManagementDelivery',
+        module: 'warehouseManagement.warehouse.warehouseInfo.out',
       },
       hidden: true
     },
@@ -125,8 +125,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementIoss',
         shortcutEntrance: 'warehouseManagementIoss',
-        module: 'warehouse.warehouseManagementIoss',
-
+        module: 'warehouseManagement.warehouse.warehouseInfo.debit',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -142,7 +141,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementIossRecord',
         shortcutEntrance: 'warehouseManagementIossRecord',
-        module: 'warehouse.warehouseManagementIossRecord',
+        module: 'warehouseManagement.warehouse.warehouseInfo.debit',
 
         permissicon: [],
         keepAlive: true
@@ -159,7 +158,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementRecord',
         shortcutEntrance: 'warehouseManagementRecord',
-        module: 'warehouse.warehouseManagementRecord',
+        module: 'warehouseManagement.warehouse.warehouseInfo.view',
 
         permissicon: [],
         keepAlive: true
@@ -177,7 +176,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementNoComplete',
         shortcutEntrance: 'warehouseManagementNoComplete',
-        module: 'warehouse.warehouseManagementNoComplete',
+        module: 'warehouseManagement.warehouse.warehouseInfo.view',
         permissicon: [],
         keepAlive: true
       },
@@ -191,7 +190,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementPerfectput',
         shortcutEntrance: 'warehouseManagementPerfectput',
-        module: 'warehouse.warehouseManagementPerfectput',
+        module: 'warehouseManagement.warehouse.warehouseInfo.in',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -206,7 +205,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementPerfectDelivery',
         shortcutEntrance: 'warehouseManagementPerfectDelivery',
-        module: 'warehouse.warehouseManagementPerfectDelivery',
+        module: 'warehouseManagement.warehouse.warehouseInfo.out',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -238,7 +237,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementPutOutLook',
         shortcutEntrance: 'warehouseManagementPutOutLook',
-        module: 'warehouse.warehouseManagementPutOutLook',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'

src/views/warehouse/warehouseManagementList.vue

@@ -4,6 +4,9 @@
     <BaseHeaderLayout :leftSpan="20">
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()"
+        v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.add`
+          "
           ><img
             width="11"
             height="11"
@@ -14,10 +17,18 @@
           添加</ws-button
         >
 
-        <ws-button @click="handleLook()">查看</ws-button>
-        <ws-button @click="handleEdit()">编辑</ws-button>
-        <ws-button @click="handleDelete()">删除</ws-button>
-        <ws-button @click="handlTask()">任务</ws-button>
+        <ws-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.view`
+          " @click="handleLook()">查看</ws-button>
+        <ws-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.edit`
+          " @click="handleEdit()">编辑</ws-button>
+        <ws-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.deiete`
+          " @click="handleDelete()">删除</ws-button>
+        <ws-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.view`
+          " @click="handlTask()">任务</ws-button>
       </template>
       <template slot="left">
         <div style="margin-top: 2px">
@@ -118,21 +129,31 @@
         </el-table-column>
         <el-table-column prop="seller" label="出入库" width="300">
           <template slot-scope="scope">
-            <ws-button class="completed" @click="nocomplete(scope.row)">
+            <ws-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.view`
+          " class="completed" @click="nocomplete(scope.row)">
               待完成（{{ scope.row.number }}）
             </ws-button>
-            <ws-button class="putstorage" @click="warehousing(scope.row)">
+            <ws-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.in`
+          " class="putstorage" @click="warehousing(scope.row)">
               入库
             </ws-button>
-            <ws-button class="deliverystorage" @click="delivery(scope.row)">
+            <ws-button v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.out`
+          " class="deliverystorage" @click="delivery(scope.row)">
               出库
             </ws-button>
           </template>
         </el-table-column>
         <el-table-column prop="address" label="操作" width="200">
           <template slot-scope="scope">
-            <div class="record" @click="record(scope.row)">记录</div>
-            <div class="adjustment" @click="loss(scope.row)">盘损</div>
+            <div class="record" v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.view`
+          " @click="record(scope.row)">记录</div>
+            <div class="adjustment" v-hasPermission="
+           `warehouseManagement.warehouse.warehouseInfo.view`
+          " @click="loss(scope.row)">盘损</div>
           </template>
         </el-table-column>
       </el-table>

vue.config.js

@@ -139,7 +139,6 @@ module.exports = {
         logLevel: 'debug',
       },
       '/pb': {
-
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',