zhangdan 3 лет назад
Родитель
Сommit
5ead3190bb

+ 22 - 0
src/config/router.config.js

@@ -144,6 +144,28 @@ export const asyncRouterMap = [
                   hidden: true
                   // permission: 'M_salesQueryList'
                 }
+              },
+              {
+                path: 'unDetail/:id',
+                name: 'unSettlementDetail',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/numsGoodsShelves/settlementManagement/unSettlementDetail.vue'),
+                meta: {
+                  title: '待结算明细',
+                  icon: 'monitor',
+                  hidden: true
+                  // permission: 'M_salesQueryList'
+                }
+              },
+              {
+                path: 'detail/:id',
+                name: 'settlementDetail',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/numsGoodsShelves/settlementManagement/settlementDetail.vue'),
+                meta: {
+                  title: '结算历史',
+                  icon: 'monitor',
+                  hidden: true
+                  // permission: 'M_salesQueryList'
+                }
               }
             ]
           },

+ 1 - 1
src/views/numsGoodsShelves/recallManagement/confirmModal.vue

@@ -97,7 +97,7 @@ export default {
   },
   computed: {
     title () {
-      return '调回单退库' + ' —— ' + (this.currentData && this.currentData.createDate ? this.currentData.createDate : '')
+      // return '调回单退库' + ' —— ' + (this.currentData && this.currentData.createDate ? this.currentData.createDate : '')
     }
   },
 

+ 47 - 6
src/views/numsGoodsShelves/recallManagement/list.vue

@@ -7,7 +7,13 @@
           <a-row :gutter="36">
             <a-col :md="6" :sm="24">
               <a-form-item label="创建时间">
-                <a-range-picker v-model="time" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD" style="width: 100%;"/>
+                <a-range-picker
+                  :value="time"
+                  allowClear
+                  :disabledDate="disabledDate"
+                  format="YYYY-MM-DD"
+                  style="width: 100%;"
+                  @change="dateChange"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -69,7 +75,7 @@
         </a-tab-pane>
       </a-tabs> -->
 
-      <s-table
+      <a-table
         class="sTable fixPagination"
         ref="table"
         :style="{ height: tableHeight+77+'px' }"
@@ -80,6 +86,9 @@
         :scroll="{ y:tableHeight }"
         :showPagination="false"
         :defaultLoadData="false"
+        :expandIconColumnIndex="-1"
+        :expandIconAsCell="false"
+        :defaultExpandAllRows="true"
         bordered>
         <template slot="action" slot-scope="text, record">
           <a-button
@@ -95,7 +104,16 @@
             @click="handleCancel(record)"
             id="shelfMonitoringList-warehousing-btn">取消调回单</a-button>
         </template>
-      </s-table>
+        <a-table
+          class="inner-table"
+          slot="expandedRowRender"
+          slot-scope="text"
+          :columns="innerColumns"
+          :data-source="innerData"
+          :pagination="false"
+        >
+        </a-table>
+      </a-table>
     </a-spin>
     <!-- 申请提现 -->
     <confirmModal :isOpenModal="showModal" :currentData="currentData" @close="showModal=false" @refresh="$refs.table.refresh(true)"></confirmModal>
@@ -106,6 +124,7 @@
 import moment from 'moment'
 import { STable } from '@/components'
 import confirmModal from './confirmModal.vue'
