lilei преди 1 година
родител
ревизия
f7d7941abb
променени са 3 файла, в които са добавени 99 реда и са изтрити 10 реда
  1. 91 8
      src/config/router.config.js
  2. 4 1
      src/views/salesManagement/waitDispatch/edit.vue
  3. 4 1
      src/views/salesManagement/waitDispatchNew/edit.vue

+ 91 - 8
src/config/router.config.js

@@ -119,7 +119,7 @@ export const asyncRouterMap = [
       // 销售管理
       {
         path: '/salesManagement',
-        redirect: '/salesManagement/salesQueryNew',
+        redirect: '/salesManagement/salesQuery',
         component: PageView,
         meta: {
           title: '销售管理',
@@ -127,13 +127,96 @@ export const asyncRouterMap = [
           permission: 'M_salesManagement'
         },
         children: [
+          {
+            path: '/salesManagement/salesQuery',
+            redirect: '/salesManagement/salesQuery/list',
+            name: 'salesQuery',
+            component: BlankLayout,
+            meta: {
+              title: '销售单查询',
+              icon: 'monitor',
+              permission: 'M_salesQueryList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'salesQueryList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/list.vue'),
+                meta: {
+                  title: '销售单列表',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'M_salesQueryList'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'salesDetail',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/detail.vue'),
+                meta: {
+                  title: '销售单详情',
+                  icon: 'monitor',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'B_salesDetail'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'salesDetailAudit',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/detail.vue'),
+                meta: {
+                  title: '销售单审核',
+                  icon: 'monitor',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'B_salesAudit'
+                }
+              },
+              {
+                path: 'add/:sn',
+                name: 'salesAdd',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/edit.vue'),
+                meta: {
+                  title: '新增销售单',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_salesEdit'
+                }
+              },
+              {
+                path: 'edit/:sn',
+                name: 'salesEdit',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/edit.vue'),
+                meta: {
+                  title: '编辑销售单',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_salesEdit'
+                }
+              },
+              {
+                path: 'waitDispatch/:salesBillSn',
+                name: 'waitDispatch',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/waitDispatch/edit.vue'),
+                meta: {
+                  title: '下推销售单',
+                  icon: 'monitor',
+                  replaceTab: true,
+                  hidden: true,
+                  permission: 'B_salesDispatch'
+                }
+              }
+            ]
+          },
           {
             path: '/salesManagement/salesQueryNew',
             redirect: '/salesManagement/salesQueryNew/list',
             name: 'salesQueryNew',
             component: BlankLayout,
             meta: {
-              title: '销售单查询',
+              title: '销售单查询(新版)',
               icon: 'monitor',
               permission: 'M_salesQueryList'
             },
@@ -144,7 +227,7 @@ export const asyncRouterMap = [
                 name: 'salesQueryNewList',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/list.vue'),
                 meta: {
-                  title: '销售单列表',
+                  title: '销售单列表(新版)',
                   icon: 'monitor',
                   hidden: true,
                   permission: 'M_salesQueryList'
@@ -155,7 +238,7 @@ export const asyncRouterMap = [
                 name: 'salesNewDetail',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/detail.vue'),
                 meta: {
-                  title: '销售单详情',
+                  title: '销售单详情(新版)',
                   icon: 'monitor',
                   hidden: true,
                   replaceTab: true,
@@ -167,7 +250,7 @@ export const asyncRouterMap = [
                 name: 'salesNewDetailAudit',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/detail.vue'),
                 meta: {
-                  title: '销售单审核',
+                  title: '销售单审核(新版)',
                   icon: 'monitor',
                   hidden: true,
                   replaceTab: true,
@@ -179,7 +262,7 @@ export const asyncRouterMap = [
                 name: 'salesNewAdd',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/edit.vue'),
                 meta: {
-                  title: '新增销售单',
+                  title: '新增销售单(新版)',
                   icon: 'monitor',
                   hidden: true,
                   permission: 'B_salesEdit'
@@ -190,7 +273,7 @@ export const asyncRouterMap = [
                 name: 'salesNewEdit',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/edit.vue'),
                 meta: {
-                  title: '编辑销售单',
+                  title: '编辑销售单(新版)',
                   icon: 'monitor',
                   hidden: true,
                   permission: 'B_salesEdit'
@@ -201,7 +284,7 @@ export const asyncRouterMap = [
                 name: 'waitDispatchNew',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/waitDispatchNew/edit.vue'),
                 meta: {
-                  title: '下推销售单',
+                  title: '下推销售单(新版)',
                   icon: 'monitor',
                   replaceTab: true,
                   hidden: true,

+ 4 - 1
src/views/salesManagement/waitDispatch/edit.vue

@@ -264,7 +264,10 @@ export default {
       const _this = this
       _this.delLoading = true
       _this.spinning = true
-      deleteBatch(type == 0 ? [row.dispatchBillDetailSn] : row).then(res => {
+      deleteBatch({
+        dispatchBillSn: this.productForm.dispatchBillSn,
+        dispatchBillDetailList : type == 0 ? [row.dispatchBillDetailSn] : row
+      }).then(res => {
         if (res.status == 200) {
           _this.resetSearchForm()
           _this.$refs.partQuery.resetCurForm()

+ 4 - 1
src/views/salesManagement/waitDispatchNew/edit.vue

@@ -260,7 +260,10 @@ export default {
       const _this = this
       _this.delLoading = true
       _this.spinning = true
-      deleteBatch(type == 0 ? [row.dispatchBillDetailSn] : row).then(res => {
+      deleteBatch({
+        dispatchBillSn: this.productForm.dispatchBillSn,
+        dispatchBillDetailList : type == 0 ? [row.dispatchBillDetailSn] : row
+      }).then(res => {
         if (res.status == 200) {
           _this.resetSearchForm()
           _this.$refs.partQuery.resetCurForm()