chenrui 4 éve
szülő
commit
e3b1777b78

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

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

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

@@ -122,9 +122,7 @@ export default {
     },
     //  编辑
     handleEdit () {
-      //  调往对象为经销商,需传递经销商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}` })
+      this.$router.push({ path: `/allocationManagement/transferOut/edit/${this.basicInfoData.allocateSn}/${this.basicInfoData.targetName}` })
     }
   },
   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, this.$route.params.dealerSn != ' ' ? { dealerSn: this.$route.params.dealerSn } : {})).then(res => {
+        return queryStockProductPage(Object.assign(parameter, this.queryParam, { zeroQtyFlag: '0' })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {

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

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

+ 1 - 1
src/views/salesManagement/salesQuery/queryPart.vue

@@ -137,7 +137,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.queryParam.dealerSn = this.buyerSn
-        return queryStockProductPage(Object.assign(parameter, this.queryParam)).then(res => {
+        return queryStockProductPage(Object.assign(parameter, this.queryParam, { onlineFalg: '1' })).then(res => {
           const data = res.data
           data.list = data.list.filter(item => item != null)
           const no = (data.pageNo - 1) * data.pageSize

+ 1 - 1
src/views/salesManagement/salesReturn/queryPart.vue

@@ -110,7 +110,7 @@ export default {
           this.queryParam.dealerSn = this.buyerSn
         }
         const fun = [queryStockProductPage, salesQueryByReturn]
-        return fun[this.grabFlag](Object.assign(parameter, this.queryParam)).then(res => {
+        return fun[this.grabFlag](Object.assign(parameter, this.queryParam, { onlineFalg: '1' })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {