Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/customerFundManagement/component/router/router.js

@@ -8,7 +8,7 @@ const customerFundManagementRouter = {
     alwaysShow: true, // will always show the root menu
     meta: {
       title: 'customerFundList',
-    //   module: 'customerManagement.customer.customerInfo',
+      module: 'customerMoneyManagement.customerMoney.view',
       icon: '-kehuzijin'
     },
     children: [
@@ -21,7 +21,7 @@ const customerFundManagementRouter = {
         meta: {
           title: 'customerFundList',
           shortcutEntrance: 'customerFundList',
-        //   module: 'customerManagement.customerFundManagement.customerInfo',
+          module: 'customerMoneyManagement.customerMoney.view',
           permissicon: [],
           keepAlive: true
         },
@@ -36,7 +36,7 @@ const customerFundManagementRouter = {
         meta: {
           title: 'customerFundEdit',
           shortcutEntrance: 'customerFundManagement',
-        //   module: 'customerFundManagement.buyContract.buyContractInfo.edit',
+          module: 'customerMoneyManagement.customerMoney.edit',
           permissicon: [],
           keepAlive: true
         },
@@ -51,7 +51,7 @@ const customerFundManagementRouter = {
         meta: {
           title: 'customerFundAdd',
           shortcutEntrance: 'customerFundManagement',
-        //   module: 'customerFundManagement.buyContract.buyContractInfo.add',
+          module: 'customerMoneyManagement.customerMoney.audit',
           permissicon: [],
           keepAlive: true
           // module: 'procurement.sparepart.applDetail'

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

@@ -112,7 +112,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementVehicle',
         shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.vehicleDispatching',
+        module: 'tranManager.vehicleDispatching',
         permissicon: [],
         keepAlive: true
       },
@@ -187,7 +187,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementVehicleDispatching',
         shortcutEntrance: 'transportationTask',
-        module: 'transportationTask.transportation.vehicleDispatching.car',
+        module: 'tranManager.vehicleDispatching.car',
         permissicon: [],
         keepAlive: true
       },
@@ -202,7 +202,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementVehicleLook',
         shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.vehicleDispatching.view',
+        module: 'tranManager.vehicleDispatching.view',
         permissicon: [],
         keepAlive: true
       },

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -241,7 +241,7 @@
                 label="卸车日期:"
                 span="1"
                 prop="receiveDateEnd"
-                style="width: 275px"
+                style="width: 340px"
               >
                 <ws-date-picker
                   v-model="item.receiveDateEnd"
@@ -801,7 +801,7 @@ export default {
   left: 0;
 }
 .el-form {
-  padding: 0 10%;
+  padding: 0 5%;
 }
 .el-button--primary {
   background-color: #5878e8;

src/views/tranManagement/tranManagementVehicle.vue

@@ -149,10 +149,10 @@
         <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
             <div v-hasPermission="
-                'transportationTask.transportation.vehicleDispatching.view'
+                'tranManager.vehicleDispatching.view'
               " class="record" @click="nocomplete(scope.row)">查看</div>
             <div v-hasPermission="
-                'transportationTask.transportation.vehicleDispatching.car'
+                'tranManager.vehicleDispatching.car'
               " class="adjustment" @click="warehousing(scope.row)">派车</div>
           </template>
         </el-table-column>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -115,7 +115,7 @@
               <div v-if="deptBudgetList.priceStatus=='审核中'">
                 <el-button
               type="primary"
-              v-hasPermission="`tranManager.transportationInfo.exe`"
+              v-hasPermission="`tranManager.vehicleDispatching.price`"
               size="small"
               @click="examine()"
               >审核中</el-button