操作日志,用户列表，管理员列表

package-lock.json

@@ -1634,7 +1634,7 @@
     },
     "cfb": {
       "version": "1.1.4",
-      "resolved": "https://registry.npm.taobao.org/cfb/download/cfb-1.1.4.tgz?cache=0&sync_timestamp=1584079355027&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcfb%2Fdownload%2Fcfb-1.1.4.tgz",
+      "resolved": "https://registry.npm.taobao.org/cfb/download/cfb-1.1.4.tgz",
       "integrity": "sha1-gf017eTJGdjwliqUWC4d+vcFHio=",
       "requires": {
         "adler-32": "~1.2.0",
@@ -1645,7 +1645,7 @@
       "dependencies": {
         "commander": {
           "version": "2.20.3",
-          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.20.3.tgz",
+          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.20.3.tgz?cache=0&sync_timestamp=1584148356834&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.20.3.tgz",
           "integrity": "sha1-/UhehMA+tIgcIHIrpIA16FMa6zM="
         }
       }
@@ -1877,7 +1877,7 @@
       "dependencies": {
         "commander": {
           "version": "2.14.1",
-          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz?cache=0&sync_timestamp=1584148356834&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.14.1.tgz",
           "integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao="
         }
       }
@@ -10486,7 +10486,7 @@
     },
     "ssf": {
       "version": "0.10.3",
-      "resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz?cache=0&sync_timestamp=1592373934925&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fssf%2Fdownload%2Fssf-0.10.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz",
       "integrity": "sha1-jq4fwpyQpVLnkhII+BiS1vd6yys=",
       "requires": {
         "frac": "~1.1.2"
@@ -12127,7 +12127,7 @@
       "dependencies": {
         "commander": {
           "version": "2.17.1",
-          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1584148356834&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz",
           "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
         }
       }

src/api/inventory.js

@@ -122,3 +122,43 @@ export function editDepart(params) {
     params
   })
 }
+// 万科h5_查询一条商品记录
+export function getGoodsDetail(data) {
+  return request({
+    url: 'vankeGoods/selectOneByOter',
+    method: 'post',
+    data
+  })
+}
+// 万科h5_校验二维码唯一标识符
+export function checkQcode (params) {
+  return request({
+    url: 'staff/checkOnlyId',
+    method: 'get',
+    params
+  })
+}
+// 根据会员id查询一条数据
+export function getMemberInfo (params) {
+  return request({
+    url: 'umsMember/selectOneByMemberId',
+    method: 'get',
+    params
+  })
+}
+// 万科后台_出库多条物品
+export function outGoods(data) {
+  return request({
+    url: 'vankeGoods/OutVankeGoodsList',
+    method: 'post',
+    data
+  })
+}
+// 万科后台_入库单分页查询
+export function getInBoundList (params) {
+  return request({
+    url: 'vankeInboundOrder/getPageList',
+    method: 'get',
+    params
+  })
+}

src/api/user.js

@@ -29,3 +29,11 @@ export function cancleAdmin(data) {
     data
   })
 }
+// 万科后台_批量导入会员
+export function importMember(data) {
+  return request({
+    url: 'umsMember/vankeImportMember',
+    method: 'post',
+    data
+  })
+}

src/store/modules/user.js

