1 vuosi sitten
vanhempi
commit
402ed48b59
2 muutettua tiedostoa jossa 16 lisäystä ja 3 poistoa
  1. 11 0
      src/api/sb/sb-resume.js
  2. 5 3
      src/views/sb/resume/SbResume.vue

+ 11 - 0
src/api/sb/sb-resume.js

@@ -32,6 +32,17 @@ export function exportSbMeasure (parameter) {
     responseType: 'blob'
   })
 }
+
+export function exportSbMeasure2 (parameter) {
+  return axios({
+    url: '/sb/measure-logs/export2?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    },
+    responseType: 'blob'
+  })
+}
 /**
  * page func
  * parameter: { }

+ 5 - 3
src/views/sb/resume/SbResume.vue

@@ -87,7 +87,7 @@
 <script>
 import { STable, Ellipsis } from '@/components'
 
-import { getMeasurePage, exportSbMeasure } from '@/api/sb/sb-resume'
+import { getMeasurePage, exportSbMeasure2 } from '@/api/sb/sb-resume'
 
 export default {
   name: 'SbRunFillList',
@@ -121,7 +121,7 @@ export default {
           title: '操作类型',
           checked: true,
           width: 200,
-          dataIndex: 'type',
+          dataIndex: 'otherType',
           customRender: (text, record, index) => {
             return this.otherTypeMap[text]
           }
@@ -186,6 +186,8 @@ export default {
   created () {
     // 下拉框map
     this.otherTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_MEASURE_OTHER_TYPE)
+    console.log(11)
+    console.log(this.otherTypeMap)
   },
   methods: {
     tableOption () {
@@ -247,7 +249,7 @@ export default {
       const parameter = {
         ...this.queryParam
       }
-      exportSbMeasure(parameter).then(file => {
+      exportSbMeasure2(parameter).then(file => {
         this.BaseTool.UPLOAD.downLoadExportExcel(file)
       })
     },