+import getDate from '@/libs/getDate.js'
 export default {
   components: { STable, confirmModal },
   data () {
@@ -118,9 +137,14 @@ export default {
       currentData: null,
       activeKey: 0, // 默认的tab
       tabsList: [{ code: 0, name: '全部' }, { code: 1, name: '待退库' }, { code: 2, name: '已完成' }, { code: 3, name: '已取消' }],
-      time: [],
+      time: [
+        getDate.getCurrMonthDays().starttime,
+        getDate.getCurrMonthDays().endtime
+      ],
       goodsShelveList: [], // 货架数据
       queryParam: {
+        beginDate: getDate.getCurrMonthDays().starttime, // 开始时间
+        endDate: getDate.getCurrMonthDays().endtime, // 结束时间
         danhao: '',
         name: '',
         code: ''
@@ -135,6 +159,15 @@ export default {
         { title: '实退总量', width: '10%', align: 'center' },
         { title: '操作', width: '10%', align: 'center', scopedSlots: { customRender: 'action' } }
       ],
+      innerColumns: [
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '产品编码', dataIndex: 'createDate', width: '15%', align: 'center' },
+        { title: '产品名称', dataIndex: 'createDate', width: '15%', align: 'center' },
+        { title: '调回数量', dataIndex: 'createDate', width: '15%', align: 'center' },
+        { title: '实退数量', dataIndex: 'createDate', width: '15%', align: 'center' },
+        { title: '单位', dataIndex: 'createDate', width: '15%', align: 'center' }
+      ],
+      innerData: [],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         // this.disabled = true
@@ -169,7 +202,8 @@ export default {
   methods: {
     // 时间改变
     dateChange (date) {
-
+      this.queryParam.beginDate = date[0]
+      this.queryParam.endDate = date[1]
     },
     // 禁止选择今天之后的日期
     disabledDate (current) {
@@ -252,6 +286,13 @@ export default {
 
 <style lang="less">
   .accountManagementList-wrap{
-
+    .inner-table{
+      background-color: #fff;
+      .ant-table{
+         margin: 10px 150px;
+         border-left: 1px solid #eee;
+         border-bottom: 1px solid #eee;
+      }
+    }
   }
 </style>

+ 160 - 0
src/views/numsGoodsShelves/settlementManagement/detailModal.vue

@@ -0,0 +1,160 @@
+<template>
+  <a-modal
+    centered
+    class="chooseImport-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="结算明细"
+    v-model="isShow"
+    @cancle="isShow=false"
+    width="70%">
+    <div class="chooseImport-con">
+      <a-descriptions :column="3">
+        <a-descriptions-item label="结算时间">
+          Zhou Maomao
+        </a-descriptions-item>
+        <a-descriptions-item label="结算金额">
+          1810000000
+        </a-descriptions-item>
+        <a-descriptions-item label="支付方式">
+          Hangzhou, Zhejiang
+        </a-descriptions-item>
+      </a-descriptions>
+      <!-- 可导入数据 -->
+      <a-table
+        class="sTable"
+        ref="table"
+        size="small"
+        :rowKey="(record) => record.allocateSn"
+        :columns="nowColumns"
+        :dataSource="loadData"
+        :loading="loading"
+        :scroll="{ y: 200 }"
+        :pagination="false"
+        bordered>
+      </a-table>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+// import { hdExportExcel } from '@/libs/exportExcel'
+// import { sparePartsDetailParseProducts, sparePartsDetailFailExcel } from '@/api/spareParts'
+export default {
+  name: 'ChooseImportModal',
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    paramsData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      nowColumns: [
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '取货时间', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '订单编号', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '取货号', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productCode', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品售价', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '下单数量', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '合计金额', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
+      ],
+      loadData: [],
+      loading: false
+    }
+  },
+  methods: {
+    getData () {
+      const _this = this
+      this.loading = true
+      const params = {
+        sparePartsSn: this.paramsData.sparePartsSn,
+        path: this.paramsData.path
+      }
+      // sparePartsDetailParseProducts(params).then(res => {
+      //   this.loading = false
+      //   if (res.status == 200) {
+      //     if (res.data.okList && res.data.okList.length > 0) {
+      //       res.data.okList.map((item, index) => {
+      //         item.no = index + 1
+      //       })
+      //     }
+      //     if (res.data.failList && res.data.failList.length > 0) {
+      //       res.data.failList.map((item, index) => {
+      //         item.no = index + 1
+      //       })
+      //     }
+      //     _this.loadData = res.data.okList || []
+      //     _this.unLoadData = res.data.failList || []
+      //   }
+      // })
+    },
+    // 确认导入
+    handleSubmit () {
+      if (this.loadData.length == 0) {
+        this.$message.warning('无可导入产品!')
+      } else {
+        this.$emit('ok', this.loadData)
+        this.isShow = false
+      }
+    },
+    // 导出
+    handleError () {
+      // const _this = this
+      // if (_this.unLoadData.length < 1) {
+      //   _this.$message.info('暂无可导出错误项~')
+      //   return
+      // }
+      // _this.spinning = true
+      // const params = {
+      //   list: _this.unLoadData
+      // }
+      // hdExportExcel(sparePartsDetailFailExcel, params, '产品导入错误项', function () {
+      //   _this.spinning = false
+      // })
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+        this.loadData = []
+        this.unLoadData = []
+      } else {
+        this.getData()
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .chooseImport-modal{
+    .chooseImport-con{
+      .red{
+        color: #f30;
+      }
+      .btn-con{
+        text-align: center;
+        margin: 30px 0 20px;
+        .button-cancel,.button-error{
+          font-size: 12px;
+        }
+      }
+    }
+  }
+</style>

+ 184 - 1
src/views/numsGoodsShelves/settlementManagement/list.vue

@@ -1,8 +1,191 @@
 <template>
+  <a-card size="small" :bordered="false" class="accountManagementList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
+            <a-col :xl="6" :lg="6" :md="12" :sm="24">
+              <a-form-item label="交易时间">
+                <a-range-picker v-model="time" :format="dateFormat" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD"/>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="6" :md="6" :sm="6" style="padding-top: 4px;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh" >查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <a-alert type="info" style="margin:10px 0">
+        <div slot="message" style="display: flex;align-items: center;padding: 2px 0;">
+          共:<strong>{{ }}</strong>条记录;
+          待结算金额合计¥<strong>{{ }}</strong>
+        </div>
+      </a-alert>
+      <s-table
+        class="sTable fixPagination"
+        ref="table"
+        :style="{ height: tableHeight+77+'px' }"
+        size="small"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ y:tableHeight }"
+        :defaultLoadData="true"
+        bordered>
+        <template slot="action" slot-scope="text,record">
+          <a-button
+            size="small"
+            type="link"
+            class="button-primary"
+            @click="handleUndetail(record)"
+            id="shelfMonitoringList-warehousing-btn">待结明细</a-button>
+          <a-button
+            size="small"
+            type="link"
+            class="button-primary"
+            @click="handleDetail(record)"
+            id="shelfMonitoringList-warehousing-btn">结算历史</a-button>
+        </template>
+      </s-table>
+    </a-spin>
+    <!-- 申请提现 -->
+    <!-- <applyWithdrawal :isOpenModal="showModal" :currentData="currentData" @close="showModal=false" @refresh="$refs.table.refresh(true)"></applyWithdrawal> -->
+  </a-card>
 </template>
 
 <script>
+import moment from 'moment'
+import { STable } from '@/components'
+// import applyWithdrawal from './applyWithdrawal.vue'
+export default {
+  components: { STable },
+  data () {
+    return {
+      spinning: false,
+      disabled: false,
+      tableHeight: 0,
+      showModal: false,
+      currentData: null,
+      time: [],
+      columns: [
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '交易时间', dataIndex: 'createDate', width: '15%', align: 'center' },
+        { title: '调回单号', dataIndex: 'name', width: '30%', align: 'center' },
+        { title: '货架名称', dataIndex: '', width: '10%', align: 'center' },
+        { title: '状态', dataIndex: '', width: '10%', align: 'center' },
+        { title: '调回总量', dataIndex: '', width: '10%', align: 'center' },
+        { title: '操作', width: '10%', align: 'center', scopedSlots: { customRender: 'action' } }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        const _this = this
+        _this.disabled = true
+        _this.spinning = true
+        return new Promise(function (resolve, reject) {
+          const data = {
+            list: [{ id: 1, createDate: '2020-08-09' }]
+          }
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = i + 1
+          }
+          _this.spinning = false
+          _this.disabled = false
+          resolve(data)
+        })
+
+        // const paramsPage = Object.assign(this.queryParam) //  有分页
+        // return reportSalesReturnThjdReportList(paramsPage).then(res => {
+        //   let data
+        //   if (res.status == 200) {
+        //     data = res.data
+        //     // this.getCount(paramsPage)
+        //     const no = (data.pageNo - 1) * data.pageSize
+        //     for (var i = 0; i < data.list.length; i++) {
+        //       data.list[i].no = no + i + 1
+        //     }
+        //     this.disabled = false
+        //   }
+        //   this.spinning = false
+        //   return data
+        // })
+      }
+    }
+  },
+  methods: {
+    // 时间改变
+    dateChange (date) {
+
+    },
+    // 禁止选择今天之后的日期
+    disabledDate (current) {
+      return current && current > moment().endOf('day')
+    },
+    // 重置
+    resetSearchForm () {
+      this.time = []
+    },
+    // 申请提现
+    handleTX () {
+      this.showModal = true
+    },
+    // 待结明细
+    handleUndetail (row) {
+      this.$router.push({ name: 'unSettlementDetail', params: { id: row.id } })
+    },
+    // 结算历史
+    handleDetail (row) {
+      this.$router.push({ name: 'settlementDetail', params: { id: row.id } })
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 265
+    },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
+  watch: {
+    advanced (newValue, oldValue) {
+      const _this = this
+      setTimeout(() => {
+        _this.setTableH()
+      }, 400)
+    },
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
+  activated () {
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.pageInit()
+      this.resetSearchForm()
+    }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {})
+  }
+}
 </script>
 
-<style>
+<style lang="less">
+  .accountManagementList-wrap{
+
+  }
 </style>

+ 152 - 0
src/views/numsGoodsShelves/settlementManagement/settlementDetail.vue

@@ -0,0 +1,152 @@
+<template>
+  <div class="goodsAllocationSet-page">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <a-page-header :ghost="false" :backIcon="false" class="goodsAllocationSet-baseInfo" >
+        <template slot="subTitle">
+          <a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;">货架名称:{{ '西安车领主常青二路数字货架' }}</span>
+        </template>
+      </a-page-header>
+      <a-card :bordered="false" size="small" class="goodsAllocationSet-baseInfo">
+        <div ref="tableSearch" class="table-page-search-wrapper">
+          <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+            <a-row :gutter="15">
+              <a-col :xl="6" :lg="6" :md="12" :sm="24">
+                <a-form-item label="结算时间">
+                  <a-range-picker v-model="time" :format="dateFormat" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD"/>
+                </a-form-item>
+              </a-col>
+              <a-col :xl="6" :lg="6" :md="12" :sm="24">
+                <a-form-item label="支付状态">
+                  <v-select code="ENABLE_FLAG" v-model="form.isEnable" allowClear placeholder="请选择结算方式"></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :xl="6" :lg="6" :md="6" :sm="6" >
+                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh" >查询</a-button>
+                <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
+              </a-col>
+            </a-row>
+          </a-form>
+        </div>
+        <a-alert type="info" style="margin:10px 0">
+          <div slot="message" >
+            结算资金可通过账户管理-提现管理功能提出至银行卡
+          </div>
+        </a-alert>
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          size="small"
+          rowKey="id"
+          :showPagination="false"
+          :columns="columns"
+          :data="loadData"
+          :defaultLoadData="false"
+          bordered>
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-primary"
+              @click="handleDetail(record)"
+              id="shelfMonitoringList-warehousing-btn">查看详情</a-button>
+          </template>
+        </s-table>
+      </a-card>
+      <!-- 导入货位模板 -->
+      <detailModal :openModal="openModal" @close="openModal=false"></detailModal>
+    </a-spin>
+  </div>
+</template>
+
+<script>
+import { STable, VSelect } from '@/components'
+import { getPowerUserList } from '@/api/power-user.js'
+import detailModal from './detailModal.vue'
+export default {
+  components: { STable, VSelect, detailModal },
+  data () {
+    return {
+      spinning: false,
+      disabled: false,
+      isEdit: false, // 货位号是否为编辑
+      openModal: false, // 货位模板弹窗初始状态
+      formItemLayout: {
+        labelCol: { span: 6 },
+        wrapperCol: { span: 16 }
+      },
+      time: [],
+      form: {
+        isEnable: '',
+        name: '',
+        phone: '',
+        loginName: '',
+        sex: undefined,
+        loginFlag: '', // 状态
+        roleNames: undefined, // 角色
+        productMsg: '', // 图片
+        remarks: ''
+      },
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: '12.5%', align: 'center' },
+        { title: '结算时间', dataIndex: 'name', width: '25%', align: 'center', scopedSlots: { customRender: 'name' } },
+        { title: '结算金额', dataIndex: 'createDate', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '支付方式', dataIndex: '', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', width: '12.5%', align: 'center', scopedSlots: { customRender: 'action' } }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.spinning = true
+        return getPowerUserList(Object.assign(parameter)).then(res => {
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (let i = 0; i < data.list.length; i++) {
+              const _item = data.list[i]
+              _item.no = no + i + 1
+              _item.loginFlag = _item.loginFlag + '' === '1'
+            }
+          }
+          this.spinning = false
+          return data
+        })
+      }
+    }
+  },
+  mounted () {
+    this.$refs.table.refresh()
+  },
+  methods: {
+    handleBack () {
+      this.$router.go(-1)
+    },
+    // 重置
+    resetSearchForm () {},
+    // 查看详情
+    handleDetail (row) {
+      this.openModal = true
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .goodsAllocationSet-page{
+    position: relative;
+    height: 100%;
+    padding-bottom: 51px;
+    box-sizing: border-box;
+    .goodsAllocationSet-baseInfo{
+      margin-bottom: 10px;
+    }
+    .bzj-collapse{
+      margin-top: 10px;
+      .ant-collapse-content-box{
+        padding: 10px !important;
+      }
+    }
+
+  }
+</style>

+ 143 - 0
src/views/numsGoodsShelves/settlementManagement/unSettlementDetail.vue

@@ -0,0 +1,143 @@
+<template>
+  <div class="goodsAllocationSet-page">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <a-page-header :ghost="false" :backIcon="false" class="goodsAllocationSet-baseInfo" >
+        <template slot="subTitle">
+          <a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
+          <span style="margin: 0 15px;color: #666;">货架名称:{{ '西安车领主常青二路数字货架' }}</span>
+        </template>
+      </a-page-header>
+      <a-card :bordered="false" size="small" class="goodsAllocationSet-baseInfo">
+        <div ref="tableSearch" class="table-page-search-wrapper">
+          <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+            <a-row :gutter="15">
+              <a-col :xl="6" :lg="6" :md="12" :sm="24">
+                <a-form-item label="取货时间">
+                  <a-range-picker v-model="time" :format="dateFormat" allowClear :disabledDate="disabledDate" format="YYYY-MM-DD"/>
+                </a-form-item>
+              </a-col>
+              <a-col :xl="6" :lg="6" :md="12" :sm="24">
+                <a-form-item label="订单编号">
+                  <a-input placeholder="请输入订单编号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :xl="6" :lg="6" :md="6" :sm="6" >
+                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh" >查询</a-button>
+                <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
+              </a-col>
+            </a-row>
+          </a-form>
+        </div>
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          size="small"
+          rowKey="id"
+          :showPagination="false"
+          :columns="columns"
+          :data="loadData"
+          :defaultLoadData="false"
+          bordered>
+          <template slot="name" slot-scope="text, record">
+            <a-input allowClear placeholder="请输入货位号" v-if="isEdit" style="width: 80%;"/>
+            <span v-if="!isEdit">{{ record.name }}</span>
+          </template>
+        </s-table>
+      </a-card>
+      <!-- 导入货位模板 -->
+      <!-- <importHuoweiModal :openModal="openModal" @close="openModal=false"></importHuoweiModal> -->
+    </a-spin>
+  </div>
+</template>
+
+<script>
+import { STable, VSelect } from '@/components'
+import { getPowerUserList } from '@/api/power-user.js'
+// import importHuoweiModal from './importHuoweiModal.vue'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      spinning: false,
+      disabled: false,
+      isEdit: false, // 货位号是否为编辑
+      openModal: false, // 货位模板弹窗初始状态
+      formItemLayout: {
+        labelCol: { span: 6 },
+        wrapperCol: { span: 16 }
+      },
+      time: [],
+      form: {
+        isEnable: '',
+        name: '',
+        phone: '',
+        loginName: '',
+        sex: undefined,
+        loginFlag: '', // 状态
+        roleNames: undefined, // 角色
+        productMsg: '', // 图片
+        remarks: ''
+      },
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '取货时间', dataIndex: 'name', width: '11%', align: 'center', scopedSlots: { customRender: 'name' } },
+        { title: '订单编号', dataIndex: 'createDate', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '货位号', dataIndex: '', width: '18%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品售价', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '下单数量', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '合计金额', width: '9%', align: 'center', customRender: function (text) { return text || '--' } }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.spinning = true
+        return getPowerUserList(Object.assign(parameter)).then(res => {
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (let i = 0; i < data.list.length; i++) {
+              const _item = data.list[i]
+              _item.no = no + i + 1
+              _item.loginFlag = _item.loginFlag + '' === '1'
+            }
+          }
+          this.spinning = false
+          return data
+        })
+      }
+    }
+  },
+  mounted () {
+    this.$refs.table.refresh()
+  },
+  methods: {
+    handleBack () {
+      this.$router.go(-1)
+    },
+    // 重置
+    resetSearchForm () {}
+  }
+}
+</script>
+
+<style lang="less">
+  .goodsAllocationSet-page{
+    position: relative;
+    height: 100%;
+    padding-bottom: 51px;
+    box-sizing: border-box;
+    .goodsAllocationSet-baseInfo{
+      margin-bottom: 10px;
+    }
+    .bzj-collapse{
+      margin-top: 10px;
+      .ant-collapse-content-box{
+        padding: 10px !important;
+      }
+    }
+
+  }
+</style>