chenrui 3 vuotta sitten
vanhempi
commit
2065fcb612

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

@@ -1266,7 +1266,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'grabEdit/:id/:sn',
+                path: 'grabEdit/:id/:sn/:supplierSn',
                 name: 'bulkReturnGoodsGrabEdit',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkReturnGoods/grabEdit.vue'),
                 meta: {

+ 1 - 0
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -327,6 +327,7 @@ export default {
           this.spinning = false
         } else {
           this.spinning = false
+          this.$refs.chooseTable.refresh()
         }
       })
     },

+ 6 - 6
src/views/bulkManagement/bulkReturnGoods/grabEdit.vue

@@ -202,7 +202,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        return sparePartsPurDetailFinishList(Object.assign(parameter, this.queryParam, { state: 'FINISH' })).then(res => {
+        return sparePartsPurDetailFinishList(Object.assign(parameter, this.queryParam, { state: 'FINISH', supplierSn: this.$route.params.supplierSn })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -231,8 +231,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       chooseLoadData: parameter => {
         this.chooseDisabled = true
-        const params = Object.assign(parameter, this.chooseQueryParam, { sparePartsReturnSn: this.$route.params.sn })
-        return sparePartsRetDetailList(params).then(res => {
+        return sparePartsRetDetailList(Object.assign(parameter, this.chooseQueryParam, { sparePartsReturnSn: this.$route.params.sn })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -242,7 +241,7 @@ export default {
           }
           this.localDataSource = data.list || []
           this.chooseDisabled = false
-          this.getDetailCount(params)
+          this.getDetailCount()
           return data
         })
       },
@@ -253,8 +252,8 @@ export default {
   },
   methods: {
     // 合计
-    getDetailCount (params) {
-      sparePartsRetDetailCount(params).then(res => {
+    getDetailCount () {
+      sparePartsRetDetailCount(Object.assign(this.chooseQueryParam, { sparePartsReturnSn: this.$route.params.sn })).then(res => {
         if (res.status == 200) {
           this.productTotal = res.data
         } else {
@@ -322,6 +321,7 @@ export default {
           this.spinning = false
         } else {
           this.spinning = false
+          this.$refs.chooseTable.refresh()
         }
       })
     },

+ 6 - 2
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -207,7 +207,7 @@ export default {
     },
     //  基本信息  保存
     handleOk (data) {
-      this.$router.push({ name: data.isGrab == 1 ? 'bulkReturnGoodsGrabEdit' : 'bulkReturnGoodsEdit', params: { id: data.id, sn: data.sparePartsReturnSn } })
+      this.handleEdit(data)
     },
     //  新增
     handleAdd () {
@@ -215,7 +215,11 @@ export default {
     },
     //  编辑
     handleEdit (row) {
-      this.$router.push({ name: row.isGrab == 1 ? 'bulkReturnGoodsGrabEdit' : 'bulkReturnGoodsEdit', params: { id: row.id, sn: row.sparePartsReturnSn } })
+      if (row.isGrab == 1) {
+        this.$router.push({ name: 'bulkReturnGoodsGrabEdit', params: { id: row.id, sn: row.sparePartsReturnSn, supplierSn: row.supplierSn } })
+      } else {
+        this.$router.push({ name: 'bulkReturnGoodsEdit', params: { id: row.id, sn: row.sparePartsReturnSn } })
+      }
     },
     //  详情
     handleDetail (row) {