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