Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/profitable/cashoutaduitNQ.vue

@@ -120,7 +120,10 @@
           </el-table>
         <!-- 经营性费用不分配 -->
         <div v-if='deptBudgetList.expensesPurpose!=5'>
-          <div style='margin:0 50px 10px;font-weight:bold'>费用分配</div>
+          <div style="display:flex">
+            <div style='margin:0 50px 10px;font-weight:bold'>费用分配</div>
+            <div>可分配金额{{deptBudgetList.unallocatedAmount}}元</div>
+          </div>
         <div style='margin:10px auto;width:90%;display: flex;'>
             <ws-select v-model="mode" placeholder="费用分配方式" class="typeselect" @change="modeselect">
           <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"
@@ -421,13 +424,13 @@
           if (this.moneys == '按重量自动分配') {
             for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
               if (i != this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.amountMoney)
+                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.unallocatedAmount)
                 if (this.feeDetailsDistributions[i].distributionMoney) {
                   moneyDiff += Number(this.feeDetailsDistributions[i].distributionMoney)
                 }
               }
               if (i == this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.amountMoney - moneyDiff
+                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.unallocatedAmount - moneyDiff
               }
               money = this.feeDetailsDistributions[i].distributionMoney + moneyDiff
             }
@@ -514,13 +517,13 @@
         }
         for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
           if (i != this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.amountMoney)
+                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.unallocatedAmount)
                 if (this.feeDetailsDistributions[i].distributionMoney) {
                   moneyDiff += Number(this.feeDetailsDistributions[i].distributionMoney)
                 }
               }
               if (i == this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.amountMoney - moneyDiff
+                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.unallocatedAmount - moneyDiff
               }
               money = this.feeDetailsDistributions[i].distributionMoney + moneyDiff
         }
@@ -554,7 +557,7 @@
           }
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             // console.log(weight,this.feeDetailsDistributions[i].inWarehouseWeight)
-              this.feeDetailsDistributions[i].distributionMoney=Math.round((this.feeDetailsDistributions[i].inWarehouseWeight/weight)*this.deptBudgetList.amountMoney)
+              this.feeDetailsDistributions[i].distributionMoney=Math.round((this.feeDetailsDistributions[i].inWarehouseWeight/weight)*this.deptBudgetList.unallocatedAmount)
               money+=this.feeDetailsDistributions[i].distributionMoney
 
           }
