diff --git a/src/components/material/index.vue b/src/components/material/index.vue
index 409966b..e7a7647 100644
--- a/src/components/material/index.vue
+++ b/src/components/material/index.vue
@@ -79,8 +79,9 @@
                     :on-progress="handleProgress"
                     :before-upload="beforeUpload"
                     :on-success="handleSuccess"
+                    multiple
                   >
-                    <el-button size="small" type="primary">点击上传</el-button>
+                    <el-button size="small" type="primary">批量上传</el-button>
                   </el-upload>
                 </el-col>
               </el-row>
@@ -103,7 +104,7 @@
                         :src="item.url"
                         fit="contain"
                         :preview-src-list="[item.url]"
-                        :z-index=999
+                        :z-index="999"
                       />
                       <div>
                         <el-checkbox class="material-name" :label="item.url">
@@ -144,319 +145,319 @@
 </template>
 
 <script>
-import { getPage as materialgroupPage, addObj as materialgroupAdd, delObj as materialgroupDel, putObj as materialgroupEdit } from '@/api/tools/materialgroup'
-import { getPage, addObj, delObj, putObj } from '@/api/tools/material'
-import { getToken } from '@/utils/auth'
-import { mapGetters } from 'vuex'
+  import { getPage as materialgroupPage, addObj as materialgroupAdd, delObj as materialgroupDel, putObj as materialgroupEdit } from '@/api/tools/materialgroup'
+  import { getPage, addObj, delObj, putObj } from '@/api/tools/material'
+  import { getToken } from '@/utils/auth'
+  import { mapGetters } from 'vuex'
 
-export default {
-  name: 'MaterialList',
-  props: {
-    // 素材数据
-    value: {
-      type: Array,
-      default() {
-        return []
+  export default {
+    name: 'MaterialList',
+    props: {
+      // 素材数据
+      value: {
+        type: Array,
+        default() {
+          return []
+        }
+      },
+      // 素材类型
+      type: {
+        type: String
+      },
+      // 素材限制数量，默认5个
+      num: {
+        type: Number,
+        default() {
+          return 5
+        }
+      },
+      // 宽度
+      width: {
+        type: Number,
+        default() {
+          return 150
+        }
+      },
+      // 宽度
+      height: {
+        type: Number,
+        default() {
+          return 150
+        }
       }
     },
-    // 素材类型
-    type: {
-      type: String
-    },
-    // 素材限制数量，默认5个
-    num: {
-      type: Number,
-      default() {
-        return 5
+    data() {
+      return {
+        headers: {
+          Authorization: getToken()
+        },
+        dialogVisible: false,
+        url: '',
+        listDialogVisible: false,
+        materialgroupList: [],
+        materialgroupObjId: '',
+        materialgroupObj: {},
+        materialgroupLoading: false,
+        tableData: [],
+        page: {
+          total: 0, // 总页数
+          currentPage: 1, // 当前页数
+          pageSize: 12, // 每页显示多少条
+          ascs: [], // 升序字段
+          descs: 'create_time'// 降序字段
+        },
+        tableLoading: false,
+        groupId: null,
+        urls: []
       }
     },
-    // 宽度
-    width: {
-      type: Number,
-      default() {
-        return 150
-      }
+    computed: {
+      ...mapGetters([
+        'uploadApi'
+      ])
     },
-    // 宽度
-    height: {
-      type: Number,
-      default() {
-        return 150
-      }
-    }
-  },
-  data() {
-    return {
-      headers: {
-        Authorization: getToken()
+    methods: {
+      moveMaterial(index, type) {
+        if (type == 'up') {
+          const tempOption = this.value[index - 1]
+          this.$set(this.value, index - 1, this.value[index])
+          this.$set(this.value, index, tempOption)
+        }
+        if (type == 'down') {
+          const tempOption = this.value[index + 1]
+          this.$set(this.value, index + 1, this.value[index])
+          this.$set(this.value, index, tempOption)
+        }
       },
-      dialogVisible: false,
-      url: '',
-      listDialogVisible: false,
-      materialgroupList: [],
-      materialgroupObjId: '',
-      materialgroupObj: {},
-      materialgroupLoading: false,
-      tableData: [],
-      page: {
-        total: 0, // 总页数
-        currentPage: 1, // 当前页数
-        pageSize: 12, // 每页显示多少条
-        ascs: [], // 升序字段
-        descs: 'create_time'// 降序字段
+      zoomMaterial(index) {
+        this.dialogVisible = true
+        this.url = this.value[index]
       },
-      tableLoading: false,
-      groupId: null,
-      urls: []
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'uploadApi'
-    ])
-  },
-  methods: {
-    moveMaterial(index, type) {
-      if (type == 'up') {
-        const tempOption = this.value[index - 1]
-        this.$set(this.value, index - 1, this.value[index])
-        this.$set(this.value, index, tempOption)
-      }
-      if (type == 'down') {
-        const tempOption = this.value[index + 1]
-        this.$set(this.value, index + 1, this.value[index])
-        this.$set(this.value, index, tempOption)
-      }
-    },
-    zoomMaterial(index) {
-      this.dialogVisible = true
-      this.url = this.value[index]
-    },
-    deleteMaterial(index) {
-      const that = this
-      this.$confirm('是否确认删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        that.value.splice(index, 1)
-        that.urls = []
-      })
-    },
-    toSeleteMaterial() {
-      this.listDialogVisible = true
-      if (this.tableData.length <= 0) {
-        this.materialgroupPage()
-      }
-    },
-    materialgroupPage() {
-      this.materialgroupLoading = true
-      materialgroupPage({
-        total: 0, // 总页数
-        currentPage: 1, // 当前页数
-        pageSize: 100, // 每页显示多少条
-        ascs: [], // 升序字段
-        descs: 'create_time'// 降序字段
-      }).then(response => {
-        this.materialgroupLoading = false
-        const materialgroupList = response.content
-        materialgroupList.unshift({
-          id: '-1',
-          name: '全部分组'
-        })
-        this.materialgroupList = materialgroupList
-        this.tabClick({
-          index: 0
+      deleteMaterial(index) {
+        const that = this
+        this.$confirm('是否确认删除？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(function() {
+          that.value.splice(index, 1)
+          that.urls = []
         })
-      })
-    },
-    materialgroupDelete(materialgroupObj) {
-      const that = this
-      this.$confirm('是否确认删除该分组？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        materialgroupDel(materialgroupObj.id)
-          .then(function() {
-            that.$delete(that.materialgroupList, materialgroupObj.index)
+      },
+      toSeleteMaterial() {
+        this.listDialogVisible = true
+        if (this.tableData.length <= 0) {
+          this.materialgroupPage()
+        }
+      },
+      materialgroupPage() {
+        this.materialgroupLoading = true
+        materialgroupPage({
+          total: 0, // 总页数
+          currentPage: 1, // 当前页数
+          pageSize: 100, // 每页显示多少条
+          ascs: [], // 升序字段
+          descs: 'create_time'// 降序字段
+        }).then(response => {
+          this.materialgroupLoading = false
+          const materialgroupList = response.content
+          materialgroupList.unshift({
+            id: '-1',
+            name: '全部分组'
           })
-      })
-    },
-    materialgroupEdit(materialgroupObj) {
-      const that = this
-      this.$prompt('请输入分组名', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputValue: materialgroupObj.name
-      }).then(({ value }) => {
-        materialgroupEdit({
-          id: materialgroupObj.id,
-          name: value
+          this.materialgroupList = materialgroupList
+          this.tabClick({
+            index: 0
+          })
+        })
+      },
+      materialgroupDelete(materialgroupObj) {
+        const that = this
+        this.$confirm('是否确认删除该分组？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         }).then(function() {
-          materialgroupObj.name = value
-          that.$set(that.materialgroupList, materialgroupObj.index, materialgroupObj)
+          materialgroupDel(materialgroupObj.id)
+            .then(function() {
+              that.$delete(that.materialgroupList, materialgroupObj.index)
+            })
         })
-      }).catch(() => {
+      },
+      materialgroupEdit(materialgroupObj) {
+        const that = this
+        this.$prompt('请输入分组名', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          inputValue: materialgroupObj.name
+        }).then(({ value }) => {
+          materialgroupEdit({
+            id: materialgroupObj.id,
+            name: value
+          }).then(function() {
+            materialgroupObj.name = value
+            that.$set(that.materialgroupList, materialgroupObj.index, materialgroupObj)
+          })
+        }).catch(() => {
 
-      })
-    },
-    materialgroupAdd() {
-      const that = this
-      this.$prompt('请输入分组名', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消'
-      }).then(({ value }) => {
-        materialgroupAdd({
-          name: value
-        }).then(function() {
-          that.materialgroupPage()
         })
-      }).catch(() => {
+      },
+      materialgroupAdd() {
+        const that = this
+        this.$prompt('请输入分组名', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消'
+        }).then(({ value }) => {
+          materialgroupAdd({
+            name: value
+          }).then(function() {
+            that.materialgroupPage()
+          })
+        }).catch(() => {
 
-      })
-    },
-    tabClick(tab, event) {
-      this.urls = []
-      const index = Number(tab.index)
-      const materialgroupObj = this.materialgroupList[index]
-      materialgroupObj.index = index
-      this.materialgroupObj = materialgroupObj
-      this.materialgroupObjId = materialgroupObj.id
-      this.page.currentPage = 1
-      this.page.total = 0
-      if (materialgroupObj.id != '-1') {
-        this.groupId = materialgroupObj.id
-      } else {
-        this.groupId = null
-      }
-      this.getPage(this.page)
-    },
-    getPage(page, params) {
-      this.tableLoading = true
-      getPage(Object.assign({
-        page: page.currentPage - 1,
-        size: page.pageSize,
-        descs: this.page.descs,
-        ascs: this.page.ascs,
-        sort: 'createTime,desc'
-      }, {
-        groupId: this.groupId
-      })).then(response => {
-        const tableData = response.content
-        this.page.total = response.totalElements
-        this.page.currentPage = page.currentPage
-        this.page.pageSize = page.pageSize
-        this.tableData = tableData
-        this.tableLoading = false
-      }).catch(() => {
-        this.tableLoading = false
-      })
-    },
-    sizeChange(val) {
-      console.log(val)
-      this.page.currentPage = 1
-      this.page.pageSize = val
-      this.getPage(this.page)
-    },
-    pageChange(val) {
-      console.log(val)
-      this.page.currentPage = val
-      // this.page.pageSize = val
-      this.getPage(this.page)
-    },
-    materialRename(item) {
-      const that = this
-      this.$prompt('请输入素材名', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputValue: item.name
-      }).then(({ value }) => {
-        putObj({
-          id: item.id,
-          name: value
-        }).then(function() {
-          that.getPage(that.page)
         })
-      }).catch(() => {
+      },
+      tabClick(tab, event) {
+        this.urls = []
+        const index = Number(tab.index)
+        const materialgroupObj = this.materialgroupList[index]
+        materialgroupObj.index = index
+        this.materialgroupObj = materialgroupObj
+        this.materialgroupObjId = materialgroupObj.id
+        this.page.currentPage = 1
+        this.page.total = 0
+        if (materialgroupObj.id != '-1') {
+          this.groupId = materialgroupObj.id
+        } else {
+          this.groupId = null
+        }
+        this.getPage(this.page)
+      },
+      getPage(page, params) {
+        this.tableLoading = true
+        getPage(Object.assign({
+          page: page.currentPage - 1,
+          size: page.pageSize,
+          descs: this.page.descs,
+          ascs: this.page.ascs,
+          sort: 'createTime,desc'
+        }, {
+          groupId: this.groupId
+        })).then(response => {
+          const tableData = response.content
+          this.page.total = response.totalElements
+          this.page.currentPage = page.currentPage
+          this.page.pageSize = page.pageSize
+          this.tableData = tableData
+          this.tableLoading = false
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+      sizeChange(val) {
+        console.log(val)
+        this.page.currentPage = 1
+        this.page.pageSize = val
+        this.getPage(this.page)
+      },
+      pageChange(val) {
+        console.log(val)
+        this.page.currentPage = val
+        // this.page.pageSize = val
+        this.getPage(this.page)
+      },
+      materialRename(item) {
+        const that = this
+        this.$prompt('请输入素材名', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          inputValue: item.name
+        }).then(({ value }) => {
+          putObj({
+            id: item.id,
+            name: value
+          }).then(function() {
+            that.getPage(that.page)
+          })
+        }).catch(() => {
 
-      })
-    },
-    materialUrl(item) {
-      const that = this
-      this.$prompt('素材链接', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputValue: item.url
-      }).then(({ value }) => {
+        })
+      },
+      materialUrl(item) {
+        const that = this
+        this.$prompt('素材链接', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          inputValue: item.url
+        }).then(({ value }) => {
 
-      }).catch(() => {
+        }).catch(() => {
 
-      })
-    },
-    materialDel(item) {
-      const that = this
-      this.$confirm('是否确认删除该素材？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        delObj(item.id)
-          .then(function() {
-            that.getPage(that.page)
-          })
-      })
-    },
-    handleCommand(command) {
-      const that = this
-      const s = command.split('-')
-      putObj({
-        id: s[0],
-        groupId: s[1]
-      }).then(function() {
-        that.getPage(that.page)
-      })
-    },
-    handleProgress(event, file, fileList) {
-      // let uploadProgress = file.percentage.toFixed(0)
-      // this.uploadProgress = uploadProgress
-    },
-    handleSuccess(response, file, fileList) {
-      const that = this
-      this.uploadProgress = 0
-      addObj({
-        type: '1',
-        groupId: this.groupId != '-1' ? this.groupId : null,
-        name: file.name,
-        url: response.link
-      }).then(function() {
-        that.getPage(that.page)
-      })
-    },
-    beforeUpload(file) {
-      const isPic =
+        })
+      },
+      materialDel(item) {
+        const that = this
+        this.$confirm('是否确认删除该素材？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(function() {
+          delObj(item.id)
+            .then(function() {
+              that.getPage(that.page)
+            })
+        })
+      },
+      handleCommand(command) {
+        const that = this
+        const s = command.split('-')
+        putObj({
+          id: s[0],
+          groupId: s[1]
+        }).then(function() {
+          that.getPage(that.page)
+        })
+      },
+      handleProgress(event, file, fileList) {
+        // let uploadProgress = file.percentage.toFixed(0)
+        // this.uploadProgress = uploadProgress
+      },
+      handleSuccess(response, file, fileList) {
+        const that = this
+        this.uploadProgress = 0
+        addObj({
+          type: '1',
+          groupId: this.groupId != '-1' ? this.groupId : null,
+          name: file.name,
+          url: response.link
+        }).then(function() {
+          that.getPage(that.page)
+        })
+      },
+      beforeUpload(file) {
+        const isPic =
           file.type === 'image/jpeg' ||
           file.type === 'image/png' ||
           file.type === 'image/gif' ||
           file.type === 'image/jpg'
-      const isLt2M = file.size / 1024 / 1024 < 2
-      if (!isPic) {
-        this.$message.error('上传图片只能是 JPG、JPEG、PNG、GIF 格式!')
-        return false
-      }
-      if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 2MB!')
+        const isLt2M = file.size / 1024 / 1024 < 2
+        if (!isPic) {
+          this.$message.error('上传图片只能是 JPG、JPEG、PNG、GIF 格式!')
+          return false
+        }
+        if (!isLt2M) {
+          this.$message.error('上传头像图片大小不能超过 2MB!')
+        }
+        return isPic && isLt2M
+      },
+      sureUrls() {
+        this.urls.forEach(item => {
+          this.$set(this.value, this.value.length, item)
+        })
+        this.listDialogVisible = false
       }
-      return isPic && isLt2M
-    },
-    sureUrls() {
-      this.urls.forEach(item => {
-        this.$set(this.value, this.value.length, item)
-      })
-      this.listDialogVisible = false
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/shop/order/index.vue b/src/views/shop/order/index.vue
index f624b12..3537881 100644
--- a/src/views/shop/order/index.vue
+++ b/src/views/shop/order/index.vue
@@ -1,582 +1,820 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" style="position: relative; height: calc(100vh - 117px);">
+    <div class="container">
 
-    <el-tabs v-model="status" type="card" @tab-click="handleOrder">
-      <el-tab-pane name="-9">
-        <span slot="label"><i class="el-icon-s-order"></i> 全部订单</span>
-      </el-tab-pane>
-      <el-tab-pane name="0">
-        <span slot="label"><i class="el-icon-bank-card"></i> 未支付</span>
-      </el-tab-pane>
-      <el-tab-pane name="1">
-        <span slot="label"><i class="el-icon-refrigerator"></i> 未发货</span>
-      </el-tab-pane>
-      <el-tab-pane name="2">
-        <span slot="label"><i class="el-icon-truck"></i> 待收货</span>
-      </el-tab-pane>
-      <el-tab-pane name="3">
-        <span slot="label"><i class="el-icon-document"></i> 待评价</span>
-      </el-tab-pane>
-      <el-tab-pane name="4">
-        <span slot="label"><i class="el-icon-circle-check"></i> 交易完成</span>
-      </el-tab-pane>
-      <el-tab-pane name="-1">
-        <span slot="label"><i class="el-icon-back"></i> 退款中</span>
-      </el-tab-pane>
-      <el-tab-pane name="-2">
-        <span slot="label"><i class="el-icon-finished"></i> 已退款</span>
-      </el-tab-pane>
-      <el-tab-pane name="-4">
-        <span slot="label"><i class="el-icon-circle-close"></i> 已删除</span>
-      </el-tab-pane>
-    </el-tabs>
-    <!--工具栏-->
-    <div class="head-container">
+      <el-tabs v-model="status" type="card" @tab-click="handleOrder">
+        <el-tab-pane name="-9">
+          <span slot="label"><i class="el-icon-s-order"></i> 全部订单</span>
+        </el-tab-pane>
+        <el-tab-pane name="0">
+          <span slot="label"><i class="el-icon-bank-card"></i> 未支付</span>
+        </el-tab-pane>
+        <el-tab-pane name="1">
+          <span slot="label"><i class="el-icon-refrigerator"></i> 未发货</span>
+        </el-tab-pane>
+        <el-tab-pane name="2">
+          <span slot="label"><i class="el-icon-truck"></i> 待收货</span>
+        </el-tab-pane>
+        <el-tab-pane name="3">
+          <span slot="label"><i class="el-icon-document"></i> 待评价</span>
+        </el-tab-pane>
+        <el-tab-pane name="4">
+          <span slot="label"><i class="el-icon-circle-check"></i> 交易完成</span>
+        </el-tab-pane>
+        <el-tab-pane name="-1">
+          <span slot="label"><i class="el-icon-back"></i> 退款中</span>
+        </el-tab-pane>
+        <el-tab-pane name="-2">
+          <span slot="label"><i class="el-icon-finished"></i> 已退款</span>
+        </el-tab-pane>
+        <el-tab-pane name="-4">
+          <span slot="label"><i class="el-icon-circle-close"></i> 已删除</span>
+        </el-tab-pane>
+      </el-tabs>
+      <!--工具栏-->
+      <div class="head-container">
 
-      <!-- 搜索 -->
-      <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
-      <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
-        <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
-      </el-select>
-      <el-select v-model="orderType" clearable placeholder="订单类型" class="filter-item" style="width: 130px">
-        <el-option
-          v-for="item in typeOptions"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
+        <!-- 搜索 -->
+        <el-input v-model="query.value" clearable placeholder="输入搜索内容" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
+        <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
+          <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+        </el-select>
+        <el-select v-model="orderType" clearable placeholder="订单类型" class="filter-item" style="width: 130px">
+          <el-option
+            v-for="item in typeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+        <el-date-picker
+          v-model="createTime"
+          :default-time="['00:00:00','23:59:59']"
+          type="daterange"
+          range-separator=":"
+          size="small"
+          class="date-item"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
         />
-      </el-select>
-      <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
-      <!-- 新增 -->
-      <el-button
-        type="danger"
-        class="filter-item"
-        size="mini"
-        icon="el-icon-refresh"
-        @click="toQuery"
-      >刷新</el-button>
-    </div>
-    <!--表单组件-->
-    <eForm ref="form" :is-add="isAdd" />
-    <eDetail ref="form1" :is-add="isAdd" />
-    <eRefund ref="form2" :is-add="isAdd" />
-    <editOrder ref="form3" :is-add="isAdd" />
-    <eRemark ref="form4" :is-add="isAdd" />
+        <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
+        <!-- 新增 -->
+        <el-button
+          type="danger"
+          class="filter-item"
+          size="mini"
+          icon="el-icon-refresh"
+          @click="toQuery"
+        >刷新</el-button>
+      </div>
+      <!--表单组件-->
+      <eForm ref="form" :is-add="isAdd" />
+      <eDetail ref="form1" :is-add="isAdd" />
+      <eRefund ref="form2" :is-add="isAdd" />
+      <editOrder ref="form3" :is-add="isAdd" />
+      <eRemark ref="form4" :is-add="isAdd" />
+      <ePrint ref="form5" :is-add="isAdd" :print-list="checkList" :to-query="toQuery"/>
+
+      <!--订单数据统计-->
+      <div class="order-caculate">
+        <a class="caculate-title">订单数 : <span class="caculate-num">{{caculateInfo.orderNum}}</span></a>
+        <a class="caculate-title">商品数 : <span class="caculate-num">{{caculateInfo.storeNum}}</span></a>
+        <a class="caculate-title">订单金额 : <span class="caculate-num">{{caculateInfo.orderPrice}}</span></a>
+        <a class="caculate-title">客户数 : <span class="caculate-num">{{caculateInfo.userNum}}</span></a>
+      </div>
 
-    <!--表格渲染-->
-    <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
-      <el-table-column prop="orderId" width="140" label="订单号">
-        <template slot-scope="scope">
-          <span>{{ scope.row.orderId }}</span>
-          <p>{{ scope.row.pinkName }}</p>
-        </template>
-      </el-table-column>
-      <el-table-column prop="realName" label="用户昵称" >
-        <template slot-scope="scope">
-           <span>{{ scope.row.userDTO.nickname }}</span>
+      <!--表格渲染-->
+      <el-table ref="multipleTable" v-loading="loading" :data="data" size="small" style="width: 100%;" @selection-change="handleSelectionChange">
+        <el-table-column :selectable="checkboxT" type="selection" width="50" />
+        <el-table-column prop="orderId" width="140" label="订单号">
+          <template slot-scope="scope">
+            <span>{{ scope.row.orderId }}</span>
+            <p>{{ scope.row.pinkName }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column prop="realName" label="用户昵称" >
+          <template slot-scope="scope">
+            <span>{{ scope.row.userDTO.nickname }}</span>
           </template>
-      </el-table-column>
-      <el-table-column prop="cartInfoList" width="300" label="商品信息">
-        <template slot-scope="scope">
-          <div v-for="(item,index) in scope.row.cartInfoList" v-if="item.cartInfoMap.productInfo.attrInfo">
+        </el-table-column>
+        <el-table-column prop="cartInfoList" width="300" label="商品信息">
+          <template slot-scope="scope">
+            <div v-for="(item,index) in scope.row.cartInfoList" v-if="item.cartInfoMap.productInfo.attrInfo">
             <span>
               <img
                 style="width: 30px;height: 30px;margin:0;cursor: pointer;"
                 :src="item.cartInfoMap.productInfo.attrInfo.image"
               >
             </span>
-            <span>{{ item.cartInfoMap.productInfo.storeName }}&nbsp;{{ item.cartInfoMap.productInfo.attrInfo.suk }}</span>
-            <span> | ￥{{ item.cartInfoMap.truePrice }}×{{ item.cartInfoMap.cartNum }}</span>
-          </div>
-          <div v-else>
+              <span>{{ item.cartInfoMap.productInfo.storeName }}&nbsp;{{ item.cartInfoMap.productInfo.attrInfo.suk }}</span>
+              <span> | ￥{{ item.cartInfoMap.truePrice }}×{{ item.cartInfoMap.cartNum }}</span>
+            </div>
+            <div v-else>
             <span><img
               style="width: 30px;height: 30px;margin:0;cursor: pointer;"
               :src="item.cartInfoMap.productInfo.image"
             ></span>
-            <span>{{ item.cartInfoMap.productInfo.storeName }}</span>
-            <span> | ￥{{ item.cartInfoMap.truePrice }}×{{ item.cartInfoMap.cartNum }}</span>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column prop="payPrice" label="实际支付" />
-      <el-table-column prop="payTypeName" label="支付状态" />
-      <el-table-column prop="statusName" label="订单状态">
-        <template slot-scope="scope">
-          <span v-html="scope.row.statusName">{{ scope.row.addTime }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="addTime" width="160" label="创建时间">
-        <template slot-scope="scope">
-          <span>{{ formatTime(scope.row.addTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column v-if="checkPermission(['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT','YXSTOREORDER_DELETE'])" label="操作" width="200" align="center" fixed="right">
-        <template slot-scope="scope">
-          <el-button
-            v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']"
-            size="mini"
-            type="primary"
-            @click="detail(scope.row)"
-          >
-            订单详情</el-button>
-          <el-dropdown size="mini" split-button type="primary" trigger="click">
-            操作
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item>
-                <el-button
-                  v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']"
-                  size="mini"
-                  type="success"
-                  @click="remark(scope.row)"
-                >
-                  订单备注</el-button>
-              </el-dropdown-item>
-              <el-dropdown-item>
-                <el-button
-                  v-if="scope.row._status == 2"
-                  v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']"
-                  size="mini"
-                  type="primary"
-                  @click="edit(scope.row)"
-                >
-                  去发货</el-button>
-              </el-dropdown-item>
-              <el-dropdown-item>
-                <el-button
-                  v-if="scope.row._status == 3"
-                  v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']"
-                  size="mini"
-                  type="primary"
-                  @click="refund(scope.row)"
-                >
-                  立刻退款</el-button>
-              </el-dropdown-item>
-              <el-dropdown-item v-if="scope.row._status == 1">
-                <el-button
-                  v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']"
-                  size="mini"
-                  type="primary"
-                  @click="editOrder(scope.row)"
-                >
-                  修改订单</el-button>
-              </el-dropdown-item>
-              <el-dropdown-item v-if="scope.row._status == 1">
-                <el-popover
-                  :ref="scope.row.id"
-                  v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_DELETE']"
-                  placement="top"
-                  width="180"
-                >
-                  <p>确定删除本条数据吗？</p>
-                  <div style="text-align: right; margin: 0">
-                    <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
-                    <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
-                  </div>
-                  <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini">删除</el-button>
-                </el-popover>
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
+              <span>{{ item.cartInfoMap.productInfo.storeName }}</span>
+              <span> | ￥{{ item.cartInfoMap.truePrice }}×{{ item.cartInfoMap.cartNum }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="payPrice" label="实际支付" />
+        <el-table-column prop="payTypeName" label="支付状态" />
+        <el-table-column prop="statusName" label="订单状态">
+          <template slot-scope="scope">
+            <span v-html="scope.row.statusName">{{ scope.row.addTime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="addTime" width="160" label="创建时间">
+          <template slot-scope="scope">
+            <span>{{ formatTime(scope.row.addTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="checkPermission(['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT','YXSTOREORDER_DELETE'])" label="操作" width="200" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']"
+              size="mini"
+              type="primary"
+              @click="detail(scope.row)"
+            >
+              订单详情</el-button>
+            <el-dropdown size="mini" split-button type="primary" trigger="click">
+              操作
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item>
+                  <el-button
+                    v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']"
+                    size="mini"
+                    type="success"
+                    @click="remark(scope.row)"
+                  >
+                    订单备注</el-button>
+                </el-dropdown-item>
+                <el-dropdown-item>
+                  <el-button
+                    v-if="scope.row._status == 2"
+                    v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']"
+                    size="mini"
+                    type="primary"
+                    @click="edit(scope.row)"
+                  >
+                    去发货</el-button>
+                </el-dropdown-item>
+                <el-dropdown-item>
+                  <el-button
+                    v-if="scope.row._status == 3"
+                    v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']"
+                    size="mini"
+                    type="primary"
+                    @click="refund(scope.row)"
+                  >
+                    立刻退款</el-button>
+                </el-dropdown-item>
+                <el-dropdown-item v-if="scope.row._status == 1">
+                  <el-button
+                    v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']"
+                    size="mini"
+                    type="primary"
+                    @click="editOrder(scope.row)"
+                  >
+                    修改订单</el-button>
+                </el-dropdown-item>
+                <el-dropdown-item v-if="scope.row._status == 1">
+                  <el-popover
+                    :ref="scope.row.id"
+                    v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_DELETE']"
+                    placement="top"
+                    width="180"
+                  >
+                    <p>确定删除本条数据吗？</p>
+                    <div style="text-align: right; margin: 0">
+                      <el-button size="mini" type="text" @click="$refs[scope.row.id].doClose()">取消</el-button>
+                      <el-button :loading="delLoading" type="primary" size="mini" @click="subDelete(scope.row.id)">确定</el-button>
+                    </div>
+                    <el-button slot="reference" type="danger" icon="el-icon-delete" size="mini">删除</el-button>
+                  </el-popover>
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
 
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页组件-->
-    <el-pagination
-      :total="total"
-      :current-page="page + 1"
-      style="margin-top: 8px;"
-      layout="total, prev, pager, next, sizes"
-      @size-change="sizeChange"
-      @current-change="pageChange"
-    />
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--添加订单打印及订单导出功能 2020.04.13 changxh-->
+    <el-footer class="footer-contains">
+      <div class="footer-search">
+        <el-checkbox v-model="printChecked" @change="batchSelection" style="margin-right: 20px;"></el-checkbox>
+        <el-select v-model="batchHandle" @change="handlePrintOption" clearable placeholder="批量操作" class="filter-item" style="width: 130px; margin-right: 8px;">
+          <el-option
+            v-for="item in handleOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+        <el-select v-model="batchExport" @change="handleExportOption" clearable placeholder="批量导出" class="filter-item" style="width: 130px">
+          <el-option
+            v-for="item in exportOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </div>
+      <!--分页组件-->
+      <el-pagination
+        :total="total"
+        :current-page="page + 1"
+        style="margin-top: 8px;"
+        layout="total, prev, pager, next, sizes"
+        @size-change="sizeChange"
+        @current-change="pageChange"
+      />
+    </el-footer>
   </div>
 </template>
 
 <script>
-import checkPermission from '@/utils/permission'
-import initData from '@/mixins/crud'
-import { del } from '@/api/yxStoreOrder'
-import eForm from './form'
-import eDetail from './detail'
-import eRefund from './refund'
-import editOrder from './edit'
-import eRemark from './remark'
-import { formatTime } from '@/utils/index'
-export default {
-  components: { eForm, eDetail, eRefund, editOrder, eRemark },
-  mixins: [initData],
-  data() {
-    return {
-      delLoading: false, status: '-9', orderType: '0',
-      queryTypeOptions: [
-        { key: 'orderId', display_name: '订单号' },
-        { key: 'realName', display_name: '用户姓名' },
-        { key: 'userPhone', display_name: '用户电话' }
-      ],
-      statusOptions: [
-        { value: '0', label: '未支付' },
-        { value: '1', label: '未发货' },
-        { value: '2', label: '待收货' },
-        { value: '3', label: '待评价' },
-        { value: '4', label: '交易完成' },
-        // { value: '5', label: '待核销' },
-        { value: '-1', label: '退款中' },
-        { value: '-2', label: '已退款' },
-        { value: '-4', label: '已删除' }
-      ],
-      typeOptions: [
-        { value: '0', label: '所有订单' },
-        { value: '1', label: '普通订单' },
-        { value: '2', label: '拼团订单' },
-        { value: '3', label: '秒杀订单' },
-        { value: '4', label: '砍价订单' }
-      ]
-    }
-  },
-  created() {
-    this.$nextTick(() => {
-      this.init()
-    })
-  },
-  methods: {
-    formatTime,
-    checkPermission,
-    handleOrder(tab, event) {
-      this.status = tab.name
-      this.toQuery()
-    },
-    beforeInit() {
-      this.url = 'api/yxStoreOrder'
-      const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort, orderStatus: this.status, orderType: this.orderType }
-      const query = this.query
-      const type = query.type
-      const value = query.value
-      if (type && value) { this.params[type] = value }
-      return true
+  import checkPermission from '@/utils/permission'
+  import initData from '@/mixins/crud'
+  import { del } from '@/api/yxStoreOrder'
+  import eForm from './form'
+  import eDetail from './detail'
+  import eRefund from './refund'
+  import editOrder from './edit'
+  import eRemark from './remark'
+  import ePrint from './print'
+  import { formatTime } from '@/utils/index'
+  import { gett } from '@/api/visits'
+
+  export default {
+    components: { eForm, eDetail, eRefund, editOrder, eRemark, ePrint },
+    mixins: [initData],
+    data() {
+      return {
+        delLoading: false, status: '-9', orderType: '0',createTime: '', checkList: [], printChecked: false, batchHandle: '', batchExport: '', listContent: [],
+        queryTypeOptions: [
+          { key: 'orderId', display_name: '订单号' },
+          { key: 'realName', display_name: '用户姓名' },
+          { key: 'userPhone', display_name: '用户电话' }
+        ],
+        statusOptions: [
+          { value: '0', label: '未支付' },
+          { value: '1', label: '未发货' },
+          { value: '2', label: '待收货' },
+          { value: '3', label: '待评价' },
+          { value: '4', label: '交易完成' },
+          // { value: '5', label: '待核销' },
+          { value: '-1', label: '退款中' },
+          { value: '-2', label: '已退款' },
+          { value: '-4', label: '已删除' }
+        ],
+        typeOptions: [
+          { value: '0', label: '所有订单' },
+          { value: '1', label: '普通订单' },
+          { value: '2', label: '拼团订单' },
+          { value: '3', label: '秒杀订单' },
+          { value: '4', label: '砍价订单' }
+        ],
+        handleOptions: [
+          {value: '', label: '批量操作'},
+          {value: '0', label: '批量打印'},
+        ],
+        exportOptions: [
+          {value: '', label: '批量导出'},
+          {value: '0', label: '导出全部'},
+          {value: '1', label: '导出选中'},
+        ],
+        caculateInfo: {
+          orderNum : 0,
+          storeNum : 0,
+          orderPrice : 0,
+          userNum : 0,
+        },
+      }
     },
-    subDelete(id) {
-      this.delLoading = true
-      del(id).then(res => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        this.dleChangePage()
+    created() {
+      this.$nextTick(() => {
         this.init()
-        this.$notify({
-          title: '删除成功',
-          type: 'success',
-          duration: 2500
-        })
-      }).catch(err => {
-        this.delLoading = false
-        this.$refs[id].doClose()
-        console.log(err.response.data.message)
       })
     },
-    add() {
-      this.isAdd = true
-      this.$refs.form.dialog = true
-    },
-    edit(data) {
-      this.isAdd = false
-      const _this = this.$refs.form
-      _this.form = {
-        id: data.id,
-        orderId: data.orderId,
-        uid: data.uid,
-        realName: data.realName,
-        userPhone: data.userPhone,
-        userAddress: data.userAddress,
-        cartId: data.cartId,
-        freightPrice: data.freightPrice,
-        totalNum: data.totalNum,
-        totalPrice: data.totalPrice,
-        totalPostage: data.totalPostage,
-        payPrice: data.payPrice,
-        payPostage: data.payPostage,
-        deductionPrice: data.deductionPrice,
-        couponId: data.couponId,
-        couponPrice: data.couponPrice,
-        paid: data.paid,
-        payTime: data.payTime,
-        payType: data.payType,
-        addTime: data.addTime,
-        status: data.status,
-        refundStatus: data.refundStatus,
-        refundReasonWapImg: data.refundReasonWapImg,
-        refundReasonWapExplain: data.refundReasonWapExplain,
-        refundReasonTime: data.refundReasonTime,
-        refundReasonWap: data.refundReasonWap,
-        refundReason: data.refundReason,
-        refundPrice: data.refundPrice,
-        deliveryName: data.deliveryName,
-        deliverySn: data.deliverySn,
-        deliveryType: data.deliveryType,
-        deliveryId: data.deliveryId,
-        gainIntegral: data.gainIntegral,
-        useIntegral: data.useIntegral,
-        backIntegral: data.backIntegral,
-        mark: data.mark,
-        isDel: data.isDel,
-        unique: data.unique,
-        remark: data.remark,
-        merId: data.merId,
-        isMerCheck: data.isMerCheck,
-        combinationId: data.combinationId,
-        pinkId: data.pinkId,
-        cost: data.cost,
-        seckillId: data.seckillId,
-        bargainId: data.bargainId,
-        verifyCode: data.verifyCode,
-        storeId: data.storeId,
-        shippingType: data.shippingType,
-        isChannel: data.isChannel,
-        isRemind: data.isRemind,
-        isSystemDel: data.isSystemDel
-      }
-      _this.dialog = true
-    },
-    editOrder(data) {
-      this.isAdd = false
-      const _this = this.$refs.form3
-      _this.form = {
-        id: data.id,
-        orderId: data.orderId,
-        uid: data.uid,
-        realName: data.realName,
-        userPhone: data.userPhone,
-        userAddress: data.userAddress,
-        cartId: data.cartId,
-        freightPrice: data.freightPrice,
-        totalNum: data.totalNum,
-        totalPrice: data.totalPrice,
-        totalPostage: data.totalPostage,
-        payPrice: data.payPrice,
-        payPostage: data.payPostage,
-        deductionPrice: data.deductionPrice,
-        couponId: data.couponId,
-        couponPrice: data.couponPrice,
-        paid: data.paid,
-        payTime: data.payTime,
-        payType: data.payType,
-        addTime: data.addTime,
-        status: data.status,
-        refundStatus: data.refundStatus,
-        refundReasonWapImg: data.refundReasonWapImg,
-        refundReasonWapExplain: data.refundReasonWapExplain,
-        refundReasonTime: data.refundReasonTime,
-        refundReasonWap: data.refundReasonWap,
-        refundReason: data.refundReason,
-        refundPrice: data.refundPrice,
-        deliveryName: data.deliveryName,
-        deliveryType: data.deliveryType,
-        deliveryId: data.deliveryId,
-        gainIntegral: data.gainIntegral,
-        useIntegral: data.useIntegral,
-        backIntegral: data.backIntegral,
-        mark: data.mark,
-        isDel: data.isDel,
-        unique: data.unique,
-        remark: data.remark,
-        merId: data.merId,
-        isMerCheck: data.isMerCheck,
-        combinationId: data.combinationId,
-        pinkId: data.pinkId,
-        cost: data.cost,
-        seckillId: data.seckillId,
-        bargainId: data.bargainId,
-        verifyCode: data.verifyCode,
-        storeId: data.storeId,
-        shippingType: data.shippingType,
-        isChannel: data.isChannel,
-        isRemind: data.isRemind,
-        isSystemDel: data.isSystemDel
-      }
-      _this.dialog = true
-    },
-    remark(data) {
-      this.isAdd = false
-      const _this = this.$refs.form4
-      _this.form = {
-        id: data.id,
-        orderId: data.orderId,
-        uid: data.uid,
-        realName: data.realName,
-        userPhone: data.userPhone,
-        userAddress: data.userAddress,
-        cartId: data.cartId,
-        freightPrice: data.freightPrice,
-        totalNum: data.totalNum,
-        totalPrice: data.totalPrice,
-        totalPostage: data.totalPostage,
-        payPrice: data.payPrice,
-        payPostage: data.payPostage,
-        deductionPrice: data.deductionPrice,
-        couponId: data.couponId,
-        couponPrice: data.couponPrice,
-        paid: data.paid,
-        payTime: data.payTime,
-        payType: data.payType,
-        addTime: data.addTime,
-        status: data.status,
-        refundStatus: data.refundStatus,
-        refundReasonWapImg: data.refundReasonWapImg,
-        refundReasonWapExplain: data.refundReasonWapExplain,
-        refundReasonTime: data.refundReasonTime,
-        refundReasonWap: data.refundReasonWap,
-        refundReason: data.refundReason,
-        refundPrice: data.refundPrice,
-        deliveryName: data.deliveryName,
-        deliveryType: data.deliveryType,
-        deliveryId: data.deliveryId,
-        gainIntegral: data.gainIntegral,
-        useIntegral: data.useIntegral,
-        backIntegral: data.backIntegral,
-        mark: data.mark,
-        isDel: data.isDel,
-        unique: data.unique,
-        remark: data.remark,
-        merId: data.merId,
-        isMerCheck: data.isMerCheck,
-        combinationId: data.combinationId,
-        pinkId: data.pinkId,
-        cost: data.cost,
-        seckillId: data.seckillId,
-        bargainId: data.bargainId,
-        verifyCode: data.verifyCode,
-        storeId: data.storeId,
-        shippingType: data.shippingType,
-        isChannel: data.isChannel,
-        isRemind: data.isRemind,
-        isSystemDel: data.isSystemDel
-      }
-      _this.dialog = true
-    },
-    refund(data) {
-      this.isAdd = false
-      const _this = this.$refs.form2
-      _this.form = {
-        id: data.id,
-        orderId: data.orderId,
-        uid: data.uid,
-        realName: data.realName,
-        userPhone: data.userPhone,
-        userAddress: data.userAddress,
-        cartId: data.cartId,
-        freightPrice: data.freightPrice,
-        totalNum: data.totalNum,
-        totalPrice: data.totalPrice,
-        totalPostage: data.totalPostage,
-        payPrice: data.payPrice,
-        payPostage: data.payPostage,
-        deductionPrice: data.deductionPrice,
-        couponId: data.couponId,
-        couponPrice: data.couponPrice,
-        paid: data.paid,
-        payTime: data.payTime,
-        payType: data.payType,
-        addTime: data.addTime,
-        status: data.status,
-        refundStatus: data.refundStatus,
-        refundReasonWapImg: data.refundReasonWapImg,
-        refundReasonWapExplain: data.refundReasonWapExplain,
-        refundReasonTime: data.refundReasonTime,
-        refundReasonWap: data.refundReasonWap,
-        refundReason: data.refundReason,
-        refundPrice: data.refundPrice,
-        deliveryName: data.deliveryName,
-        deliveryType: data.deliveryType,
-        deliveryId: data.deliveryId,
-        gainIntegral: data.gainIntegral,
-        useIntegral: data.useIntegral,
-        backIntegral: data.backIntegral,
-        mark: data.mark,
-        isDel: data.isDel,
-        unique: data.unique,
-        remark: data.remark,
-        merId: data.merId,
-        isMerCheck: data.isMerCheck,
-        combinationId: data.combinationId,
-        pinkId: data.pinkId,
-        cost: data.cost,
-        seckillId: data.seckillId,
-        bargainId: data.bargainId,
-        verifyCode: data.verifyCode,
-        storeId: data.storeId,
-        shippingType: data.shippingType,
-        isChannel: data.isChannel,
-        isRemind: data.isRemind,
-        isSystemDel: data.isSystemDel
+    methods: {
+      formatTime,
+      checkPermission,
+      handleOrder(tab, event) {
+        this.status = tab.name
+        this.toQuery()
+      },
+      beforeInit() {
+        this.url = 'api/yxStoreOrder'
+        const sort = 'id,desc'
+        this.params = { page: this.page, size: this.size, sort: sort, orderStatus: this.status, orderType: this.orderType, addTime: this.createTime, listContent: this.listContent  }
+        const query = this.query
+        const type = query.type
+        const value = query.value
+        if (type && value) { this.params[type] = value }
+        return true
+      },
+      subDelete(id) {
+        this.delLoading = true
+        del(id).then(res => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          this.dleChangePage()
+          this.init()
+          this.$notify({
+            title: '删除成功',
+            type: 'success',
+            duration: 2500
+          })
+        }).catch(err => {
+          this.delLoading = false
+          this.$refs[id].doClose()
+          console.log(err.response.data.message)
+        })
+      },
+      add() {
+        this.isAdd = true
+        this.$refs.form.dialog = true
+      },
+      edit(data) {
+        this.isAdd = false
+        const _this = this.$refs.form
+        _this.form = {
+          id: data.id,
+          orderId: data.orderId,
+          uid: data.uid,
+          realName: data.realName,
+          userPhone: data.userPhone,
+          userAddress: data.userAddress,
+          cartId: data.cartId,
+          freightPrice: data.freightPrice,
+          totalNum: data.totalNum,
+          totalPrice: data.totalPrice,
+          totalPostage: data.totalPostage,
+          payPrice: data.payPrice,
+          payPostage: data.payPostage,
+          deductionPrice: data.deductionPrice,
+          couponId: data.couponId,
+          couponPrice: data.couponPrice,
+          paid: data.paid,
+          payTime: data.payTime,
+          payType: data.payType,
+          addTime: data.addTime,
+          status: data.status,
+          refundStatus: data.refundStatus,
+          refundReasonWapImg: data.refundReasonWapImg,
+          refundReasonWapExplain: data.refundReasonWapExplain,
+          refundReasonTime: data.refundReasonTime,
+          refundReasonWap: data.refundReasonWap,
+          refundReason: data.refundReason,
+          refundPrice: data.refundPrice,
+          deliveryName: data.deliveryName,
+          deliverySn: data.deliverySn,
+          deliveryType: data.deliveryType,
+          deliveryId: data.deliveryId,
+          gainIntegral: data.gainIntegral,
+          useIntegral: data.useIntegral,
+          backIntegral: data.backIntegral,
+          mark: data.mark,
+          isDel: data.isDel,
+          unique: data.unique,
+          remark: data.remark,
+          merId: data.merId,
+          isMerCheck: data.isMerCheck,
+          combinationId: data.combinationId,
+          pinkId: data.pinkId,
+          cost: data.cost,
+          seckillId: data.seckillId,
+          bargainId: data.bargainId,
+          verifyCode: data.verifyCode,
+          storeId: data.storeId,
+          shippingType: data.shippingType,
+          isChannel: data.isChannel,
+          isRemind: data.isRemind,
+          isSystemDel: data.isSystemDel
+        }
+        _this.dialog = true
+      },
+      editOrder(data) {
+        this.isAdd = false
+        const _this = this.$refs.form3
+        _this.form = {
+          id: data.id,
+          orderId: data.orderId,
+          uid: data.uid,
+          realName: data.realName,
+          userPhone: data.userPhone,
+          userAddress: data.userAddress,
+          cartId: data.cartId,
+          freightPrice: data.freightPrice,
+          totalNum: data.totalNum,
+          totalPrice: data.totalPrice,
+          totalPostage: data.totalPostage,
+          payPrice: data.payPrice,
+          payPostage: data.payPostage,
+          deductionPrice: data.deductionPrice,
+          couponId: data.couponId,
+          couponPrice: data.couponPrice,
+          paid: data.paid,
+          payTime: data.payTime,
+          payType: data.payType,
+          addTime: data.addTime,
+          status: data.status,
+          refundStatus: data.refundStatus,
+          refundReasonWapImg: data.refundReasonWapImg,
+          refundReasonWapExplain: data.refundReasonWapExplain,
+          refundReasonTime: data.refundReasonTime,
+          refundReasonWap: data.refundReasonWap,
+          refundReason: data.refundReason,
+          refundPrice: data.refundPrice,
+          deliveryName: data.deliveryName,
+          deliveryType: data.deliveryType,
+          deliveryId: data.deliveryId,
+          gainIntegral: data.gainIntegral,
+          useIntegral: data.useIntegral,
+          backIntegral: data.backIntegral,
+          mark: data.mark,
+          isDel: data.isDel,
+          unique: data.unique,
+          remark: data.remark,
+          merId: data.merId,
+          isMerCheck: data.isMerCheck,
+          combinationId: data.combinationId,
+          pinkId: data.pinkId,
+          cost: data.cost,
+          seckillId: data.seckillId,
+          bargainId: data.bargainId,
+          verifyCode: data.verifyCode,
+          storeId: data.storeId,
+          shippingType: data.shippingType,
+          isChannel: data.isChannel,
+          isRemind: data.isRemind,
+          isSystemDel: data.isSystemDel
+        }
+        _this.dialog = true
+      },
+      remark(data) {
+        this.isAdd = false
+        const _this = this.$refs.form4
+        _this.form = {
+          id: data.id,
+          orderId: data.orderId,
+          uid: data.uid,
+          realName: data.realName,
+          userPhone: data.userPhone,
+          userAddress: data.userAddress,
+          cartId: data.cartId,
+          freightPrice: data.freightPrice,
+          totalNum: data.totalNum,
+          totalPrice: data.totalPrice,
+          totalPostage: data.totalPostage,
+          payPrice: data.payPrice,
+          payPostage: data.payPostage,
+          deductionPrice: data.deductionPrice,
+          couponId: data.couponId,
+          couponPrice: data.couponPrice,
+          paid: data.paid,
+          payTime: data.payTime,
+          payType: data.payType,
+          addTime: data.addTime,
+          status: data.status,
+          refundStatus: data.refundStatus,
+          refundReasonWapImg: data.refundReasonWapImg,
+          refundReasonWapExplain: data.refundReasonWapExplain,
+          refundReasonTime: data.refundReasonTime,
+          refundReasonWap: data.refundReasonWap,
+          refundReason: data.refundReason,
+          refundPrice: data.refundPrice,
+          deliveryName: data.deliveryName,
+          deliveryType: data.deliveryType,
+          deliveryId: data.deliveryId,
+          gainIntegral: data.gainIntegral,
+          useIntegral: data.useIntegral,
+          backIntegral: data.backIntegral,
+          mark: data.mark,
+          isDel: data.isDel,
+          unique: data.unique,
+          remark: data.remark,
+          merId: data.merId,
+          isMerCheck: data.isMerCheck,
+          combinationId: data.combinationId,
+          pinkId: data.pinkId,
+          cost: data.cost,
+          seckillId: data.seckillId,
+          bargainId: data.bargainId,
+          verifyCode: data.verifyCode,
+          storeId: data.storeId,
+          shippingType: data.shippingType,
+          isChannel: data.isChannel,
+          isRemind: data.isRemind,
+          isSystemDel: data.isSystemDel
+        }
+        _this.dialog = true
+      },
+      refund(data) {
+        this.isAdd = false
+        const _this = this.$refs.form2
+        _this.form = {
+          id: data.id,
+          orderId: data.orderId,
+          uid: data.uid,
+          realName: data.realName,
+          userPhone: data.userPhone,
+          userAddress: data.userAddress,
+          cartId: data.cartId,
+          freightPrice: data.freightPrice,
+          totalNum: data.totalNum,
+          totalPrice: data.totalPrice,
+          totalPostage: data.totalPostage,
+          payPrice: data.payPrice,
+          payPostage: data.payPostage,
+          deductionPrice: data.deductionPrice,
+          couponId: data.couponId,
+          couponPrice: data.couponPrice,
+          paid: data.paid,
+          payTime: data.payTime,
+          payType: data.payType,
+          addTime: data.addTime,
+          status: data.status,
+          refundStatus: data.refundStatus,
+          refundReasonWapImg: data.refundReasonWapImg,
+          refundReasonWapExplain: data.refundReasonWapExplain,
+          refundReasonTime: data.refundReasonTime,
+          refundReasonWap: data.refundReasonWap,
+          refundReason: data.refundReason,
+          refundPrice: data.refundPrice,
+          deliveryName: data.deliveryName,
+          deliveryType: data.deliveryType,
+          deliveryId: data.deliveryId,
+          gainIntegral: data.gainIntegral,
+          useIntegral: data.useIntegral,
+          backIntegral: data.backIntegral,
+          mark: data.mark,
+          isDel: data.isDel,
+          unique: data.unique,
+          remark: data.remark,
+          merId: data.merId,
+          isMerCheck: data.isMerCheck,
+          combinationId: data.combinationId,
+          pinkId: data.pinkId,
+          cost: data.cost,
+          seckillId: data.seckillId,
+          bargainId: data.bargainId,
+          verifyCode: data.verifyCode,
+          storeId: data.storeId,
+          shippingType: data.shippingType,
+          isChannel: data.isChannel,
+          isRemind: data.isRemind,
+          isSystemDel: data.isSystemDel
+        }
+        _this.dialog = true
+      },
+      detail(data) {
+        this.isAdd = false
+        const _this = this.$refs.form1
+        _this.form = {
+          id: data.id,
+          orderId: data.orderId,
+          payTypeName: data.payTypeName,
+          statusName: data.statusName,
+          uid: data.uid,
+          realName: data.realName,
+          userPhone: data.userPhone,
+          userAddress: data.userAddress,
+          cartId: data.cartId,
+          freightPrice: data.freightPrice,
+          totalNum: data.totalNum,
+          totalPrice: data.totalPrice,
+          totalPostage: data.totalPostage,
+          payPrice: data.payPrice,
+          payPostage: data.payPostage,
+          deductionPrice: data.deductionPrice,
+          couponId: data.couponId,
+          couponPrice: data.couponPrice,
+          paid: data.paid,
+          payTime: data.payTime,
+          payType: data.payType,
+          addTime: data.addTime,
+          status: data.status,
+          refundStatus: data.refundStatus,
+          refundReasonWapImg: data.refundReasonWapImg,
+          refundReasonWapExplain: data.refundReasonWapExplain,
+          refundReasonTime: data.refundReasonTime,
+          refundReasonWap: data.refundReasonWap,
+          refundReason: data.refundReason,
+          refundPrice: data.refundPrice,
+          deliveryName: data.deliveryName,
+          deliverySn: data.deliverySn,
+          deliveryType: data.deliveryType,
+          deliveryId: data.deliveryId,
+          gainIntegral: data.gainIntegral,
+          useIntegral: data.useIntegral,
+          backIntegral: data.backIntegral,
+          mark: data.mark,
+          isDel: data.isDel,
+          unique: data.unique,
+          remark: data.remark,
+          merId: data.merId,
+          isMerCheck: data.isMerCheck,
+          combinationId: data.combinationId,
+          pinkId: data.pinkId,
+          cost: data.cost,
+          seckillId: data.seckillId,
+          bargainId: data.bargainId,
+          verifyCode: data.verifyCode,
+          storeId: data.storeId,
+          shippingType: data.shippingType,
+          isChannel: data.isChannel,
+          isRemind: data.isRemind,
+          isSystemDel: data.isSystemDel,
+          nickname: data.userDTO.nickname
+        }
+        _this.dialog = true
+      },
+      getCaculateInfo(){
+        gett().then(res => {
+          this.caculateInfo = {
+            orderPrice : res.priceCount,
+            orderNum : res.orderCount,
+            storeNum : res.goodsCount,
+            userNum : res.userCount,
+          };
+        })
+      },
+      clearCaculateInfo(){
+        this.caculateInfo = {
+          orderPrice : 0,
+          storeNum : 0,
+          orderNum : 0,
+          userNum : 0,
+        };
+      },
+      handleSelectionChange(val) {
+        this.checkList = val;
+        let orderPrice = 0, storeNum = 0, orderNum = 0, userNum = 0;
+        if(val.length !=0 ){
+          this.printChecked = true;
+          let user = [];
+          val.forEach((item,index)=>{
+            orderNum += 1;
+            orderPrice += item.totalPrice;
+            storeNum += item.totalNum;
+            user.push(item.userDTO.account);
+          })
+          user = Array.from(new Set(user));
+          this.caculateInfo = {
+            orderPrice : orderPrice.toFixed(2),
+            storeNum : storeNum,
+            orderNum : orderNum,
+            userNum : user.length,
+          };
+        }else {
+          this.printChecked = false;
+          this.clearCaculateInfo();
+          // this.getCaculateInfo();
+        }
+      },
+      batchSelection(val){
+        let rows = this.data;
+        if (val) {
+          rows.forEach(row => {
+            this.$refs.multipleTable.toggleRowSelection(row);
+          });
+        } else {
+          this.$refs.multipleTable.clearSelection();
+        }
+      },
+      handlePrintOption(val){
+        switch (val) {
+          case '0':
+            this.getPrintList();
+            this.batchHandle = '';
+            break;
+          default:
+            break;
+        }
+      },
+      handleExportOption(val){
+        let list = this.checkList;
+        this.page = 0;
+        this.size = 10000;
+        switch (val) {
+          case "0":
+            this.listContent = "";
+            this.beforeInit();
+            this.downloadMethod();
+            break;
+          case "1":
+            if(list.length == 0){
+              this.$message({
+                message: '请选择订单',
+                type: 'warning'
+              });
+            }else {
+              this.listContent = [];
+              list.forEach((item) => {
+                this.listContent.push(item.orderId);
+              })
+              this.listContent = JSON.stringify(this.listContent);
+              this.beforeInit();
+              this.downloadMethod();
+            }
+            break;
+          default:
+            break;
+        }
+        this.batchExport = "";
+      },
+      getPrintList(){
+        let list = this.checkList;
+        if(list.length == 0){
+          this.$message({
+            message: '请选择订单',
+            type: 'warning'
+          });
+        }else {
+          const _this = this.$refs.form5;
+          _this.dialog = true
+        }
+      },
+      checkboxT(row, rowIndex) {
+        return row.id !== 1
+      },
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .container {
+    height: calc(100% - 80px);
+    position: absolute;
+    overflow: auto;
+    width: calc(100% - 20px);
+
+    .order-caculate {
+      font-size: 14px;
+      color: #909399;
+      border-top: 1px solid #f0f0f0;
+      padding: 20px 10px;
+      .caculate-title {
+        display: inline-block;
+        margin-right: 50px;
       }
-      _this.dialog = true
-    },
-    detail(data) {
-      this.isAdd = false
-      const _this = this.$refs.form1
-      _this.form = {
-        id: data.id,
-        orderId: data.orderId,
-        payTypeName: data.payTypeName,
-        statusName: data.statusName,
-        uid: data.uid,
-        realName: data.realName,
-        userPhone: data.userPhone,
-        userAddress: data.userAddress,
-        cartId: data.cartId,
-        freightPrice: data.freightPrice,
-        totalNum: data.totalNum,
-        totalPrice: data.totalPrice,
-        totalPostage: data.totalPostage,
-        payPrice: data.payPrice,
-        payPostage: data.payPostage,
-        deductionPrice: data.deductionPrice,
-        couponId: data.couponId,
-        couponPrice: data.couponPrice,
-        paid: data.paid,
-        payTime: data.payTime,
-        payType: data.payType,
-        addTime: data.addTime,
-        status: data.status,
-        refundStatus: data.refundStatus,
-        refundReasonWapImg: data.refundReasonWapImg,
-        refundReasonWapExplain: data.refundReasonWapExplain,
-        refundReasonTime: data.refundReasonTime,
-        refundReasonWap: data.refundReasonWap,
-        refundReason: data.refundReason,
-        refundPrice: data.refundPrice,
-        deliveryName: data.deliveryName,
-        deliverySn: data.deliverySn,
-        deliveryType: data.deliveryType,
-        deliveryId: data.deliveryId,
-        gainIntegral: data.gainIntegral,
-        useIntegral: data.useIntegral,
-        backIntegral: data.backIntegral,
-        mark: data.mark,
-        isDel: data.isDel,
-        unique: data.unique,
-        remark: data.remark,
-        merId: data.merId,
-        isMerCheck: data.isMerCheck,
-        combinationId: data.combinationId,
-        pinkId: data.pinkId,
-        cost: data.cost,
-        seckillId: data.seckillId,
-        bargainId: data.bargainId,
-        verifyCode: data.verifyCode,
-        storeId: data.storeId,
-        shippingType: data.shippingType,
-        isChannel: data.isChannel,
-        isRemind: data.isRemind,
-        isSystemDel: data.isSystemDel,
-        nickname: data.userDTO.nickname
+      .caculate-num {
+        font-size: 20px;
+        color: #ff4949;
       }
-      _this.dialog = true
+    }
+
+    .el-table th {
+      background-color: #fafafa;
     }
   }
-}
-</script>
 
-<style scoped>
+  .footer-contains {
+    position: absolute;
+    display: -ms-flexbox;
+    display: flex;
+    background-color: #f6f6f6;
+    bottom: 0;
+    flex-align: center;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    z-index: 999;
+    padding: 0 20px 0 13px;
+  }
+
+  /*打印单样式编辑*/
+  .order-list {
+    /*  height: 297mm;*/
+    margin: 0 auto;
+    width: 210mm;
 
+    .order-title {
+      height: 16mm;
+      line-height: 16mm;
+      font-size: 8mm;
+      font-weight: bolder;
+      text-align: center;
+    }
+    .order-info {
+      span {
+        display: inline-block;
+        padding: 0 0 10px 0;
+        font-size: 3mm;
+      }
+      span.info {
+        width: 60mm;
+      }
+    }
+    .el-table--small th, .el-table--small td {
+      padding: 4px 0;
+    }
+  }
 </style>
diff --git a/src/views/shop/order/print.vue b/src/views/shop/order/print.vue
new file mode 100644
index 0000000..3972ef3
--- /dev/null
+++ b/src/views/shop/order/print.vue
@@ -0,0 +1,189 @@
+<template>
+  <el-dialog id="printDialog" :append-to-body="false" :close-on-click-modal="false" :before-close="cancel" :visible.sync="dialog" title="订单打印" width="220mm">
+
+    <el-button
+      type="warning"
+      class="filter-item"
+      size="mini"
+      icon="el-icon-printer"
+      onclick="doPrint()"
+    >打印</el-button>
+
+    <div id="printList">
+      <div class="order-list" v-for="(list, index) in printList">
+      <el-header class="order-title">订货单</el-header>
+
+      <div class="order-info">
+        <span class="info">{{list.orderId}}</span>
+        <span class="info">下单日期 : {{formatTimeTwo(list.addTime)}}</span>
+        <span>客户名称 : {{list.realName}}</span>
+      </div>
+      <div class="order-info">
+        <span class="info">联系人 : {{list.userDTO.account}}</span>
+        <span class="info">联系电话 : {{list.userPhone}}</span>
+        <span>收货地址 : {{list.userAddress}}</span>
+      </div>
+
+      <el-table border show-summary :data="list.cartInfoList"  :summary-method="getSummaries" size="small" style="width: 100%;">
+        <el-table-column type="index" label="行号" :index="indexMethod" width="60mm"/>
+
+        <el-table-column prop="cartInfoMap.productInfo.productId" width="80mm" label="商品编号" />
+
+        <el-table-column prop="cartInfoMap.productInfo.storeName" width="172mm" label="商品名称" />
+
+        <el-table-column prop="cartInfoMap.productInfo.unitName" width="80mm" label="商品规格" />
+
+        <el-table-column prop="cartInfoMap.productInfo.unitName" width="80mm" label="单位" />
+
+        <el-table-column prop="cartInfoMap.productInfo.price" width="80mm" label="单价" />
+
+        <el-table-column prop="cartInfoMap.cartNum" width="80mm" label="数量" />
+
+        <el-table-column prop="cartInfoMap" width="80mm" label="小计(元)" >
+          <template slot-scope="scope">
+            <span>{{ scope.row.cartInfoMap.productInfo.price*scope.row.cartInfoMap.cartNum }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="cartInfoMap.mark" width="80mm" label="备注" />
+
+      </el-table>
+    </div>
+    </div>
+
+  </el-dialog>
+</template>
+
+<script>
+import { formatTime, parseTime, formatTimeTwo } from '@/utils/index'
+export default {
+ props: {
+    printList: {
+      type: Array,
+      required: true
+    },
+    toQuery: {
+      type: Function,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false, dialog: false
+    }
+  },
+  mounted() {
+    window.doPrint = this.doPrint;
+  },
+  methods: {
+    formatTime,
+    parseTime,
+    formatTimeTwo,
+    cancel() {
+      this.dialog = false
+    },
+    indexMethod(index){
+      return index+1;
+    },
+    doPrint(){
+      let printbox = document.querySelector("#printList").innerHTML;
+      document.querySelector("body").innerHTML = printbox;
+      window.print();
+      this.cancel();
+      // this.toQuery();
+      window.location.reload();
+    },
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计';
+          return;
+        }else if(index === 7){
+          const values = data.map(item => Number(item.cartInfoMap.productInfo.price*item.cartInfoMap.cartNum));
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] += ' 元';
+        }
+      });
+      return sums;
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+  .container {
+    height: calc(100% - 80px);
+    position: absolute;
+    overflow: auto;
+    width: calc(100% - 20px);
+
+    .order-caculate {
+      font-size: 14px;
+      color: #909399;
+      border-top: 1px solid #f0f0f0;
+      padding: 20px 10px;
+      .caculate-title {
+        display: inline-block;
+        margin-right: 50px;
+      }
+      .caculate-num {
+        font-size: 20px;
+        color: #ff4949;
+      }
+    }
+
+    .el-table th {
+      background-color: #fafafa;
+    }
+  }
+
+  .footer-contains {
+    position: absolute;
+    display: -ms-flexbox;
+    display: flex;
+    background-color: #f6f6f6;
+    bottom: 0;
+    flex-align: center;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    z-index: 999;
+    padding: 0 20px 0 13px;
+  }
+
+  /*打印单样式编辑*/
+  .order-list {
+    /*  height: 297mm;*/
+    margin: 0 auto;
+    width: 210mm;
+
+    .order-title {
+      height: 16mm;
+      line-height: 16mm;
+      font-size: 8mm;
+      font-weight: bolder;
+      text-align: center;
+    }
+    .order-info {
+      span {
+        display: inline-block;
+        padding: 0 0 10px 0;
+        font-size: 3mm;
+      }
+      span.info {
+        width: 60mm;
+      }
+    }
+    .el-table--small th, .el-table--small td {
+      padding: 4px 0;
+    }
+  }
+</style>