前端

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

@@ -27,308 +27,308 @@ const profitableRouter = {
         // module: 'procurement.sparepart.applDetail'
       }
     },  
-    //   // 合同利润
-    //   {
-    //     path: 'contractprofits',
-    //     component: () =>
-    //       import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractprofits'),
-    //     name: 'contractprofits',
-    //     meta: {
-    //       title: 'contractprofits',
-    //       shortcutEntrance: 'profitable',
-    //       module: 'contractManagement.exContract.exContractInfo.view',
-    //       permissicon: [],
-    //       keepAlive: true
-    //       // module: 'procurement.sparepart.applDetail'
-    //     }
-    //   },  
-    //  // 合同利润详情
-    //  {
-    //   path: 'contractprofitsdetails',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractprofitsdetails'),
-    //   name: 'contractprofitsdetails',
-    //   meta: {
-    //     title: 'contractprofitsdetails',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden:true,
-    // }, 
-    // // 合同利润库存
-    // {
-    //   path: 'contractinventory',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractinventory'),
-    //   name: 'contractinventory',
-    //   meta: {
-    //     title: 'contractinventory',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden:true,
-    // },
-    // // 合同利润费用
-    // {
-    //   path: 'contractcost',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractcost'),
-    //   name: 'contractcost',
-    //   meta: {
-    //     title: 'contractcost',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden:true,
-    // },
-    // // 库点利润
-    // {
-    //   path: 'warehouseprofits',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehouseprofits'),
-    //   name: 'warehouseprofits',
-    //   meta: {
-    //     title: 'warehouseprofits',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   }
-    // }, 
-    // // 库点利润详情
-    //  {
-    //   path: 'warehouseprofitsdetails',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehouseprofitsdetails'),
-    //   name: 'warehouseprofitsdetails',
-    //   meta: {
-    //     title: 'warehouseprofitsdetails',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden:true,
-    // }, 
-    // // 合同利润库存
-    // {
-    //   path: 'warehouseinventory',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehouseinventory'),
-    //   name: 'warehouseinventory',
-    //   meta: {
-    //     title: 'warehouseinventory',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden:true,
-    // },
-    // // 库点利润费用
-    // {
-    //   path: 'warehousecost',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehousecost'),
-    //   name: 'warehousecost',
-    //   meta: {
-    //     title: 'warehousecost',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden:true,
-    // }, 
-    // // 费用管理
-    // {
-    //   path: 'expensemanagement',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expensemanagement'),
-    //   name: 'expensemanagement',
-    //   meta: {
-    //     title: 'expensemanagement',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   }
-    // },
-    // // 费用管理详情
-    // {
-    //   path: 'expensemanagementdetails',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expensemanagementdetails'),
-    //   name: 'expensemanagementdetails',
-    //   meta: {
-    //     title: 'expensemanagementdetails',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden:true,
-    // }, 
-    // // 费用管理请款
-    // {
-    //   path: 'cashout',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/cashout'),
-    //   name: 'cashout',
-    //   meta: {
-    //     title: 'cashout',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden:true,
-    // },
-    // // 费用管理请款审核
-    // {
-    //   path: 'cashoutaduit',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/cashoutaduit'),
-    //   name: 'cashoutaduit',
-    //   meta: {
-    //     title: 'cashoutaduit',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden:true,
-    // },  
-    // // 费用管理收款
-    // {
-    //   path: 'receipt',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/receipt'),
-    //   name: 'receipt',
-    //   meta: {
-    //     title: 'receipt',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden:true,
-    // }, 
+      // 合同利润
+      {
+        path: 'contractprofits',
+        component: () =>
+          import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractprofits'),
+        name: 'contractprofits',
+        meta: {
+          title: 'contractprofits',
+          shortcutEntrance: 'profitable',
+          module: 'contractManagement.exContract.exContractInfo.view',
+          permissicon: [],
+          keepAlive: true
+          // module: 'procurement.sparepart.applDetail'
+        }
+      },  
+     // 合同利润详情
+     {
+      path: 'contractprofitsdetails',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractprofitsdetails'),
+      name: 'contractprofitsdetails',
+      meta: {
+        title: 'contractprofitsdetails',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    }, 
+    // 合同利润库存
+    {
+      path: 'contractinventory',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractinventory'),
+      name: 'contractinventory',
+      meta: {
+        title: 'contractinventory',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    },
+    // 合同利润费用
+    {
+      path: 'contractcost',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/contractcost'),
+      name: 'contractcost',
+      meta: {
+        title: 'contractcost',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    },
+    // 库点利润
+    {
+      path: 'warehouseprofits',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehouseprofits'),
+      name: 'warehouseprofits',
+      meta: {
+        title: 'warehouseprofits',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      }
+    }, 
+    // 库点利润详情
+     {
+      path: 'warehouseprofitsdetails',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehouseprofitsdetails'),
+      name: 'warehouseprofitsdetails',
+      meta: {
+        title: 'warehouseprofitsdetails',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    }, 
+    // 合同利润库存
+    {
+      path: 'warehouseinventory',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehouseinventory'),
+      name: 'warehouseinventory',
+      meta: {
+        title: 'warehouseinventory',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    },
+    // 库点利润费用
+    {
+      path: 'warehousecost',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/warehousecost'),
+      name: 'warehousecost',
+      meta: {
+        title: 'warehousecost',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    }, 
+    // 费用管理
+    {
+      path: 'expensemanagement',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expensemanagement'),
+      name: 'expensemanagement',
+      meta: {
+        title: 'expensemanagement',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      }
+    },
+    // 费用管理详情
+    {
+      path: 'expensemanagementdetails',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expensemanagementdetails'),
+      name: 'expensemanagementdetails',
+      meta: {
+        title: 'expensemanagementdetails',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    }, 
+    // 费用管理请款
+    {
+      path: 'cashout',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/cashout'),
+      name: 'cashout',
+      meta: {
+        title: 'cashout',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    },
+    // 费用管理请款审核
+    {
+      path: 'cashoutaduit',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/cashoutaduit'),
+      name: 'cashoutaduit',
+      meta: {
+        title: 'cashoutaduit',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    },  
+    // 费用管理收款
+    {
+      path: 'receipt',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/receipt'),
+      name: 'receipt',
+      meta: {
+        title: 'receipt',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    }, 
     
-    // // 费用管理收款确认
-    // {
-    //   path: 'receiptaduit',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/receiptaduit'),
-    //   name: 'receiptaduit',
-    //   meta: {
-    //     title: 'receiptaduit',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden:true,
-    // },
-    // // 费用管理付款
-    // {
-    //   path: 'payment',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/payment'),
-    //   name: 'payment',
-    //   meta: {
-    //     title: 'payment',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden:true,
-    // }, 
-    // // 费用管理费用分配
-    // {
-    //   path: 'expenseallot',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expenseallot'),
-    //   name: 'expenseallot',
-    //   meta: {
-    //     title: 'expenseallot',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden:true,
-    // }, 
-    // // 费用管理费用分配确认
-    // {
-    //   path: 'expenseallotaduit',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expenseallotaduit'),
-    //   name: 'expenseallotaduit',
-    //   meta: {
-    //     title: 'expenseallotaduit',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden:true,
-    // }, 
-    // // 费用管理查看
-    // {
-    //   path: 'expensemanagentlook',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expensemanagentlook'),
-    //   name: 'expensemanagentlook',
-    //   meta: {
-    //     title: 'expensemanagentlook',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden:true,
-    // }, 
-    //  // 费用管理编辑
-    //  {
-    //   path: 'expensemanagentedit',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expensemanagentedit'),
-    //   name: 'expensemanagentedit',
-    //   meta: {
-    //     title: 'expensemanagentedit',
-    //     shortcutEntrance: 'profitable',
-    //     module: 'contractManagement.exContract.exContractInfo.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    //   hidden:true,
-    // }, 
+    // 费用管理收款确认
+    {
+      path: 'receiptaduit',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/receiptaduit'),
+      name: 'receiptaduit',
+      meta: {
+        title: 'receiptaduit',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    },
+    // 费用管理付款
+    {
+      path: 'payment',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/payment'),
+      name: 'payment',
+      meta: {
+        title: 'payment',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    }, 
+    // 费用管理费用分配
+    {
+      path: 'expenseallot',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expenseallot'),
+      name: 'expenseallot',
+      meta: {
+        title: 'expenseallot',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    }, 
+    // 费用管理费用分配确认
+    {
+      path: 'expenseallotaduit',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expenseallotaduit'),
+      name: 'expenseallotaduit',
+      meta: {
+        title: 'expenseallotaduit',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    }, 
+    // 费用管理查看
+    {
+      path: 'expensemanagentlook',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expensemanagentlook'),
+      name: 'expensemanagentlook',
+      meta: {
+        title: 'expensemanagentlook',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    }, 
+     // 费用管理编辑
+     {
+      path: 'expensemanagentedit',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/expensemanagentedit'),
+      name: 'expensemanagentedit',
+      meta: {
+        title: 'expensemanagentedit',
+        shortcutEntrance: 'profitable',
+        module: 'contractManagement.exContract.exContractInfo.view',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    }, 
       // 收支明细
       {
         path: 'inOutDetailed',

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -67,11 +67,11 @@
 						</el-input>
 					</el-form-item>
 					<!-- 货名 -->
-					<!-- <el-form-item label="货源" class="huom">
+					<el-form-item label="货源" class="huom">
 						<el-input disabled v-model="goods" placeholder="请选择货源"
 							maxlength="120" size="small" class="huom" />
 						<el-button class="bg-bottom" type="primary" size="small" @click="supplygoods()">选择货源</el-button>
-					</el-form-item> -->
+					</el-form-item>
 					<!--重量（吨）-->
 					<el-form-item label="重量（吨）">
 						<el-input @input="weightchange1" v-model="dataList.weight" placeholder="请输入重量（吨）"
@@ -168,7 +168,7 @@
 						</el-select>
 					</el-form-item>
 					<!-- 货名 -->
-					<!-- <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2' label="货名" class="huom">
+					<el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2' label="货名" class="huom">
 						<el-select disabled v-model="dataList1.goodsName" placeholder="货名" class="huom" @change="selectgoodsName1"
 						filterable clearable>
 						<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
@@ -179,7 +179,7 @@
 						<el-input disabled v-model="goods" placeholder="请选择货源"
 							maxlength="120" size="small" class="huom" />
 						<el-button v-if='dataList.taskTypeKey!=3' class="bg-bottom" type="primary" size="small" @click="supplygoods()">选择货源</el-button>
-					</el-form-item> -->
+					</el-form-item>
 					<!--重量（吨）-->
 					<el-form-item label="重量（吨）">
 						<el-input @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）"
@@ -281,11 +281,11 @@
 						</el-select>
 					</el-form-item>
 					<!-- 货名 -->
-					<!-- <el-form-item label="货源" class="huom">
+					<el-form-item label="货源" class="huom">
 						<el-input disabled v-model="goods" placeholder="请选择货源"
 							maxlength="120" size="small" class="huom" />
 						 <el-button class="bg-bottom" v-if='dataList.taskTypeKey!=4' type="primary" size="small" @click="supplygoods()">选择货源</el-button>
-					</el-form-item> -->
+					</el-form-item>
 					<!--重量（吨）-->
 					<el-form-item label="重量（吨）">
 						<el-input :disabled="dataList.taskTypeKey == 4" v-model="dataList.weight" placeholder="请输入重量（吨）"
@@ -1406,9 +1406,10 @@
 				this.dataList.inOutFlag = 1
 				this.dataList1.inOutFlag = 2
 				var data=JSON.parse(localStorage.getItem("supplygoods"))
-				for (let i = 0; i < data.length; i++) {
-					data[i].sourceId=data[i].id
-					
+				if(data){
+					for (let i = 0; i < data.length; i++) {
+						data[i].sourceId=data[i].id
+					}
 				}
 				var supplygoods=data
 				if (this.dataList.taskTypeKey == 1) {

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -96,11 +96,11 @@
                 :value="item.constValue"></el-option>
             </el-select>
           </el-form-item> -->
-          <!-- <el-form-item label="货源" class="huom">
+          <el-form-item label="货源" class="huom">
             <el-input disabled v-model="goods" placeholder="请选择货源"
 							maxlength="120" size="small" class="huom" />
             <el-button class="bg-bottom" type="primary" size="small" @click="supplygoods()">查看货源</el-button>
-          </el-form-item> -->
+          </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）">
             <el-input disabled v-model="dataList.weight" placeholder="请输入重量（吨）" maxlength="120" size="small"
@@ -219,7 +219,7 @@
             </el-select>
           </el-form-item>
           <!-- 货名 -->
-          <!-- <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2' label="货名" class="huom">
+          <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2' label="货名" class="huom">
 						<el-select disabled v-model="dataList1.goodsName" placeholder="货名" class="huom" @change="selectgoodsName1"
 						filterable clearable>
 						<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
@@ -230,7 +230,7 @@
 						<el-input disabled v-model="goods" placeholder="请选择货源"
 							maxlength="120" size="small" class="huom" />
 						<el-button v-if='dataList.taskTypeKey!=3' class="bg-bottom" type="primary" size="small" @click="supplygoods()">查看货源</el-button>
-					</el-form-item> -->
+					</el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）">
             <el-input @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）" maxlength="120"
@@ -347,11 +347,11 @@
           </el-form-item>
           <!-- 货名 -->
 
-          <!-- <el-form-item label="货源" class="huom">
+          <el-form-item label="货源" class="huom">
             <el-input disabled v-model="goods" placeholder="请选择货源"
 							maxlength="120" size="small" class="huom" />
              <el-button class="bg-bottom" v-if='dataList.taskTypeKey!=4' type="primary" size="small" @click="supplygoods()">查看货源</el-button>
-          </el-form-item> -->
+          </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）">
             <el-input disabled v-model="dataList.weight" placeholder="请输入重量（吨）" maxlength="120" size="small"

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -124,11 +124,11 @@
             />
           </el-form-item>
           <!-- 货名 -->
-          <!-- <el-form-item label="货源" class="huom">
+          <el-form-item label="货源" class="huom">
             <el-input disabled v-model="goods" placeholder="请选择货源"
 							maxlength="120" size="small" class="huom" />
             <el-button class="bg-bottom" type="primary" size="small" @click="supplygoods()">选择货源</el-button>
-          </el-form-item> -->
+          </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
@@ -312,7 +312,7 @@
             />
           </el-form-item>
           <!-- 货名 -->
-          <!-- <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2' label="货名" class="huom">
+          <el-form-item v-if='dataList1.inOutType!="退库"&&dataList1.taskTypeKey == 2' label="货名" class="huom">
 						<el-select disabled v-model="dataList1.goodsName" placeholder="货名" class="huom" @change="selectgoodsName1"
 						filterable clearable>
 						<el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
@@ -323,7 +323,7 @@
 						<el-input disabled v-model="goods" placeholder="请选择货源"
 							maxlength="120" size="small" class="huom" />
 						<el-button v-if='dataList.taskTypeKey!=3' class="bg-bottom" type="primary" size="small" @click="supplygoods()">选择货源</el-button>
-					</el-form-item> -->
+					</el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
@@ -513,11 +513,11 @@
             />
           </el-form-item>
           <!-- 货名 -->
-          <!-- <el-form-item label="货源" class="huom">
+          <el-form-item label="货源" class="huom">
             <el-input disabled v-model="goods" placeholder="请选择货源"
 							maxlength="120" size="small" class="huom" />
             <el-button class="bg-bottom" v-if='dataList.taskTypeKey!=4' type="primary" size="small" @click="supplygoods()">选择货源</el-button>
-          </el-form-item> -->
+          </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input

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

@@ -419,34 +419,34 @@ const warehouseManagementRouter = {
       },
       hidden: true
     },  
-    // {
-    //   path: 'warehousingOrder',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehousingOrder'),
-    //   name: 'warehousingOrder',
-    //   meta: {
-    //     title: 'warehousingOrder',
-    //     shortcutEntrance: 'warehousingOrder',
-    //     module: 'warehouseManagement.warehousingOrder',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    // },
-    // {
-    //   path: 'inventoryCheck',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/inventoryCheck'),
-    //   name: 'inventoryCheck',
-    //   meta: {
-    //     title: 'inventoryCheck',
-    //     shortcutEntrance: 'inventoryCheck',
-    //     module: 'warehouseManagement.warehousingOrder',
-    //     permissicon: [],
-    //     keepAlive: true
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    // },        
+    {
+      path: 'warehousingOrder',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehousingOrder'),
+      name: 'warehousingOrder',
+      meta: {
+        title: 'warehousingOrder',
+        shortcutEntrance: 'warehousingOrder',
+        module: 'warehouseManagement.warehousingOrder',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+    },
+    {
+      path: 'inventoryCheck',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/inventoryCheck'),
+      name: 'inventoryCheck',
+      meta: {
+        title: 'inventoryCheck',
+        shortcutEntrance: 'inventoryCheck',
+        module: 'warehouseManagement.warehousingOrder',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+    },        
   ],
 };
 export default warehouseManagementRouter;