@@ -671,7 +674,7 @@
           }
         }
         if(this.mode=='全部分配'){
-          if(this.amount!=this.deptBudgetList.amountMoney){
+          if(this.amount!=this.deptBudgetList.unallocatedAmount){
             this.$message({
                 message: '请款金额与分配金额不相等!',
                 type: 'warning',
@@ -680,7 +683,7 @@
           }
         }
         if(this.mode=='部分分配'){
-          if(this.amount>this.deptBudgetList.amountMoney){
+          if(this.amount>this.deptBudgetList.unallocatedAmount){
             this.$message({
                 message: '分配金额不可超过请款金额!',
                 type: 'warning',
@@ -796,13 +799,13 @@
                 }
                 for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
                   if (i != this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.amountMoney)
+                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.unallocatedAmount)
                 if (this.feeDetailsDistributions[i].distributionMoney) {
                   moneyDiff += Number(this.feeDetailsDistributions[i].distributionMoney)
                 }
               }
               if (i == this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.amountMoney - moneyDiff
+                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.unallocatedAmount - moneyDiff
               }
               money = this.feeDetailsDistributions[i].distributionMoney + moneyDiff
               

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

@@ -27,140 +27,6 @@ const profitableRouter = {
     //     // module: 'procurement.sparepart.applDetail'
     //   }
     // },  
-      // 合同利润
-      {
-        path: 'contractprofits',
-        component: () =>
-          import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractprofits'),
-        name: 'contractprofits',
-        meta: {
-          title: 'contractprofits',
-          shortcutEntrance: 'profitable',
-          module: 'lirunhesuan',
-          permissicon: [],
-          keepAlive: true,
-          _title:'合同利润'
-          // module: 'procurement.sparepart.applDetail'
-        }
-      },  
-     // 合同利润详情
-     {
-      path: 'contractprofitsdetails',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractprofitsdetails'),
-      name: 'contractprofitsdetails',
-      meta: {
-        title: 'contractprofitsdetails',
-        shortcutEntrance: 'profitable',
-        module: 'lirunhesuan',
-        permissicon: [],
-        keepAlive: true,
-        _title:'合同利润详情'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden:true,
-    }, 
-    // 合同利润库存
-    {
-      path: 'contractinventory',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractinventory'),
-      name: 'contractinventory',
-      meta: {
-        title: 'contractinventory',
-        shortcutEntrance: 'profitable',
-        module: 'lirunhesuan',
-        permissicon: [],
-        keepAlive: true,
-        _title:'合同利润库存'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden:true,
-    },
-    // 合同利润费用
-    {
-      path: 'contractcost',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractcost'),
-      name: 'contractcost',
-      meta: {
-        title: 'contractcost',
-        shortcutEntrance: 'profitable',
-        module: 'lirunhesuan',
-        permissicon: [],
-        keepAlive: true,
-        _title:'合同利润费用'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden:true,
-    },
-    // 库点利润
-    {
-      path: 'warehouseprofits',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehouseprofits'),
-      name: 'warehouseprofits',
-      meta: {
-        title: 'warehouseprofits',
-        shortcutEntrance: 'profitable',
-        module: 'lirunhesuan',
-        permissicon: [],
-        keepAlive: true,
-        _title:'库点利润'
-        // module: 'procurement.sparepart.applDetail'
-      }
-    }, 
-    // 库点利润详情
-     {
-      path: 'warehouseprofitsdetails',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehouseprofitsdetails'),
-      name: 'warehouseprofitsdetails',
-      meta: {
-        title: 'warehouseprofitsdetails',
-        shortcutEntrance: 'profitable',
-        module: 'lirunhesuan',
-        permissicon: [],
-        keepAlive: true,
-        _title:'库点利润详情'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden:true,
-    }, 
-    // 库点利润库存
-    {
-      path: 'warehouseinventory',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehouseinventory'),
-      name: 'warehouseinventory',
-      meta: {
-        title: 'warehouseinventory',
-        shortcutEntrance: 'profitable',
-        module: 'lirunhesuan',
-        permissicon: [],
-        keepAlive: true,
-        _title:'库点利润库存'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden:true,
-    },
-    // 库点利润费用
-    {
-      path: 'warehousecost',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehousecost'),
-      name: 'warehousecost',
-      meta: {
-        title: 'warehousecost',
-        shortcutEntrance: 'profitable',
-        module: 'lirunhesuan',
-        permissicon: [],
-        keepAlive: true,
-        _title:'库点利润费用'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden:true,
-    }, 
     // 费用管理
     {
       path: 'expensemanagement',
@@ -382,6 +248,141 @@ const profitableRouter = {
       },
       hidden:true,
     }, 
+      // 合同利润
+      {
+        path: 'contractprofits',
+        component: () =>
+          import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractprofits'),
+        name: 'contractprofits',
+        meta: {
+          title: 'contractprofits',
+          shortcutEntrance: 'profitable',
+          module: 'lirunhesuan',
+          permissicon: [],
+          keepAlive: true,
+          _title:'合同利润'
+          // module: 'procurement.sparepart.applDetail'
+        }
+      },  
+     // 合同利润详情
+     {
+      path: 'contractprofitsdetails',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractprofitsdetails'),
+      name: 'contractprofitsdetails',
+      meta: {
+        title: 'contractprofitsdetails',
+        shortcutEntrance: 'profitable',
+        module: 'lirunhesuan',
+        permissicon: [],
+        keepAlive: true,
+        _title:'合同利润详情'
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    }, 
+    // 合同利润库存
+    {
+      path: 'contractinventory',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractinventory'),
+      name: 'contractinventory',
+      meta: {
+        title: 'contractinventory',
+        shortcutEntrance: 'profitable',
+        module: 'lirunhesuan',
+        permissicon: [],
+        keepAlive: true,
+        _title:'合同利润库存'
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    },
+    // 合同利润费用
+    {
+      path: 'contractcost',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractcost'),
+      name: 'contractcost',
+      meta: {
+        title: 'contractcost',
+        shortcutEntrance: 'profitable',
+        module: 'lirunhesuan',
+        permissicon: [],
+        keepAlive: true,
+        _title:'合同利润费用'
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    },
+    // 库点利润
+    {
+      path: 'warehouseprofits',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehouseprofits'),
+      name: 'warehouseprofits',
+      meta: {
+        title: 'warehouseprofits',
+        shortcutEntrance: 'profitable',
+        module: 'lirunhesuan',
+        permissicon: [],
+        keepAlive: true,
+        _title:'库点利润'
+        // module: 'procurement.sparepart.applDetail'
+      }
+    }, 
+    // 库点利润详情
+     {
+      path: 'warehouseprofitsdetails',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehouseprofitsdetails'),
+      name: 'warehouseprofitsdetails',
+      meta: {
+        title: 'warehouseprofitsdetails',
+        shortcutEntrance: 'profitable',
+        module: 'lirunhesuan',
+        permissicon: [],
+        keepAlive: true,
+        _title:'库点利润详情'
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    }, 
+    // 库点利润库存
+    {
+      path: 'warehouseinventory',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehouseinventory'),
+      name: 'warehouseinventory',
+      meta: {
+        title: 'warehouseinventory',
+        shortcutEntrance: 'profitable',
+        module: 'lirunhesuan',
+        permissicon: [],
+        keepAlive: true,
+        _title:'库点利润库存'
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    },
+    // 库点利润费用
+    {
+      path: 'warehousecost',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehousecost'),
+      name: 'warehousecost',
+      meta: {
+        title: 'warehousecost',
+        shortcutEntrance: 'profitable',
+        module: 'lirunhesuan',
+        permissicon: [],
+        keepAlive: true,
+        _title:'库点利润费用'
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    }, 
+    
      // 仓储费
      {
       path: 'storageCharge',

src/views/profitable/expenseallot.vue

@@ -480,7 +480,7 @@
           }
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             // console.log(weight,this.feeDetailsDistributions[i].inWarehouseWeight)
-              this.feeDetailsDistributions[i].distributionMoney=Math.round((this.feeDetailsDistributions[i].inWarehouseWeight/weight)*this.deptBudgetList.amountMoney)
+              this.feeDetailsDistributions[i].distributionMoney=Math.round((this.feeDetailsDistributions[i].inWarehouseWeight/weight)*this.deptBudgetList.unallocatedAmount)
               money+=this.feeDetailsDistributions[i].distributionMoney
 
           }

src/views/profitable/expensemanagentedit.vue

@@ -90,11 +90,13 @@
               <el-input disabled class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
             </el-form-item>
         </el-form>
-        <div v-if='(deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"&&deptBudgetList.storageFeeFlag==0||deptBudgetList.expensesPurpose==2&&deptBudgetList.storageFeeFlag==0)' class='expensetitle'>费用分配</div>
+        <div style="display:flex" v-if='(deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"&&deptBudgetList.storageFeeFlag==0||deptBudgetList.expensesPurpose==2&&deptBudgetList.storageFeeFlag==0)' class='expensetitle'>费用分配
+          <div style="margin-left:15px">可分配金额{{deptBudgetList.unallocatedAmount}}元</div></div>
         <div v-if='(deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"&&deptBudgetList.storageFeeFlag==0||deptBudgetList.expensesPurpose==2&&deptBudgetList.storageFeeFlag==0)' style='margin:0  auto 10px;width:90%;display: flex;'>
           <ws-select v-model="mode" placeholder="费用分配方式" @change="modeselect">
           <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
+            
         </ws-select>
          <!-- <ws-select v-if='deptBudgetList.purpose==1' v-model="ware" placeholder="费用分配仓库" class="typeselect" @change="selectwareType"
           :value="searchType">
@@ -337,13 +339,6 @@ weight: 4000}]],
       return [start.split(' ')[0], end.split(' ')[0]]
     },
       queren() {
-      if (!this.deptBudgetList.amountMoney && this.moneys == '按重量自动分配') {
-        this.$message({
-          message: '请输入金额之后进行操作',
-          type: 'warning',
-        })
-        return
-      }
       this.confirmFlag = 1
       this.selectOrderList()
     },
@@ -403,13 +398,13 @@ weight: 4000}]],
           if (this.moneys == '按重量自动分配') {
             for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
               if (i != this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.amountMoney)
+                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.unallocatedAmount)
                 if (this.feeDetailsDistributions[i].distributionMoney) {
                   moneyDiff += Number(this.feeDetailsDistributions[i].distributionMoney)
                 }
               }
               if (i == this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.amountMoney - moneyDiff
+                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.unallocatedAmount - moneyDiff
               }
               money = this.feeDetailsDistributions[i].distributionMoney + moneyDiff
             }
@@ -479,13 +474,13 @@ weight: 4000}]],
         }
         for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
           if (i != this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.amountMoney)
+                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.unallocatedAmount)
                 if (this.feeDetailsDistributions[i].distributionMoney) {
                   moneyDiff += Number(this.feeDetailsDistributions[i].distributionMoney)
                 }
               }
               if (i == this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.amountMoney - moneyDiff
+                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.unallocatedAmount - moneyDiff
               }
               money = this.feeDetailsDistributions[i].distributionMoney + moneyDiff
         }
@@ -519,7 +514,7 @@ weight: 4000}]],
           }
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             // console.log(weight,this.feeDetailsDistributions[i].inWarehouseWeight)
-              this.feeDetailsDistributions[i].distributionMoney=Math.round((this.feeDetailsDistributions[i].inWarehouseWeight/weight)*this.deptBudgetList.amountMoney)
+              this.feeDetailsDistributions[i].distributionMoney=Math.round((this.feeDetailsDistributions[i].inWarehouseWeight/weight)*this.deptBudgetList.unallocatedAmount)
               money+=this.feeDetailsDistributions[i].distributionMoney
 
           }
