chenrui 4 лет назад
Родитель
Сommit
f873123a3c

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

@@ -1142,7 +1142,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'add/:id/:sn/:name',
+                path: 'add/:sn/:name/:dealerSn',
                 name: 'transferOutAdd',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/transferOut/edit.vue'),
                 meta: {
@@ -1153,7 +1153,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'edit/:id/:sn/:name',
+                path: 'edit/:sn/:name/:dealerSn',
                 name: 'transferOutEdit',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/transferOut/edit.vue'),
                 meta: {

+ 3 - 1
src/views/allocationManagement/transferOut/detail.vue

@@ -122,7 +122,9 @@ export default {
     },
     //  编辑
     handleEdit () {
-      this.$router.push({ path: `/allocationManagement/transferOut/edit/${this.basicInfoData.id}/${this.basicInfoData.allocateSn}/${this.basicInfoData.targetName}` })
+      //  调往对象为经销商,需传递经销商sn
+      const dealerSn = this.basicInfoData.targetType == 'DEALER' && this.basicInfoData.targetSn ? this.basicInfoData.targetSn : ' '
+      this.$router.push({ path: `/allocationManagement/transferOut/edit/${this.basicInfoData.allocateSn}/${this.basicInfoData.targetName}/${dealerSn}` })
     }
   },
   beforeRouteEnter (to, from, next) {

+ 1 - 1
src/views/allocationManagement/transferOut/edit.vue

@@ -182,7 +182,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        return queryStockProductPage(Object.assign(parameter, this.queryParam)).then(res => {
+        return queryStockProductPage(Object.assign(parameter, this.queryParam, this.$route.params.dealerSn != ' ' ? { dealerSn: this.$route.params.dealerSn } : {})).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {

+ 5 - 2
src/views/allocationManagement/transferOut/list.vue

@@ -190,7 +190,8 @@ export default {
     },
     //  基本信息  保存
     handleOk (data) {
-      this.$router.push({ path: `/allocationManagement/transferOut/add/${data.id}/${data.allocateSn}/${data.targetName}` })
+      const dealerSn = data.targetType == 'DEALER' && data.targetSn ? data.targetSn : ' '
+      this.$router.push({ path: `/allocationManagement/transferOut/add/${data.allocateSn}/${data.targetName}/${dealerSn}` })
     },
     //  删除
     handleDel (row) {
@@ -246,7 +247,9 @@ export default {
     },
     //  编辑
     handleEdit (row) {
-      this.$router.push({ path: `/allocationManagement/transferOut/edit/${row.id}/${row.allocateSn}/${row.targetName}` })
+      //  调往对象为经销商,需传递经销商sn
+      const dealerSn = row.targetType == 'DEALER' && row.targetSn ? row.targetSn : ' '
+      this.$router.push({ path: `/allocationManagement/transferOut/edit/${row.allocateSn}/${row.targetName}/${dealerSn}` })
     },
     //  导出
     handleExport () {