Pārlūkot izejas kodu

Merge branch 'develop_yh15' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh15

lilei 2 gadi atpakaļ
vecāks
revīzija
da141e035f

+ 1 - 1
src/views/reportData/storeReceivedSendStorageReport/list.vue

@@ -227,7 +227,7 @@ export default {
                 { no: 8, beginDetail: null, beginAmount: null, putDetail: '散件导入', putAmount: res.data.putSparePartsImportAmount, outDetail: null, outAmount: null, endDetail: null, endAmount: null },
                 { no: 8, beginDetail: null, beginAmount: null, putDetail: '散件导入', putAmount: res.data.putSparePartsImportAmount, outDetail: null, outAmount: null, endDetail: null, endAmount: null },
                 { no: 9, beginDetail: null, beginAmount: null, putDetail: null, putAmount: null, outDetail: '店内调出', outAmount: res.data.outShopCallOutAmount, endDetail: null, endAmount: null },
                 { no: 9, beginDetail: null, beginAmount: null, putDetail: null, putAmount: null, outDetail: '店内调出', outAmount: res.data.outShopCallOutAmount, endDetail: null, endAmount: null },
                 { no: 10, beginDetail: null, beginAmount: null, putDetail: null, putAmount: null, outDetail: '急件冲减', outAmount: res.data.outDispatchDeductAmount, endDetail: null, endAmount: null },
                 { no: 10, beginDetail: null, beginAmount: null, putDetail: null, putAmount: null, outDetail: '急件冲减', outAmount: res.data.outDispatchDeductAmount, endDetail: null, endAmount: null },
-                { no: 11, beginDetail: null, beginAmount: null, putDetail: '货架调回', putAmount: res.data.putSparePartsImportAmount, outDetail: '货架补货', outAmount: res.data.outDispatchDeductAmount, endDetail: null, endAmount: null },
+                { no: 11, beginDetail: null, beginAmount: null, putDetail: '货架调回', putAmount: res.data.putShelfRecallAmount, outDetail: '货架补货', outAmount: res.data.outShelfReplenishAmount, endDetail: null, endAmount: null },
                 { no: '成本合计', beginDetail: ' ', beginAmount: res.data.beginAmount, putDetail: ' ', putAmount: res.data.putAmount, outDetail: ' ', outAmount: res.data.outAmount, endDetail: '月末余额', endAmount: res.data.endAmount }
                 { no: '成本合计', beginDetail: ' ', beginAmount: res.data.beginAmount, putDetail: ' ', putAmount: res.data.putAmount, outDetail: ' ', outAmount: res.data.outAmount, endDetail: '月末余额', endAmount: res.data.endAmount }
               ]
               ]
             } else {
             } else {