@@ -691,7 +686,7 @@ weight: 4000}]],
         }
        
         if(this.deptBudgetList.expensesPurpose==1&&this.deptBudgetList.costType==3&&this.mode=='全部分配'||this.deptBudgetList.expensesPurpose==3&&this.mode=='全部分配'){
-          if(this.amount!=this.deptBudgetList.amountMoney){
+          if(this.amount!=this.deptBudgetList.unallocatedAmount){
             this.$message({
                 message: '请款金额与分配金额不相等!',
                 type: 'warning',
@@ -700,7 +695,7 @@ weight: 4000}]],
           }
         }
         if(this.deptBudgetList.expensesPurpose==1&&this.deptBudgetList.costType==3&&this.mode=='部分分配'||this.deptBudgetList.expensesPurpose==3&&this.mode=='部分分配'){
-          if(this.amount>this.deptBudgetList.amountMoney){
+          if(this.amount>this.deptBudgetList.unallocatedAmount){
             this.$message({
                 message: '分配金额不可超过请款金额!',
                 type: 'warning',
@@ -802,13 +797,13 @@ weight: 4000}]],
                 }
                 for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
                   if (i != this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.amountMoney)
+                this.feeDetailsDistributions[i].distributionMoney = Math.round((this.feeDetailsDistributions[i].inWarehouseWeight / weight) * this.deptBudgetList.unallocatedAmount)
                 if (this.feeDetailsDistributions[i].distributionMoney) {
                   moneyDiff += Number(this.feeDetailsDistributions[i].distributionMoney)
                 }
               }
               if (i == this.feeDetailsDistributions.length - 1) {
-                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.amountMoney - moneyDiff
+                this.feeDetailsDistributions[i].distributionMoney = this.deptBudgetList.unallocatedAmount - moneyDiff
               }
               money = this.feeDetailsDistributions[i].distributionMoney + moneyDiff
 

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

