Merge branch 'master' of http://119.23.210.103:3000/wy/lh_firm_former

src/business/platform/bpmn/form/action.js

@@ -17,7 +17,6 @@ export default {
         // 设置是否过审的状态
         setData(title) {
             let data = title
-            console.log(this.getFormEL())
             if (!title) {
                 //获取当前流程步骤名
                 data = "已" + this.getFormEL().formDefData.flowName
@@ -425,7 +424,6 @@ export default {
                 })
             }).catch((err) => {
                 loading.close()
-                console.error(err)
             })
         },
         /**
@@ -459,7 +457,6 @@ export default {
                 })
             }).catch((err) => {
                 loading.close()
-                console.error(err)
             })
         },
         /**

src/plugins/export/_export2Excel.js

@@ -141,7 +141,9 @@ export function export_json_to_excel(th, jsonData, defaultTitle, options = { mer
   wb.SheetNames.push(ws_name)
   wb.Sheets[ws_name] = ws
 
-  var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: false, type: 'binary' })
+//   var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: false, type: 'binary' })
+  var wbout = XLSX.write(wb, { bookType: 'xls', bookSST: false, type: 'binary' })
   var title = defaultTitle || '列表'
-  FileSaver.saveAs(new Blob([s2ab(wbout)], { type: 'application/octet-stream' }), title + '.xlsx')
+//   FileSaver.saveAs(new Blob([s2ab(wbout)], { type: 'application/octet-stream' }), title + '.xlsx')
+FileSaver.saveAs(new Blob([s2ab(wbout)], { type: 'application/octet-stream' }), title + '.xls')
 }