Browse Source

下推修改

lilei 4 years ago
parent
commit
7a622a6c77

+ 7 - 1
src/api/dispatch.js

@@ -24,6 +24,13 @@ export const dispatchDetaillList = (params) => {
   })
 }
 
+// 根据销售单SN查询发货单
+export const findBySalesBillSn = (params) => {
+  return axios({
+    url: `/dispatch/findBySalesBillSn/${params.salesBillSn}`,
+    method: 'get'
+  })
+}
 // 根据发货单SN查询发货单对象
 export const dispatchFindBySn = (params) => {
   return axios({
@@ -31,7 +38,6 @@ export const dispatchFindBySn = (params) => {
     method: 'get'
   })
 }
-
 // 发货单统计查询
 export const dispatchQueryCount = (params) => {
   return axios({

+ 6 - 7
src/api/waitDispatchDetail.js

@@ -3,7 +3,7 @@ import { axios } from '@/utils/request'
 //  批量删除
 export const deleteBatch = (params) => {
   return axios({
-    url: '/waitDispatchDetail/deleteBatch',
+    url: '/dispatch/detail/deleteBatch',
     data: params,
     method: 'post'
   })
@@ -12,7 +12,7 @@ export const deleteBatch = (params) => {
 // 下推
 export const pushDown = (params) => {
   return axios({
-    url: `/waitDispatchDetail/pushDown/${params.salesBillSn}`,
+    url: `/dispatch/detail/pushDown/${params.dispatchBillSn}`,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export const pushDown = (params) => {
 // 统计查询
 export const queryCount = (params) => {
   return axios({
-    url: `/waitDispatchDetail/queryCount/${params.salesBillSn}`,
+    url: `/dispatch/queryCount`,
     data: params,
     method: 'post'
   })
@@ -28,7 +28,7 @@ export const queryCount = (params) => {
 
 // 列表  有分页
 export const waitDispatchDetailList = (params) => {
-  const url = `/waitDispatchDetail/queryPage/${params.pageNo}/${params.pageSize}`
+  const url = `/dispatch/detail/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -40,7 +40,7 @@ export const waitDispatchDetailList = (params) => {
 
 // 列表  不分页
 export const waitDispatchDetailAllList = (params) => {
-  const url = `/waitDispatchDetail/query`
+  const url = `/dispatch/detail/query`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -53,12 +53,11 @@ export const waitDispatchDetailAllList = (params) => {
 //  数量修改
 export const updateQty = (params) => {
   return axios({
-    url: '/waitDispatchDetail/updateQty',
+    url: '/dispatch/detail/updateQty',
     data: params,
     method: 'post'
   })
 }
- 
 
 
 

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

@@ -727,7 +727,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'waitDispatch/:sn',
+                path: 'waitDispatch/:salesBillSn/:dispatchBillSn',
                 name: 'waitDispatch',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/waitDispatch/edit.vue'),
                 meta: {

+ 9 - 1
src/views/salesManagement/salesQuery/list.vue

@@ -191,6 +191,7 @@ import { STable, VSelect } from '@/components'
 import chooseCustomModal from './chooseCustomModal.vue'
 import custList from '@/views/common/custList.vue'
 import { salesList, salesDel, salesWriteAudit, salesCount } from '@/api/sales'
+import { findBySalesBillSn } from '@/api/dispatch'
 export default {
   name: 'TableList',
   components: { STable, VSelect, chooseCustomModal, custList },
@@ -296,7 +297,11 @@ export default {
     },
     // 下推
     handleDispatch (row) {
-      this.$router.push({ name: 'waitDispatch', params: { sn: row.salesBillSn } })
+      findBySalesBillSn({ salesBillSn: row.salesBillSn }).then(res => {
+        if (res.status == 200) {
+          this.$router.push({ name: 'waitDispatch', params: { salesBillSn: row.salesBillSn, dispatchBillSn: res.data.dispatchBillSn } })
+        }
+      })
     },
     //  审核
     handleEexamine (row) {
@@ -327,6 +332,9 @@ export default {
         if (res.status == 200) {
           this.$message.success(res.message)
           this.$refs.table.refresh()
+          if (billStatus == 'OUTING_WAREHOUSE') {
+            this.handleDispatch({ salesBillSn })
+          }
         }
       })
     },

+ 7 - 7
src/views/salesManagement/waitDispatch/edit.vue

@@ -30,7 +30,7 @@
           待下推产品
         </div>
       </div>
-      <div class="table-operator">
+      <div style="margin: 0 0 10px 0;">
         <a-button
           type="primary"
           @click="delSalerDetailAll"
@@ -126,7 +126,7 @@ export default {
       detailData: { discountAmount: 0, id: null, salesBillSn: '' }, // 订单基础数据
       dataSource: [],
       productForm: {
-        salesBillSn: ''
+        dispatchBillSn: ''
       },
       selectedRowKeys: [], // Check here to configure the default column
       selectedRows: [],
@@ -143,7 +143,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        this.productForm.salesBillSn = this.$route.params.sn
+        this.productForm.dispatchBillSn = this.$route.params.dispatchBillSn
 
         // 查询统计
         this.getTotalData(Object.assign(parameter, this.productForm))
@@ -293,7 +293,7 @@ export default {
     // 一键下推
     oneDispatch () {
       this.isInster = true
-      salesDetailDispatchByOneKey({ salesBillSn: this.$route.params.sn }).then(res => {
+      salesDetailDispatchByOneKey({ salesBillSn: this.$route.params.salesBillSn }).then(res => {
         if (res.status == 200) {
           this.resetSearchForm()
           this.$refs.partQuery.resetCurForm()
@@ -303,7 +303,7 @@ export default {
     },
     //  销售单详情
     getOrderDetail () {
-      salesDetailBySn({ salesBillSn: this.$route.params.sn }).then(res => {
+      salesDetailBySn({ salesBillSn: this.$route.params.salesBillSn }).then(res => {
         console.log('getOrderDetail')
         if (res.status == 200) {
           this.detailData = res.data
@@ -316,7 +316,7 @@ export default {
       this.delLoading = true
       this.isInster = true
       this.loading = true
-      pushDown({ salesBillSn: this.$route.params.sn }).then(res => {
+      pushDown({ dispatchBillSn: this.$route.params.dispatchBillSn }).then(res => {
         if (res.status == 200) {
           this.handleBack()
           this.$message.success(res.message)
@@ -333,7 +333,7 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       console.log('beforeRouteEnter')
-      vm.salesBillSn = vm.$route.params.sn
+      vm.salesBillSn = vm.$route.params.salesBillSn
     })
   }
 }