|
@@ -2,7 +2,12 @@
|
|
<a-card size="small" :bordered="false" class="accountManagementList-wrap">
|
|
<a-card size="small" :bordered="false" class="accountManagementList-wrap">
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
<!-- 搜索条件 -->
|
|
<!-- 搜索条件 -->
|
|
- <div ref="tableSearch" class="table-page-search-wrapper">
|
|
|
|
|
|
+ <div ref="tableSearch" style="width:100%;overflow: hidden;" class="table-page-search-wrapper">
|
|
|
|
+ <a-tabs type="card" v-model="queryParam.bizType" @change="tabChange" class="replenishmentManagementList-tabs">
|
|
|
|
+ <a-tab-pane v-for="item in tabsList" :key="item.code">
|
|
|
|
+ <p slot="tab">{{ item.name }}<span v-if="item.countNum&&item.code=='WAIT_CONFIRM'" style="color:red">({{ item.countNum }})</span></p>
|
|
|
|
+ </a-tab-pane>
|
|
|
|
+ </a-tabs>
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
<a-row :gutter="36">
|
|
<a-row :gutter="36">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
@@ -43,11 +48,6 @@
|
|
</a-row>
|
|
</a-row>
|
|
</a-form>
|
|
</a-form>
|
|
</div>
|
|
</div>
|
|
- <a-tabs type="card" v-model="queryParam.bizType" @change="tabChange" class="replenishmentManagementList-tabs">
|
|
|
|
- <a-tab-pane v-for="item in tabsList" :key="item.code">
|
|
|
|
- <p slot="tab">{{ item.name }}<span v-if="item.countNum&&item.code=='WAIT_CONFIRM'" style="color:red">({{ item.countNum }})</span></p>
|
|
|
|
- </a-tab-pane>
|
|
|
|
- </a-tabs>
|
|
|
|
<s-table
|
|
<s-table
|
|
class="sTable fixPagination"
|
|
class="sTable fixPagination"
|
|
ref="table"
|
|
ref="table"
|
|
@@ -69,15 +69,22 @@
|
|
v-if="record.billState=='WAIT_CONFIRM'"
|
|
v-if="record.billState=='WAIT_CONFIRM'"
|
|
class="button-primary"
|
|
class="button-primary"
|
|
@click.stop="handleRecall(record)"
|
|
@click.stop="handleRecall(record)"
|
|
- id="shelfMonitoringList-warehousing-btn">退库</a-button>
|
|
|
|
|
|
+ >退库</a-button>
|
|
<a-button
|
|
<a-button
|
|
size="small"
|
|
size="small"
|
|
v-if="record.billState=='WAIT_CONFIRM'"
|
|
v-if="record.billState=='WAIT_CONFIRM'"
|
|
type="link"
|
|
type="link"
|
|
class="button-primary"
|
|
class="button-primary"
|
|
@click.stop="handleCancel(record)"
|
|
@click.stop="handleCancel(record)"
|
|
- id="shelfMonitoringList-warehousing-btn">取消调回单</a-button>
|
|
|
|
- <span v-if="record.billState!='WAIT_CONFIRM'" style="display: inline-block;margin-left: 7px;">--</span>
|
|
|
|
|
|
+ >取消调回单</a-button>
|
|
|
|
+ <a-button
|
|
|
|
+ size="small"
|
|
|
|
+ v-if="record.billState=='CANCEL'"
|
|
|
|
+ type="link"
|
|
|
|
+ class="button-primary"
|
|
|
|
+ @click.stop="handleDelete(record)"
|
|
|
|
+ >删除</a-button>
|
|
|
|
+ <span v-if="record.billState=='FINISH'">--</span>
|
|
</template>
|
|
</template>
|
|
<a-table
|
|
<a-table
|
|
v-if="innerData&&innerData[index]"
|
|
v-if="innerData&&innerData[index]"
|
|
@@ -92,9 +99,9 @@
|
|
>
|
|
>
|
|
</a-table>
|
|
</a-table>
|
|
</s-table>
|
|
</s-table>
|
|
|
|
+ <!-- 退库 -->
|
|
|
|
+ <recallModal :isOpenModal="showModal" :currentData="currentData" @close="showModal=false" @refresh="$refs.table.refresh(true)"></recallModal>
|
|
</a-spin>
|
|
</a-spin>
|
|
- <!-- 退库 -->
|
|
|
|
- <recallModal :isOpenModal="showModal" :currentData="currentData" @close="showModal=false" @refresh="$refs.table.refresh(true)"></recallModal>
|
|
|
|
</a-card>
|
|
</a-card>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -107,7 +114,7 @@ import recallModal from './recallModal.vue'
|
|
import getDate from '@/libs/getDate.js'
|
|
import getDate from '@/libs/getDate.js'
|
|
import { toThousands } from '@/libs/tools.js'
|
|
import { toThousands } from '@/libs/tools.js'
|
|
import shelfList from '@/views/common/shelfList'
|
|
import shelfList from '@/views/common/shelfList'
|
|
-import { shelfRecallList, shelfRecallDetailList, shelfRecallCancel, shelfRecallStateCount } from '@/api/shelfRecall.js'
|
|
|
|
|
|
+import { shelfRecallList, shelfRecallDetailList, shelfRecallCancel, shelfRecallStateCount, shelfRecallDelete } from '@/api/shelfRecall.js'
|
|
export default {
|
|
export default {
|
|
components: { STable, recallModal, rangeDate, shelfList },
|
|
components: { STable, recallModal, rangeDate, shelfList },
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
@@ -121,7 +128,6 @@ export default {
|
|
currentData: null,
|
|
currentData: null,
|
|
activeKey: 0, // 默认的tab
|
|
activeKey: 0, // 默认的tab
|
|
tabsList: [],
|
|
tabsList: [],
|
|
- currentType: 'ALL',
|
|
|
|
expandedRowKeys: [],
|
|
expandedRowKeys: [],
|
|
time: [
|
|
time: [
|
|
getDate.getCurrMonthDays().starttime,
|
|
getDate.getCurrMonthDays().starttime,
|
|
@@ -198,7 +204,6 @@ export default {
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
this.queryParam.bizType = key
|
|
this.queryParam.bizType = key
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
- this.currentType = key
|
|
|
|
}, 100)
|
|
}, 100)
|
|
},
|
|
},
|
|
// 获取各类型下的数量
|
|
// 获取各类型下的数量
|
|
@@ -211,7 +216,6 @@ export default {
|
|
this.tabsList = [
|
|
this.tabsList = [
|
|
{ code: 'ALL', name: '全部', countNum: 0 }, { code: 'WAIT_CONFIRM', name: '待退库', countNum: 0 }, { code: 'FINISH', name: '已完成', countNum: 0 }, { code: 'CANCEL', name: '已取消', countNum: 0 }
|
|
{ code: 'ALL', name: '全部', countNum: 0 }, { code: 'WAIT_CONFIRM', name: '待退库', countNum: 0 }, { code: 'FINISH', name: '已完成', countNum: 0 }, { code: 'CANCEL', name: '已取消', countNum: 0 }
|
|
]
|
|
]
|
|
- // this.queryParam.bizType = 'ALL'
|
|
|
|
this.tabsList[1].countNum = res.data.WAIT_CONFIRM || 0
|
|
this.tabsList[1].countNum = res.data.WAIT_CONFIRM || 0
|
|
this.tabsList[2].countNum = res.data.FINISH || 0
|
|
this.tabsList[2].countNum = res.data.FINISH || 0
|
|
this.tabsList[3].countNum = res.data.CANCEL || 0
|
|
this.tabsList[3].countNum = res.data.CANCEL || 0
|
|
@@ -249,21 +253,17 @@ export default {
|
|
},
|
|
},
|
|
// 重置
|
|
// 重置
|
|
resetSearchForm () {
|
|
resetSearchForm () {
|
|
- // this.$refs.rangeDate.resetDate(this.time)
|
|
|
|
- // this.queryParam.billState = this.currentType
|
|
|
|
- // this.queryParam = {
|
|
|
|
this.resetData()
|
|
this.resetData()
|
|
-
|
|
|
|
this.getSumByType()
|
|
this.getSumByType()
|
|
},
|
|
},
|
|
resetData () {
|
|
resetData () {
|
|
this.$refs.rangeDate.resetDate(this.time)
|
|
this.$refs.rangeDate.resetDate(this.time)
|
|
- this.queryParam.bizType = 'ALL'
|
|
|
|
this.queryParam = {
|
|
this.queryParam = {
|
|
beginDate: getDate.getCurrMonthDays().starttime, // 开始时间
|
|
beginDate: getDate.getCurrMonthDays().starttime, // 开始时间
|
|
endDate: getDate.getCurrMonthDays().endtime, // 结束时间
|
|
endDate: getDate.getCurrMonthDays().endtime, // 结束时间
|
|
recallBillNo: '', // 调回单号
|
|
recallBillNo: '', // 调回单号
|
|
- shelfSn: undefined // 数字货架sn
|
|
|
|
|
|
+ shelfSn: undefined, // 数字货架sn
|
|
|
|
+ bizType: 'ALL'
|
|
}
|
|
}
|
|
},
|
|
},
|
|
// 退库
|
|
// 退库
|
|
@@ -292,9 +292,30 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
+ // 删除
|
|
|
|
+ handleDelete (row) {
|
|
|
|
+ const _this = this
|
|
|
|
+ this.$confirm({
|
|
|
|
+ title: '提示',
|
|
|
|
+ content: '确认删除调回单吗?',
|
|
|
|
+ centered: true,
|
|
|
|
+ onOk () {
|
|
|
|
+ _this.spinning = true
|
|
|
|
+ shelfRecallDelete({ recallBillSn: row.recallBillSn }).then(res => {
|
|
|
|
+ if (res.status == 200) {
|
|
|
|
+ _this.$message.success(res.message)
|
|
|
|
+ _this.$refs.table.refresh()
|
|
|
|
+ _this.spinning = false
|
|
|
|
+ } else {
|
|
|
|
+ _this.spinning = false
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ },
|
|
setTableH () {
|
|
setTableH () {
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 265
|
|
|
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 250
|
|
},
|
|
},
|
|
pageInit () {
|
|
pageInit () {
|
|
const _this = this
|
|
const _this = this
|
|
@@ -341,6 +362,7 @@ export default {
|
|
|
|
|
|
<style lang="less">
|
|
<style lang="less">
|
|
.accountManagementList-wrap{
|
|
.accountManagementList-wrap{
|
|
|
|
+ width:100%;
|
|
.inner-table{
|
|
.inner-table{
|
|
background-color: #fff;
|
|
background-color: #fff;
|
|
border-bottom: 1px solid #eee;
|
|
border-bottom: 1px solid #eee;
|
|
@@ -349,5 +371,18 @@ export default {
|
|
border-bottom: 1px solid #eee;
|
|
border-bottom: 1px solid #eee;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ .replenishmentManagementList-tabs.ant-tabs.ant-tabs-card .ant-tabs-bar{
|
|
|
|
+ margin: 0 0 10px 0!important;
|
|
|
|
+ }
|
|
|
|
+ .replenishmentManagementList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-nav-container{
|
|
|
|
+ height: 30px!important;
|
|
|
|
+ }
|
|
|
|
+ .replenishmentManagementList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active{
|
|
|
|
+ height: 30px!important;
|
|
|
|
+ }
|
|
|
|
+ .replenishmentManagementList-tabs.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab{
|
|
|
|
+ line-height: 26px!important;
|
|
|
|
+ height: 30px!important;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
</style>
|
|
</style>
|