@@ -7,7 +7,7 @@ const user = {
     token: getToken(),
     name: '',
     userId: getCookie("userId"),
-    memeberId: getCookie("memeberId"),
+    memberId: getCookie("memberId"),
     stockRoomId: getCookie("stockRoomId"),
     avatar: '',
     roles: []
@@ -27,9 +27,9 @@ const user = {
       state.userId = userId
       setCookie("userId", userId, 15)
     },
-    SET_MEMBERID: (state, memeberId) => {
-      state.memeberId = memeberId
-      setCookie("memeberId", memeberId, 15)
+    SET_MEMBERID: (state, memberId) => {
+      state.memberId = memberId
+      setCookie("memberId", memberId, 15)
     },
     SET_STOCKROOMID: (state, stockRoomId) => {
       state.stockRoomId = stockRoomId

src/views/home/index.vue

@@ -58,7 +58,9 @@
               <el-button size="small" :type="inOutType==6? 'primary': ''" plain  @click="selectStockByGoodsIdAndTime(6)">7天</el-button>
               <el-button size="small"  :type="inOutType==14? 'primary': ''" plain  @click="selectStockByGoodsIdAndTime(14)">15天</el-button>
               <div>
-                <ve-line :data="chartData" :legend-visible="false" :settings="chartSetting"></ve-line>
+                <ve-line :data="chartData" :loading="loading"
+                         :data-empty="dataEmpty"  :settings="chartSetting">
+                </ve-line>
               </div>
             </div>
           </div>
@@ -66,7 +68,7 @@
         <el-col :span="10">
           <div class="out-border">
             <div class="layout-title">库存预警</div>
-            <div style="padding: 40px">
+            <div style="padding: 40px;height: 451px;">
               <el-table
                 :data="homeData.stockWarns"
                 style="width: 100%">
@@ -137,7 +139,7 @@
 <script>
 import { str2Date } from '@/utils/date'
 import { getHomeData,selectStockByGoodsIdAndTime,selectInBoundByCategory,selectOutBoundByCategory,selectOutBoundByDepartId } from '@/api/home'
-
+import 'v-charts/lib/style.css'
 export default {
   name: 'home',
   data() {
@@ -224,6 +226,9 @@ export default {
       this.inOutType= type
       selectStockByGoodsIdAndTime({dateList: this.formatEveryDay(this.inOutType)}).then(res=>{
         this.chartData.rows = res.data
+        if(!this.chartData.rows){
+          this.dataEmpty = true
+        }
       })
     },
     getHomeData() {

src/views/inv/StockAdmin.vue

 <template> 
   <div class="app-container">
     <!-- 搜索栏 -->
-    <el-card class="filter-container"
-             shadow="never">
-      <el-form :inline="true"
-               :model="listQuery"
-               size="small">
-        <el-form-item label="物品名称：">
-          <el-input v-model="listQuery.goodsMame"
-                    class="input-width"
-                    placeholder="请输入物品名称"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary"
-                     @click="handleSearchList"
-                     icon="el-icon-search"
-                     size="small">搜索
-          </el-button>
-          <el-button @click="handleResetSearch"
-                     icon="el-icon-refresh"
-                     size="small">重置
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
+    <!--    <el-card class="filter-container"-->
+    <!--             shadow="never">-->
+    <!--      <el-form :inline="true"-->
+    <!--               :model="listQuery"-->
+    <!--               size="small">-->
+    <!--        <el-form-item label="物品名称：">-->
+    <!--          <el-input v-model="listQuery.goodsMame"-->
+    <!--                    class="input-width"-->
+    <!--                    placeholder="请输入物品名称"></el-input>-->
+    <!--        </el-form-item>-->
+    <!--        <el-form-item>-->
+    <!--          <el-button type="primary"-->
+    <!--                     @click="handleSearchList"-->
+    <!--                     icon="el-icon-search"-->
+    <!--                     size="small">搜索-->
+    <!--          </el-button>-->
+    <!--          <el-button @click="handleResetSearch"-->
+    <!--                     icon="el-icon-refresh"-->
+    <!--                     size="small">重置-->
+    <!--          </el-button>-->
+    <!--        </el-form-item>-->
+    <!--      </el-form>-->
+    <!--    </el-card>-->
     <!-- 表格栏 -->
     <el-card class="filter-container mt15"
              shadow="never">
@@ -37,15 +37,16 @@
                            width="50"></el-table-column>
           <el-table-column label="物品名称"
                            align="center">
-            <template slot-scope="scope">{{scope.row.goodsName}}</template>
+            <template slot-scope="scope">{{scope.row.vorList | getName}}</template>
           </el-table-column>
           <el-table-column label="总数量"
                            align="center">
-            <template slot-scope="scope">{{scope.row.inboundNum}}</template>
+            <template slot-scope="scope">{{scope.row.vorList | getNum}}</template>
           </el-table-column>
           <el-table-column label="入库人"
                            align="center">
-            <template slot-scope="scope">{{$store.getters.type == 1? scope.row.backInboundName : scope.row.receptInboundName}}
+            <template slot-scope="scope">{{$store.getters.type == 1? scope.row.backName :
+              scope.row.receptName}}
             </template>
           </el-table-column>
           <el-table-column label="入库日期"
@@ -67,7 +68,7 @@
               </el-button>
               <el-button size="mini"
                          type="primary"
-                         @click="exportEntry(scope.row.id)">生成入库单
+                         @click="exportEntry(scope.row)">生成入库单
               </el-button>
             </template>
           </el-table-column>
@@ -95,13 +96,12 @@
 </template>
 <script>
 import moment from 'moment'
-import { getInboundRecordList } from '@/api/inventory'
+import { getInBoundList } from '@/api/inventory'
 import inventoryDetailsModal from './modules/inventoryDetailsModal'
 // 列表查询参数默认值
 const defaultListQuery = {
   pageNum: 1,
-  pageSize: 10,
-  goodsMame: ''
+  pageSize: 10
 }
 
 export default {
@@ -116,7 +116,7 @@ export default {
       multipleSelection: [],
     }
   },
-  created() {
+  mounted() {
     this.getList()
   },
   filters: {
@@ -125,7 +125,28 @@ export default {
         return '--'
       }
       return moment(time).format('YYYY-MM-DD HH:mm:ss')
+    },
+    getName(value) {
+      if (!value.length) {
+        return '--'
       }
+      let arr = []
+      value.forEach(item => {
+        arr.push(item.goodsName)
+      })
+      return arr.join('/')
+    },
+    getNum(value) {
+      if (!value.length) {
+        return '0'
+      }
+      let num = 0
+      value.forEach(item => {
+        num += item.inboundNum
+      })
+      return num
+    },
+
   },
   methods: {
     handleResetSearch() {
@@ -153,10 +174,10 @@ export default {
       this.listLoading = true
       //请求数据
       console.log('listQuery', this.listQuery)
-      if(this.$store.getters.type == 2){
-        this.listQuery.stockRoomId = this.$store.getters.stockRoomId
-      }
-      getInboundRecordList(this.listQuery).then(res => {
+      // if(this.$store.getters.type == 2){
+      //   this.listQuery.stockRoomId = this.$store.getters.stockRoomId
+      // }
+      getInBoundList(this.listQuery).then(res => {
         this.listLoading = false
         this.list = res.data.list
         this.total = res.data.total
@@ -165,8 +186,27 @@ export default {
       })
     },
     // 查看
-    handleView(id) {
-      this.$refs.detail.init()
+    handleView(row) {
+      this.$refs.detail.init(row)
+    },
+    // 导出
+    exportEntry(row) {
+      if (!row.vorList.length) {
+        this.$message.warning('没有可生成的入库单')
+      }
+      require.ensure([], () => {
+        let { exportJsonToExcel } = require('../../../static/Export2Excel')
+        // 表头
+        let tHeader = ['物品名称', '型号', '物品类别', '数量', '价格（元）', '供应商']
+        //表头对应字段名，要和下面数据key对应
+        let filterVal = ['goodsName', 'goodsNo', 'categoryName', 'inboundNum', 'prict', 'supplierName']
+        let data = this.formatJson(filterVal, row.vorList) //数据格式化
+        exportJsonToExcel(tHeader, data, '入库单') //导出文件
+      })
+    },
+    // 数据格式化
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]))
     }
   }
 }

src/views/inv/StoreList.vue

@@ -64,8 +64,8 @@
              shadow="never">
       <el-row type="flex" class="btn-groups" justify="end">
           <el-button type="primary" @click="handleAdd">新增</el-button>
-          <el-button type="success" @click="handleAdd">扫码入库</el-button>
-          <el-button type="info" @click="handleAdd">扫码出库</el-button>
+          <el-button type="success" @click="handleScanPut">扫码入库</el-button>
+          <el-button type="info" @click="handleScanOut">扫码出库</el-button>
           <el-button type="warning" @click="handleImport">导入</el-button>
       </el-row>
       <div class="table-container">
@@ -130,6 +130,8 @@
 <!--    弹窗-->
     <add-goods-modal ref="addGoods" @ok="getList"></add-goods-modal>
     <import-goods-modal ref="importGoods" @ok="getList"></import-goods-modal>
+    <scan-put-storage ref="scanPut" @ok="getList"></scan-put-storage>
+    <scan-out-storage ref="scanOut" @ok="getList"></scan-out-storage>
   </div>
 </template>
 <script>
@@ -138,6 +140,8 @@ import { getGoodsList,getGoodsCategoryList,getStockRooms, editGoods } from '@/ap
 import {getSuppliersList} from '@/api/supplier'
 import AddGoodsModal from './modules/addGoodsModal'
 import ImportGoodsModal from './modules/importGoodsModal'
+import ScanPutStorage from './modules/scanPutStorage'
+import ScanOutStorage from './modules/scanOutStorage'
 // 列表查询参数默认值
 const defaultListQuery = {
   pageNum: 1,
@@ -151,8 +155,10 @@ const defaultListQuery = {
 export default {
   name: 'StoreList',
   components: {
+    ScanOutStorage,
     AddGoodsModal,
-    ImportGoodsModal
+    ImportGoodsModal,
+    ScanPutStorage
   },
   data() {
     return {
@@ -252,6 +258,13 @@ export default {
     handleAdd(){
       this.$refs.addGoods.add()
     },
+    // 扫码入库
+    handleScanPut(){
+      this.$refs.scanPut.add()
+    },
+    handleScanOut(){
+      this.$refs.scanOut.add()
+    },
     // 导入
     handleImport(){
       this.$refs.importGoods.add()

src/views/inv/WarehouseAdmin.vue

@@ -79,7 +79,7 @@
           </el-table-column>
           <el-table-column label="物品类别"
                            align="center">
-            <template slot-scope="scope">{{scope.row.goodsCategoryName}}</template>
+            <template slot-scope="scope">{{scope.row.categoryName}}</template>
           </el-table-column>
           <el-table-column label="数量"
                            align="center">

src/views/inv/modules/addGoodsModal.vue

@@ -272,6 +272,10 @@ export default {
     //   row.isOK = !row.isOK
     // },
     submit(formName) {
+      if(!this.formData.tableData.length){
+        this.$message.warning('请检查必填项')
+        return
+      }
       this.$refs[formName].validate((valid) => {
         if (valid) {
           let data = this.formData.tableData

src/views/inv/modules/importGoodsModal.vue

@@ -343,6 +343,10 @@ export default {
     //   console.log('this.formData.tableData',this.formData.tableData)
     // },
     submit(formName) {
+      if(!this.formData.tableData.length){
+        this.$message.warning('请检查必填项')
+        return
+      }
       this.$refs[formName].validate((valid) => {
         if (valid) {
           addGoodList({ vankeGoodsList: this.formData.tableData }).then(res => {
@@ -462,6 +466,9 @@ export default {
             isExist === -1 && (rowTable.stockRoomId = null)
             isExist !== -1 && (rowTable.stockRoomId = this.depotOptions[isExist].id)
           }
+          if(this.$store.getters.type == 2){
+            rowTable.stockRoomId = this.$store.getters.stockRoomId
+          }
           if (sheet['物品名称']) {
             let isExist = this.goodsList.findIndex(item =>
               item.name === sheet['物品名称']

src/views/inv/modules/inventoryDetailsModal.vue

@@ -10,27 +10,27 @@
         :data="tableData"
         style="width: 100%">
         <el-table-column
-          prop="date"
+          prop="goodsName"
           label="物品名称">
         </el-table-column>
         <el-table-column
-          prop="name"
+          prop="goodsNo"
           label="型号">
         </el-table-column>
         <el-table-column
-          prop="address"
+          prop="categoryName"
           label="物品类别">
         </el-table-column>
         <el-table-column
-          prop="address"
+          prop="inboundNum"
           label="数量">
         </el-table-column>
         <el-table-column
-          prop="address"
+          prop="prict"
           label="价格（元）">
         </el-table-column>
         <el-table-column
-          prop="address"
+          prop="supplierName"
           label="供应商">
         </el-table-column>
       </el-table>
@@ -44,7 +44,6 @@
   </el-dialog>
 </template>
 <script>
-import { addMember,updateMcht } from '@/api/inventory'
 
 // 添加编辑属性
 export default {
@@ -54,37 +53,16 @@ export default {
       visible: false,
       title: null,
       loading: false,
-      tableData: new Array(10).fill({
-      date: '2016-05-02',
-      name: '王小虎',
-      address: '上海市普陀区金沙江路 1518 弄'
-       })
-      // tableData: [{
-      //   date: '2016-05-02',
-      //   name: '王小虎',
-      //   address: '上海市普陀区金沙江路 1518 弄'
-      // }, {
-      //   date: '2016-05-04',
-      //   name: '王小虎',
-      //   address: '上海市普陀区金沙江路 1517 弄'
-      // }, {
-      //   date: '2016-05-01',
-      //   name: '王小虎',
-      //   address: '上海市普陀区金沙江路 1519 弄'
-      // }, {
-      //   date: '2016-05-03',
-      //   name: '王小虎',
-      //   address: '上海市普陀区金沙江路 1516 弄'
-      // }]
+      tableData: []
     }
   },
   methods: {
-    init() {
+    init(row) {
       this.visible = true
+      this.tableData = row.vorList
       this.$nextTick(() => {
         this.$refs.scrollContainer.scrollTop = 0
       })
-
     },
     close() {
       this.visible = false

src/views/ums/menu/index.vue

@@ -213,4 +213,7 @@ export default {
 </script>
 
 <style scoped>
+  .operate-container .btn-add {
+    float: none;
+  }
 </style>

src/views/use/AdminList.vue

@@ -46,7 +46,7 @@
           </el-table-column>
           <el-table-column label="AD用户"
                            align="center">
-            <template slot-scope="scope">{{scope.row.departName || '--'}}</template>
+            <template slot-scope="scope">{{scope.row.jobNo || '--'}}</template>
           </el-table-column>
           <el-table-column label="部门"
                            align="center">

src/views/use/UserList.vue

@@ -96,14 +96,17 @@
     <!-- 弹窗 -->
     <add-admin ref="addAdmin"
                @ok="getList"></add-admin>
+    <import-member-modal ref="importMember"
+                         @ok="getList"></import-member-modal>
     <!-- end -->
   </div>
 </template>
 <script>
 import moment from 'moment'
 import { getMemberList, getAuditDetail, updateMcht } from '@/api/user'
-import { getDepartmentList} from '@/api/inventory'
+import { getDepartmentList } from '@/api/inventory'
 import AddAdmin from './modules/AddAdmin'
+import ImportMemberModal from './modules/importMemberModal'
 // 列表查询参数默认值
 const defaultListQuery = {
   pageNum: 1,
@@ -115,7 +118,7 @@ const defaultListQuery = {
 
 export default {
   name: 'UserList',
-  components: { AddAdmin },
+  components: { AddAdmin, ImportMemberModal },
   data() {
     return {
       departmentOptions: [],
@@ -177,9 +180,9 @@ export default {
         this.listLoading = false
       })
     },
-    // 添加管理员
+    // 导入用户
     handleAdd() {
-      this.$refs.addSupplier.add()
+      this.$refs.importMember.add()
     },
     // 设置为管理员
     handleSet(row) {

static/Blod.js

+/* eslint-disable */
+/* Blob.js
+ * A Blob implementation.
+ * 2014-05-27
+ *
+ * By Eli Grey, http://eligrey.com
+ * By Devin Samarin, https://github.com/eboyjr
+ * License: X11/MIT
+ *   See LICENSE.md
+ */
+
+/*global self, unescape */
+/*jslint bitwise: true, regexp: true, confusion: true, es5: true, vars: true, white: true,
+ plusplus: true */
+
+/*! @source http://purl.eligrey.com/github/Blob.js/blob/master/Blob.js */
+
+(function (view) {
+  "use strict";
+
+  view.URL = view.URL || view.webkitURL;
+
+  if (view.Blob && view.URL) {
+    try {
+      new Blob;
+      return;
+    } catch (e) {}
+  }
+
+  // Internally we use a BlobBuilder implementation to base Blob off of
+  // in order to support older browsers that only have BlobBuilder
+  var BlobBuilder = view.BlobBuilder || view.WebKitBlobBuilder || view.MozBlobBuilder || (function(view) {
+    var
+      get_class = function(object) {
+        return Object.prototype.toString.call(object).match(/^\[object\s(.*)\]$/)[1];
+      }
+      , FakeBlobBuilder = function BlobBuilder() {
+        this.data = [];
+      }
+      , FakeBlob = function Blob(data, type, encoding) {
+        this.data = data;
+        this.size = data.length;
+        this.type = type;
+        this.encoding = encoding;
+      }
+      , FBB_proto = FakeBlobBuilder.prototype
+      , FB_proto = FakeBlob.prototype
+      , FileReaderSync = view.FileReaderSync
+      , FileException = function(type) {
+        this.code = this[this.name = type];
+      }
+      , file_ex_codes = (
+        "NOT_FOUND_ERR SECURITY_ERR ABORT_ERR NOT_READABLE_ERR ENCODING_ERR "
+        + "NO_MODIFICATION_ALLOWED_ERR INVALID_STATE_ERR SYNTAX_ERR"
+      ).split(" ")
+      , file_ex_code = file_ex_codes.length
+      , real_URL = view.URL || view.webkitURL || view
+      , real_create_object_URL = real_URL.createObjectURL
+      , real_revoke_object_URL = real_URL.revokeObjectURL
+      , URL = real_URL
+      , btoa = view.btoa
+      , atob = view.atob
+
+      , ArrayBuffer = view.ArrayBuffer
+      , Uint8Array = view.Uint8Array
+    ;
+    FakeBlob.fake = FB_proto.fake = true;
+    while (file_ex_code--) {
+      FileException.prototype[file_ex_codes[file_ex_code]] = file_ex_code + 1;
+    }
+    if (!real_URL.createObjectURL) {
+      URL = view.URL = {};
+    }
+    URL.createObjectURL = function(blob) {
+      var
+        type = blob.type
+        , data_URI_header
+      ;
+      if (type === null) {
+        type = "application/octet-stream";
+      }
+      if (blob instanceof FakeBlob) {
+        data_URI_header = "data:" + type;
+        if (blob.encoding === "base64") {
+          return data_URI_header + ";base64," + blob.data;
+        } else if (blob.encoding === "URI") {
+          return data_URI_header + "," + decodeURIComponent(blob.data);
+        } if (btoa) {
+          return data_URI_header + ";base64," + btoa(blob.data);
+        } else {
+          return data_URI_header + "," + encodeURIComponent(blob.data);
+        }
+      } else if (real_create_object_URL) {
+        return real_create_object_URL.call(real_URL, blob);
+      }
+    };
+    URL.revokeObjectURL = function(object_URL) {
+      if (object_URL.substring(0, 5) !== "data:" && real_revoke_object_URL) {
+        real_revoke_object_URL.call(real_URL, object_URL);
+      }
+    };
+    FBB_proto.append = function(data/*, endings*/) {
+      var bb = this.data;
+      // decode data to a binary string
+      if (Uint8Array && (data instanceof ArrayBuffer || data instanceof Uint8Array)) {
+        var
+          str = ""
+          , buf = new Uint8Array(data)
+          , i = 0
+          , buf_len = buf.length
+        ;
+        for (; i < buf_len; i++) {
+          str += String.fromCharCode(buf[i]);
+        }
+        bb.push(str);
+      } else if (get_class(data) === "Blob" || get_class(data) === "File") {
+        if (FileReaderSync) {
+          var fr = new FileReaderSync;
+          bb.push(fr.readAsBinaryString(data));
+        } else {
+          // async FileReader won't work as BlobBuilder is sync
+          throw new FileException("NOT_READABLE_ERR");
+        }
+      } else if (data instanceof FakeBlob) {
+        if (data.encoding === "base64" && atob) {
+          bb.push(atob(data.data));
+        } else if (data.encoding === "URI") {
+          bb.push(decodeURIComponent(data.data));
+        } else if (data.encoding === "raw") {
+          bb.push(data.data);
+        }
+      } else {
+        if (typeof data !== "string") {
+          data += ""; // convert unsupported types to strings
+        }
+        // decode UTF-16 to binary string
+        bb.push(unescape(encodeURIComponent(data)));
+      }
+    };
+    FBB_proto.getBlob = function(type) {
+      if (!arguments.length) {
+        type = null;
+      }
+      return new FakeBlob(this.data.join(""), type, "raw");
+    };
+    FBB_proto.toString = function() {
+      return "[object BlobBuilder]";
+    };
+    FB_proto.slice = function(start, end, type) {
+      var args = arguments.length;
+      if (args < 3) {
+        type = null;
+      }
+      return new FakeBlob(
+        this.data.slice(start, args > 1 ? end : this.data.length)
+        , type
+        , this.encoding
+      );
+    };
+    FB_proto.toString = function() {
+      return "[object Blob]";
+    };
+    FB_proto.close = function() {
+      this.size = this.data.length = 0;
+    };
+    return FakeBlobBuilder;
+  }(view));
+
+  view.Blob = function Blob(blobParts, options) {
+    var type = options ? (options.type || "") : "";
+    var builder = new BlobBuilder();
+    if (blobParts) {
+      for (var i = 0, len = blobParts.length; i < len; i++) {
+        builder.append(blobParts[i]);
+      }
+    }
+    return builder.getBlob(type);
+  };
+}(typeof self !== "undefined" && self || typeof window !== "undefined" && window || this.content || this));

static/Export2Excel.js

+/* eslint-disable */
+require('script-loader!file-saver');
+require('./Blod');
+require('script-loader!xlsx/dist/xlsx.core.min');
+function generateArray(table) {
+  var out = [];
+  var rows = table.querySelectorAll('tr');
+  var ranges = [];
+  for (var R = 0; R < rows.length; ++R) {
+    var outRow = [];
+    var row = rows[R];
+    var columns = row.querySelectorAll('td');
+    for (var C = 0; C < columns.length; ++C) {
+      var cell = columns[C];
+      var colspan = cell.getAttribute('colspan');
+      var rowspan = cell.getAttribute('rowspan');
+      var cellValue = cell.innerText;
+      if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue;
+
+      //Skip ranges
+      ranges.forEach(function (range) {
+        if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) {
+          for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null);
+        }
+      });
+
+      //Handle Row Span
+      if (rowspan || colspan) {
+        rowspan = rowspan || 1;
+        colspan = colspan || 1;
+        ranges.push({s: {r: R, c: outRow.length}, e: {r: R + rowspan - 1, c: outRow.length + colspan - 1}});
+      }
+      ;
+
+      //Handle Value
+      outRow.push(cellValue !== "" ? cellValue : null);
+
+      //Handle Colspan
+      if (colspan) for (var k = 0; k < colspan - 1; ++k) outRow.push(null);
+    }
+    out.push(outRow);
+  }
+  return [out, ranges];
+};
+
+function datenum(v, date1904) {
+  if (date1904) v += 1462;
+  var epoch = Date.parse(v);
+  return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000);
+}
+
+function sheet_from_array_of_arrays(data, opts) {
+  var ws = {};
+  var range = {s: {c: 10000000, r: 10000000}, e: {c: 0, r: 0}};
+  for (var R = 0; R != data.length; ++R) {
+    for (var C = 0; C != data[R].length; ++C) {
+      if (range.s.r > R) range.s.r = R;
+      if (range.s.c > C) range.s.c = C;
+      if (range.e.r < R) range.e.r = R;
+      if (range.e.c < C) range.e.c = C;
+      var cell = {v: data[R][C]};
+      if (cell.v == null) continue;
+      var cell_ref = XLSX.utils.encode_cell({c: C, r: R});
+
+      if (typeof cell.v === 'number') cell.t = 'n';
+      else if (typeof cell.v === 'boolean') cell.t = 'b';
+      else if (cell.v instanceof Date) {
+        cell.t = 'n';
+        cell.z = XLSX.SSF._table[14];
+        cell.v = datenum(cell.v);
+      }
+      else cell.t = 's';
+
+      ws[cell_ref] = cell;
+    }
+  }
+  if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range);
+  return ws;
+}
+
+function Workbook() {
+  if (!(this instanceof Workbook)) return new Workbook();
+  this.SheetNames = [];
+  this.Sheets = {};
+}
+
+function s2ab(s) {
+  var buf = new ArrayBuffer(s.length);
+  var view = new Uint8Array(buf);
+  for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
+  return buf;
+}
+
+export function export_table_to_excel(id) {
+  var theTable = document.getElementById(id);
+  console.log('a')
+  var oo = generateArray(theTable);
+  var ranges = oo[1];
+
+  /* original data */
+  var data = oo[0];
+  var ws_name = "SheetJS";
+  console.log(data);
+
+  var wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
+
+  /* add ranges to worksheet */
+  // ws['!cols'] = ['apple', 'banan'];
+  ws['!merges'] = ranges;
+
+  /* add worksheet to workbook */
+  wb.SheetNames.push(ws_name);
+  wb.Sheets[ws_name] = ws;
+
+  var wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
+
+  saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), "test.xlsx")
+}
+
+function formatJson(jsonData) {
+  console.log(jsonData)
+}
+export function exportJsonToExcel(th, jsonData, defaultTitle) {
+
+  /* original data */
+
+  var data = jsonData;
+  data.unshift(th);
+  var ws_name = "SheetJS";
+
+  var wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
+
+
+  /* add worksheet to workbook */
+  wb.SheetNames.push(ws_name);
+  wb.Sheets[ws_name] = ws;
+
+  var wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
+  var title = defaultTitle || '列表'
+  saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), title + ".xlsx")
+}