@@ -13,101 +13,6 @@ const tranManagementRouter = {
     icon: '-renwuguanli'
   },
   children: [
-    //运输任务
-    {
-      path: 'tranManagementTransport',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementTransport'),
-      name: 'tranManagementTransport',
-      meta: {
-        title: 'tranManagementTransport',
-        shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.transportationInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'运输任务'
-      },
-
-      // hidden: true
-    },
-    //运输查看
-    {
-      path: 'tranManagementLook',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementLook'),
-      name: 'tranManagementLook',
-      meta: {
-        title: 'tranManagementLook',
-        shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.transportationInfo.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'运输任务查看'
-      },
-      hidden: true
-    },
-    //运输添加
-    {
-      path: 'tranManagementTransportAdd',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementTransportAdd'),
-      name: 'tranManagemen  tTransportAdd',
-      meta: {
-        title: 'tranManagementTransportAdd',
-        shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.transportationInfo.add',
-        permissicon: [],
-        keepAlive: true,
-        _title:'运输任务添加'
-      },
-      hidden: true
-    },
-    //运输编辑
-    {
-      path: 'tranManagementTransportEdit',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementTransportEdit'),
-      name: 'tranManagementTransportEdit',
-      meta: {
-        title: 'tranManagementTransportEdit',
-        shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.transportationInfo.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'运输任务编辑'
-      },
-      hidden: true
-
-    },
-    //移库任务
-    {
-      path: 'moveWarehouseTask',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/moveWarehouseTask'),
-      name: 'moveWarehouseTask',
-      meta: {
-        title: 'moveWarehouseTask',
-        shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask',
-        permissicon: [],
-        keepAlive: true,
-        _title:'移库任务'
-      },
-    },
-    //移库查看 
-    {
-      path: 'moveWarehouseTaskLook',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/moveWarehouseTaskLook'),
-      name: 'moveWarehouseTaskLook',
-      meta: {
-        title: 'moveWarehouseTaskLook',
-        shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask',
-        _title:'移库任务查看'
-      },
-      hidden: true,
-    },
     //出入库任务
     {
       path: 'tranManagementWarehouseInOuttask',
@@ -267,6 +172,102 @@ const tranManagementRouter = {
       },
       hidden: true
     },
+    //运输任务
+    {
+      path: 'tranManagementTransport',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementTransport'),
+      name: 'tranManagementTransport',
+      meta: {
+        title: 'tranManagementTransport',
+        shortcutEntrance: 'tranManagement',
+        module: 'transportationTask.transportation.transportationInfo',
+        permissicon: [],
+        keepAlive: true,
+        _title:'运输任务'
+      },
+
+      // hidden: true
+    },
+    //运输查看
+    {
+      path: 'tranManagementLook',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementLook'),
+      name: 'tranManagementLook',
+      meta: {
+        title: 'tranManagementLook',
+        shortcutEntrance: 'tranManagement',
+        module: 'transportationTask.transportation.transportationInfo.view',
+        permissicon: [],
+        keepAlive: true,
+        _title:'运输任务查看'
+      },
+      hidden: true
+    },
+    //运输添加
+    {
+      path: 'tranManagementTransportAdd',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementTransportAdd'),
+      name: 'tranManagemen  tTransportAdd',
+      meta: {
+        title: 'tranManagementTransportAdd',
+        shortcutEntrance: 'tranManagement',
+        module: 'transportationTask.transportation.transportationInfo.add',
+        permissicon: [],
+        keepAlive: true,
+        _title:'运输任务添加'
+      },
+      hidden: true
+    },
+    //运输编辑
+    {
+      path: 'tranManagementTransportEdit',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementTransportEdit'),
+      name: 'tranManagementTransportEdit',
+      meta: {
+        title: 'tranManagementTransportEdit',
+        shortcutEntrance: 'tranManagement',
+        module: 'transportationTask.transportation.transportationInfo.view',
+        permissicon: [],
+        keepAlive: true,
+        _title:'运输任务编辑'
+      },
+      hidden: true
+
+    },
+    //移库任务
+    {
+      path: 'moveWarehouseTask',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/moveWarehouseTask'),
+      name: 'moveWarehouseTask',
+      meta: {
+        title: 'moveWarehouseTask',
+        shortcutEntrance: 'tranManagement',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask',
+        permissicon: [],
+        keepAlive: true,
+        _title:'移库任务'
+      },
+    },
+    //移库查看 
+    {
+      path: 'moveWarehouseTaskLook',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/moveWarehouseTaskLook'),
+      name: 'moveWarehouseTaskLook',
+      meta: {
+        title: 'moveWarehouseTaskLook',
+        shortcutEntrance: 'tranManagement',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask',
+        _title:'移库任务查看'
+      },
+      hidden: true,
+    },
+    
 
   ],
 

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -542,8 +542,7 @@
           } else {
             var tmp1 = 'C00'
             this.deptBudgetList.count++
-            if (this.deptBudgetList.tranCarInfoList1.length < 10) {
-              console.log()
+            if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 10) {
               this.deptBudgetList.tranCarInfoList1.push({
                 driverName: '',
                 driverPhone: '',
@@ -562,7 +561,7 @@
                 tranCarNo: 'C00' + (this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length+1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if (this.deptBudgetList.tranCarInfoList1.length < 100 && this.deptBudgetList.tranCarInfoList1.length >=
+            } else if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 100 && (this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) >=
               10) {
               tmp1 = 'C0'
               this.deptBudgetList.count++
@@ -584,7 +583,7 @@
                 tranCarNo: 'C0' + (this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length+1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if (this.deptBudgetList.tranCarInfoList1.length < 1000 && this.deptBudgetList.tranCarInfoList1.length >=
+            } else if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 1000 && (this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) >=
               100) {
               tmp1 = 'C'
               this.deptBudgetList.count++
@@ -617,7 +616,7 @@
           } else {
             var tmp1 = 'C00'
             this.deptBudgetList.count++
-            if (this.deptBudgetList.tranCarInfoList.length < 10) {
+            if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 10) {
               this.deptBudgetList.tranCarInfoList.push({
                 driverName: '',
                 driverPhone: '',
@@ -636,7 +635,7 @@
                 tranCarNo: 'C00' + (this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length+1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if (this.deptBudgetList.tranCarInfoList.length < 100 && this.deptBudgetList.tranCarInfoList.length >=
+            } else if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 100 && (this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) >=
               10) {
               tmp1 = 'C0'
               this.deptBudgetList.count++
@@ -658,7 +657,7 @@
                 tranCarNo: 'C0' + (this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length+1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if (this.deptBudgetList.tranCarInfoList.length < 1000 && this.deptBudgetList.tranCarInfoList.length >=
+            } else if ((this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) < 1000 && (this.deptBudgetList.tranCarInfoList.length+this.deptBudgetList.tranCarInfoList1.length) >=
               100) {
               tmp1 = 'C'
               this.deptBudgetList.count++