Ver código fonte

Merge branch 'develop_yh12' of jianguan-web/jg-ocs-html into pre-release

李磊 2 anos atrás
pai
commit
3183f3eecc

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.1.75",
+    "version": "2.1.80",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 4 - 4
src/views/reportData/transferReturnReport/list.vue

@@ -120,7 +120,7 @@ import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import AllocateType from '@/views/common/allocateType.js'
 import { hdExportExcel } from '@/libs/exportExcel'
-import { sparePartsReturnDetailReportList, sparePartsReturnDetailReportStat, sparePartsReturnReportExportDetail } from '@/api/reportData'
+import { allocateReturnReportQueryPage, allocateReturnReportQueryCount, allocateReturnReportExport } from '@/api/reportData'
 export default {
   name: 'TransferReturnReportList',
   mixins: [commonMixin],
@@ -157,7 +157,7 @@ export default {
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
         delete params.time
-        return sparePartsReturnDetailReportList(params).then(res => {
+        return allocateReturnReportQueryPage(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -214,7 +214,7 @@ export default {
           _this.showExport = true
           _this.exportLoading = true
           _this.spinning = true
-          hdExportExcel(sparePartsReturnReportExportDetail, params, '调拨退货单报表', function () {
+          hdExportExcel(allocateReturnReportExport, params, '调拨退货单报表', function () {
             _this.exportLoading = false
             _this.spinning = false
           })
@@ -229,7 +229,7 @@ export default {
     },
     // 总计
     getCount (params) {
-      sparePartsReturnDetailReportStat(params).then(res => {
+      allocateReturnReportQueryCount(params).then(res => {
         if (res.status == 200 && res.data) {
           this.totalData = res.data
         } else {