Quellcode durchsuchen

库存查询修改

lilei vor 4 Jahren
Ursprung
Commit
36de0a94bc
2 geänderte Dateien mit 428 neuen und 425 gelöschten Zeilen
  1. 406 406
      src/config/router.config.js
  2. 22 19
      src/views/inventoryManagement/inventoryQuery/list.vue

+ 406 - 406
src/config/router.config.js

@@ -333,87 +333,87 @@ export const asyncRouterMap = [
       //   ]
       // },
       // 采购管理
-      // {
-      //   path: '/purchasingManagement',
-      //   redirect: '/purchasingManagement/purchaseOrder',
-      //   component: PageView,
-      //   meta: {
-      //     title: '采购管理',
-      //     icon: 'money-collect'
-      //     // permission: 'M_shop'
-      //   },
-      //   children: [
-      //     {
-      //       path: '/purchasingManagement/purchaseOrder',
-      //       redirect: '/purchasingManagement/purchaseOrder/list',
-      //       name: 'purchaseOrder',
-      //       component: RouteView,
-      //       meta: {
-      //         title: '采购单管理',
-      //         icon: 'money-collect'
-      //         // permission: 'M_goodsManage_list'
-      //       },
-      //       hideChildrenInMenu: true,
-      //       children: [
-      //         {
-      //           path: 'list',
-      //           name: 'purchaseOrderList',
-      //           component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/list.vue'),
-      //           meta: {
-      //             title: '采购单列表',
-      //             icon: 'money-collect',
-      //             hidden: true
-      //             // permission: 'M_goodsManage_list'
-      //           }
-      //         },
-      //         {
-      //           path: 'add',
-      //           name: 'purchaseOrderAdd',
-      //           component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/edit.vue'),
-      //           meta: {
-      //             title: '新增采购单',
-      //             icon: 'money-collect',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         },
-      //         {
-      //           path: 'edit/:id',
-      //           name: 'purchaseOrderEdit',
-      //           component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/edit.vue'),
-      //           meta: {
-      //             title: '编辑采购单',
-      //             icon: 'money-collect',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         },
-      //         {
-      //           path: 'detail/:id',
-      //           name: 'purchaseOrderDetail',
-      //           component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/detail.vue'),
-      //           meta: {
-      //             title: '采购单详情',
-      //             icon: 'money-collect',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         },
-      //         {
-      //           path: 'warehousing/:id',
-      //           name: 'purchaseOrderWarehousing',
-      //           component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/warehousing.vue'),
-      //           meta: {
-      //             title: '入库',
-      //             icon: 'money-collect',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         }
-      //       ]
-      //     }
-      //   ]
-      // },
+      {
+        path: '/purchasingManagement',
+        redirect: '/purchasingManagement/purchaseOrder',
+        component: PageView,
+        meta: {
+          title: '采购管理',
+          icon: 'money-collect'
+          // permission: 'M_shop'
+        },
+        children: [
+          {
+            path: '/purchasingManagement/purchaseOrder',
+            redirect: '/purchasingManagement/purchaseOrder/list',
+            name: 'purchaseOrder',
+            component: RouteView,
+            meta: {
+              title: '采购单管理',
+              icon: 'money-collect'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'purchaseOrderList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/list.vue'),
+                meta: {
+                  title: '采购单列表',
+                  icon: 'money-collect',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              },
+              {
+                path: 'add',
+                name: 'purchaseOrderAdd',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/edit.vue'),
+                meta: {
+                  title: '新增采购单',
+                  icon: 'money-collect',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'edit/:id',
+                name: 'purchaseOrderEdit',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/edit.vue'),
+                meta: {
+                  title: '编辑采购单',
+                  icon: 'money-collect',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'detail/:id',
+                name: 'purchaseOrderDetail',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/detail.vue'),
+                meta: {
+                  title: '采购单详情',
+                  icon: 'money-collect',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'warehousing/:id',
+                name: 'purchaseOrderWarehousing',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/warehousing.vue'),
+                meta: {
+                  title: '入库',
+                  icon: 'money-collect',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              }
+            ]
+          }
+        ]
+      },
       // 调拨管理
       // {
       //   path: '/allocationManagement',
@@ -1240,331 +1240,331 @@ export const asyncRouterMap = [
       //   ]
       // },
       // 财务管理
-      // {
-      //   path: '/financialManagement',
-      //   redirect: '/financialManagement/warehousingAudit',
-      //   component: PageView,
-      //   meta: {
-      //     title: '财务管理',
-      //     icon: 'property-safety'
-      //     // permission: 'M_shop'
-      //   },
-      //   children: [
-      //     {
-      //       path: '/financialManagement/warehousingAudit',
-      //       redirect: '/financialManagement/warehousingAudit/list',
-      //       name: 'warehousingAudit',
-      //       component: RouteView,
-      //       meta: {
-      //         title: '入库审核',
-      //         icon: 'pull-request'
-      //         // permission: 'M_goodsManage_list'
-      //       },
-      //       hideChildrenInMenu: true,
-      //       children: [
-      //         {
-      //           path: 'list',
-      //           name: 'warehousingAuditList',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/warehousingAudit/list.vue'),
-      //           meta: {
-      //             title: '入库审核列表',
-      //             icon: 'pull-request',
-      //             hidden: true
-      //             // permission: 'M_goodsManage_list'
-      //           }
-      //         },
-      //         {
-      //           path: 'detail/:id',
-      //           name: 'warehousingAuditDetail',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/warehousingAudit/detail.vue'),
-      //           meta: {
-      //             title: '入库审核详情',
-      //             icon: 'pull-request',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         }
-      //       ]
-      //     },
-      //     {
-      //       path: '/financialManagement/inventoryReview',
-      //       redirect: '/financialManagement/inventoryReview/list',
-      //       name: 'inventoryReview',
-      //       component: RouteView,
-      //       meta: {
-      //         title: '盘点审核',
-      //         icon: 'laptop'
-      //         // permission: 'M_goodsManage_list'
-      //       },
-      //       hideChildrenInMenu: true,
-      //       children: [
-      //         {
-      //           path: 'list',
-      //           name: 'inventoryReviewList',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/inventoryReview/list.vue'),
-      //           meta: {
-      //             title: '盘点审核列表',
-      //             icon: 'laptop',
-      //             hidden: true
-      //             // permission: 'M_goodsManage_list'
-      //           }
-      //         },
-      //         {
-      //           path: 'detail/:id',
-      //           name: 'inventoryReviewDetail',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/inventoryReview/detail.vue'),
-      //           meta: {
-      //             title: '盘点审核详情',
-      //             icon: 'laptop',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         }
-      //       ]
-      //     },
-      //     {
-      //       path: '/financialManagement/financialPayment',
-      //       redirect: '/financialManagement/financialPayment/list',
-      //       name: 'financialPayment',
-      //       component: RouteView,
-      //       meta: {
-      //         title: '财务付款',
-      //         icon: 'frown'
-      //         // permission: 'M_goodsManage_list'
-      //       },
-      //       hideChildrenInMenu: true,
-      //       children: [
-      //         {
-      //           path: 'list',
-      //           name: 'financialPaymentList',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/financialPayment/list.vue'),
-      //           meta: {
-      //             title: '财务付款列表',
-      //             icon: 'frown',
-      //             hidden: true
-      //             // permission: 'M_goodsManage_list'
-      //           }
-      //         }
-      //       ]
-      //     },
-      //     {
-      //       path: '/financialManagement/financialCollection',
-      //       redirect: '/financialManagement/financialCollection/list',
-      //       name: 'financialCollection',
-      //       component: RouteView,
-      //       meta: {
-      //         title: '财务收款',
-      //         icon: 'meh'
-      //         // permission: 'M_goodsManage_list'
-      //       },
-      //       hideChildrenInMenu: true,
-      //       children: [
-      //         {
-      //           path: 'list',
-      //           name: 'financialCollectionList',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/financialCollection/list.vue'),
-      //           meta: {
-      //             title: '财务收款列表',
-      //             icon: 'meh',
-      //             hidden: true
-      //             // permission: 'M_goodsManage_list'
-      //           }
-      //         }
-      //       ]
-      //     },
-      //     {
-      //       path: '/financialManagement/expenseManagement',
-      //       redirect: '/financialManagement/expenseManagement/list',
-      //       name: 'expenseManagement',
-      //       component: RouteView,
-      //       meta: {
-      //         title: '费用管理',
-      //         icon: 'pound'
-      //         // permission: 'M_goodsManage_list'
-      //       },
-      //       hideChildrenInMenu: true,
-      //       children: [
-      //         {
-      //           path: 'list',
-      //           name: 'expenseManagementList',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/expenseManagement/list.vue'),
-      //           meta: {
-      //             title: '费用单列表',
-      //             icon: 'pound',
-      //             hidden: true
-      //             // permission: 'M_goodsManage_list'
-      //           }
-      //         },
-      //         {
-      //           path: 'add',
-      //           name: 'expenseManagementDetail',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/expenseManagement/edit.vue'),
-      //           meta: {
-      //             title: '新增费用单',
-      //             icon: 'pound',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         },
-      //         {
-      //           path: 'edit/:id',
-      //           name: 'expenseManagementDetail',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/expenseManagement/edit.vue'),
-      //           meta: {
-      //             title: '编辑费用单',
-      //             icon: 'pound',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         }
-      //       ]
-      //     },
-      //     {
-      //       path: '/financialManagement/companyReceivablePayable',
-      //       redirect: '/financialManagement/companyReceivablePayable/list',
-      //       name: 'companyReceivablePayable',
-      //       component: RouteView,
-      //       meta: {
-      //         title: '单位应收应付管理',
-      //         icon: 'transaction'
-      //         // permission: 'M_goodsManage_list'
-      //       },
-      //       hideChildrenInMenu: true,
-      //       children: [
-      //         {
-      //           path: 'list',
-      //           name: 'companyReceivablePayableList',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/list.vue'),
-      //           meta: {
-      //             title: '单位应收应付列表',
-      //             icon: 'transaction',
-      //             hidden: true
-      //             // permission: 'M_goodsManage_list'
-      //           }
-      //         },
-      //         {
-      //           path: 'receipt/:id',
-      //           name: 'companyReceivablePayableReceipt',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/receipt.vue'),
-      //           meta: {
-      //             title: '单位收款单',
-      //             icon: 'transaction',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         },
-      //         {
-      //           path: 'paymentSlip/:id',
-      //           name: 'companyReceivablePayablePaymentSlip',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/paymentSlip.vue'),
-      //           meta: {
-      //             title: '单位付款单',
-      //             icon: 'transaction',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         },
-      //         {
-      //           path: 'detail/:id',
-      //           name: 'companyReceivablePayableDetail',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/detail.vue'),
-      //           meta: {
-      //             title: '单位应收应付详情',
-      //             icon: 'transaction',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         }
-      //       ]
-      //     },
-      //     {
-      //       path: '/financialManagement/companyCollectionPayment',
-      //       redirect: '/financialManagement/companyCollectionPayment/list',
-      //       name: 'companyCollectionPayment',
-      //       component: RouteView,
-      //       meta: {
-      //         title: '单位收付款记录',
-      //         icon: 'file-protect'
-      //         // permission: 'M_goodsManage_list'
-      //       },
-      //       hideChildrenInMenu: true,
-      //       children: [
-      //         {
-      //           path: 'list',
-      //           name: 'companyCollectionPaymentList',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyCollectionPayment/list.vue'),
-      //           meta: {
-      //             title: '单位收付款记录列表',
-      //             icon: 'file-protect',
-      //             hidden: true
-      //             // permission: 'M_goodsManage_list'
-      //           }
-      //         },
-      //         {
-      //           path: 'detail/:id',
-      //           name: 'companyCollectionPaymentDetail',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyCollectionPayment/detail.vue'),
-      //           meta: {
-      //             title: '单位收付款记录详情',
-      //             icon: 'file-protect',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         }
-      //       ]
-      //     },
-      //     {
-      //       path: '/financialManagement/withdrawalManagement',
-      //       redirect: '/financialManagement/withdrawalManagement/list',
-      //       name: 'withdrawalManagement',
-      //       component: RouteView,
-      //       meta: {
-      //         title: '提现管理',
-      //         icon: 'dollar'
-      //         // permission: 'M_goodsManage_list'
-      //       },
-      //       hideChildrenInMenu: true,
-      //       children: [
-      //         {
-      //           path: 'list',
-      //           name: 'withdrawalManagementList',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/withdrawalManagement/list.vue'),
-      //           meta: {
-      //             title: '提现管理列表',
-      //             icon: 'dollar',
-      //             hidden: true
-      //             // permission: 'M_goodsManage_list'
-      //           }
-      //         }
-      //       ]
-      //     },
-      //     {
-      //       path: '/financialManagement/ledgerRecord',
-      //       redirect: '/financialManagement/ledgerRecord/list',
-      //       name: 'ledgerRecord',
-      //       component: RouteView,
-      //       meta: {
-      //         title: '分账记录',
-      //         icon: 'profile'
-      //         // permission: 'M_goodsManage_list'
-      //       },
-      //       hideChildrenInMenu: true,
-      //       children: [
-      //         {
-      //           path: 'list',
-      //           name: 'ledgerRecordList',
-      //           component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/ledgerRecord/list.vue'),
-      //           meta: {
-      //             title: '分账记录列表',
-      //             icon: 'profile',
-      //             hidden: true
-      //             // permission: 'M_goodsManage_list'
-      //           }
-      //         }
-      //       ]
-      //     }
-      //   ]
-      // },
+      {
+        path: '/financialManagement',
+        redirect: '/financialManagement/warehousingAudit',
+        component: PageView,
+        meta: {
+          title: '财务管理',
+          icon: 'property-safety'
+          // permission: 'M_shop'
+        },
+        children: [
+          {
+            path: '/financialManagement/warehousingAudit',
+            redirect: '/financialManagement/warehousingAudit/list',
+            name: 'warehousingAudit',
+            component: RouteView,
+            meta: {
+              title: '入库审核',
+              icon: 'pull-request'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'warehousingAuditList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/warehousingAudit/list.vue'),
+                meta: {
+                  title: '入库审核列表',
+                  icon: 'pull-request',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              },
+              {
+                path: 'detail/:id',
+                name: 'warehousingAuditDetail',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/warehousingAudit/detail.vue'),
+                meta: {
+                  title: '入库审核详情',
+                  icon: 'pull-request',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              }
+            ]
+          },
+          {
+            path: '/financialManagement/inventoryReview',
+            redirect: '/financialManagement/inventoryReview/list',
+            name: 'inventoryReview',
+            component: RouteView,
+            meta: {
+              title: '盘点审核',
+              icon: 'laptop'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'inventoryReviewList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/inventoryReview/list.vue'),
+                meta: {
+                  title: '盘点审核列表',
+                  icon: 'laptop',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              },
+              {
+                path: 'detail/:id',
+                name: 'inventoryReviewDetail',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/inventoryReview/detail.vue'),
+                meta: {
+                  title: '盘点审核详情',
+                  icon: 'laptop',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              }
+            ]
+          },
+          {
+            path: '/financialManagement/financialPayment',
+            redirect: '/financialManagement/financialPayment/list',
+            name: 'financialPayment',
+            component: RouteView,
+            meta: {
+              title: '财务付款',
+              icon: 'frown'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'financialPaymentList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/financialPayment/list.vue'),
+                meta: {
+                  title: '财务付款列表',
+                  icon: 'frown',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              }
+            ]
+          },
+          {
+            path: '/financialManagement/financialCollection',
+            redirect: '/financialManagement/financialCollection/list',
+            name: 'financialCollection',
+            component: RouteView,
+            meta: {
+              title: '财务收款',
+              icon: 'meh'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'financialCollectionList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/financialCollection/list.vue'),
+                meta: {
+                  title: '财务收款列表',
+                  icon: 'meh',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              }
+            ]
+          },
+          {
+            path: '/financialManagement/expenseManagement',
+            redirect: '/financialManagement/expenseManagement/list',
+            name: 'expenseManagement',
+            component: RouteView,
+            meta: {
+              title: '费用管理',
+              icon: 'pound'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'expenseManagementList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/expenseManagement/list.vue'),
+                meta: {
+                  title: '费用单列表',
+                  icon: 'pound',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              },
+              {
+                path: 'add',
+                name: 'expenseManagementDetail',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/expenseManagement/edit.vue'),
+                meta: {
+                  title: '新增费用单',
+                  icon: 'pound',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'edit/:id',
+                name: 'expenseManagementDetail',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/expenseManagement/edit.vue'),
+                meta: {
+                  title: '编辑费用单',
+                  icon: 'pound',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              }
+            ]
+          },
+          {
+            path: '/financialManagement/companyReceivablePayable',
+            redirect: '/financialManagement/companyReceivablePayable/list',
+            name: 'companyReceivablePayable',
+            component: RouteView,
+            meta: {
+              title: '单位应收应付管理',
+              icon: 'transaction'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'companyReceivablePayableList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/list.vue'),
+                meta: {
+                  title: '单位应收应付列表',
+                  icon: 'transaction',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              },
+              {
+                path: 'receipt/:id',
+                name: 'companyReceivablePayableReceipt',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/receipt.vue'),
+                meta: {
+                  title: '单位收款单',
+                  icon: 'transaction',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'paymentSlip/:id',
+                name: 'companyReceivablePayablePaymentSlip',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/paymentSlip.vue'),
+                meta: {
+                  title: '单位付款单',
+                  icon: 'transaction',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'detail/:id',
+                name: 'companyReceivablePayableDetail',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyReceivablePayable/detail.vue'),
+                meta: {
+                  title: '单位应收应付详情',
+                  icon: 'transaction',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              }
+            ]
+          },
+          {
+            path: '/financialManagement/companyCollectionPayment',
+            redirect: '/financialManagement/companyCollectionPayment/list',
+            name: 'companyCollectionPayment',
+            component: RouteView,
+            meta: {
+              title: '单位收付款记录',
+              icon: 'file-protect'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'companyCollectionPaymentList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyCollectionPayment/list.vue'),
+                meta: {
+                  title: '单位收付款记录列表',
+                  icon: 'file-protect',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              },
+              {
+                path: 'detail/:id',
+                name: 'companyCollectionPaymentDetail',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/companyCollectionPayment/detail.vue'),
+                meta: {
+                  title: '单位收付款记录详情',
+                  icon: 'file-protect',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              }
+            ]
+          },
+          {
+            path: '/financialManagement/withdrawalManagement',
+            redirect: '/financialManagement/withdrawalManagement/list',
+            name: 'withdrawalManagement',
+            component: RouteView,
+            meta: {
+              title: '提现管理',
+              icon: 'dollar'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'withdrawalManagementList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/withdrawalManagement/list.vue'),
+                meta: {
+                  title: '提现管理列表',
+                  icon: 'dollar',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              }
+            ]
+          },
+          {
+            path: '/financialManagement/ledgerRecord',
+            redirect: '/financialManagement/ledgerRecord/list',
+            name: 'ledgerRecord',
+            component: RouteView,
+            meta: {
+              title: '分账记录',
+              icon: 'profile'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'ledgerRecordList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/ledgerRecord/list.vue'),
+                meta: {
+                  title: '分账记录列表',
+                  icon: 'profile',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              }
+            ]
+          }
+        ]
+      },
       // 基础设置
       {
         path: '/basicData',

+ 22 - 19
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -6,17 +6,17 @@
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-item label="产品编码">
-              <a-input id="inventoryQueryList-productCode" v-model="queryParam.dealerProduct.code" allowClear placeholder="请输入产品编码"/>
+              <a-input id="inventoryQueryList-productCode" v-model="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="原厂编码">
-              <a-input id="inventoryQueryList-productOrigCode" v-model.trim="queryParam.dealerProduct.origCode" allowClear placeholder="请输入原厂编码"/>
+              <a-input id="inventoryQueryList-productOrigCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="产品名称">
-              <a-input id="inventoryQueryList-productName" v-model.trim="queryParam.dealerProduct.name" allowClear placeholder="请输入产品名称"/>
+              <a-input id="inventoryQueryList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
             </a-form-item>
           </a-col>
           <template v-if="advanced">
@@ -72,8 +72,9 @@
       bordered>
       <!-- 产品分类 -->
       <template slot="productTypeName" slot-scope="text, record">
-        <span v-if="record.dealerProduct">{{ record.dealerProduct.productTypeName2 || '' }}</span> >
-        <span v-if="record.dealerProduct">{{ record.dealerProduct.productTypeName3 || '' }}</span>
+        <span v-if="record.productTypeName1">{{ record.productTypeName1 || '' }} ></span>
+        <span v-if="record.productTypeName2">{{ record.productTypeName2 || '' }} ></span>
+        <span v-if="record.productTypeName3">{{ record.productTypeName3 || '' }}</span>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
@@ -97,15 +98,13 @@ export default {
     return {
       advanced: false, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
-        dealerProduct: {
-          code: '', //  产品编码
-          name: '', //  产品名称
-          origCode: '', //  原厂编码
-          productBrandSn: '', //  产品品牌
-          productTypeSn1: '', //  产品分类1
-          productTypeSn2: '', //  产品分类2
-          productTypeSn3: '' //  产品分类3
-        },
+        productCode: '', //  产品编码
+        productName: '', //  产品名称
+        productOrigCode: '', //  原厂编码
+        productBrandSn: '', //  产品品牌
+        productTypeSn1: '', //  产品分类1
+        productTypeSn2: '', //  产品分类2
+        productTypeSn3: '', //  产品分类3
         zeroQtyFlag: undefined //  库存数量是否为0
       },
       productTypeSn: [],
@@ -115,11 +114,11 @@ export default {
       typeData: [], //  产品分类下拉数据
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'dealerProduct.code', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'dealerProduct.name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'dealerProduct.origCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品品牌', dataIndex: 'dealerProduct.productBrandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productTypeName' }, width: 200, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品品牌', dataIndex: 'brandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', scopedSlots: { customRender: 'productTypeName' }, width: 300, align: 'center' },
         { title: '现有库存数量(个)', dataIndex: 'currentStockQty', width: 165, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '现有库存成本(¥)', dataIndex: 'currentStockCost', width: 165, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } }
         // { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
@@ -150,6 +149,10 @@ export default {
   methods: {
     //  重置
     resetSearchForm () {
+      this.queryParam.productBrandSn = ''
+      this.queryParam.productTypeSn1 = ''
+      this.queryParam.productTypeSn2 = ''
+      this.queryParam.productTypeSn3 = ''
       this.queryParam.productCode = ''
       this.queryParam.productOrigCode = ''
       this.queryParam.productName = ''