|
@@ -48,6 +48,7 @@
|
|
</a-row>
|
|
</a-row>
|
|
</a-form>
|
|
</a-form>
|
|
</div>
|
|
</div>
|
|
|
|
+ <div class="btnStyle"><a-button type="primary" class="button-primary" @click="openInfoModal = true">新增调回单</a-button></div>
|
|
<s-table
|
|
<s-table
|
|
class="sTable fixPagination"
|
|
class="sTable fixPagination"
|
|
ref="table"
|
|
ref="table"
|
|
@@ -62,6 +63,11 @@
|
|
:expandRowByClick="true"
|
|
:expandRowByClick="true"
|
|
:defaultLoadData="false"
|
|
:defaultLoadData="false"
|
|
bordered>
|
|
bordered>
|
|
|
|
+ <template slot="recallBillNo" slot-scope="text, record">
|
|
|
|
+ <div class="table-td-link" @click.stop="handleDetail(record)">
|
|
|
|
+ {{ record.recallBillNo || '--' }}
|
|
|
|
+ </div>
|
|
|
|
+ </template>
|
|
<template slot="action" slot-scope="text, record">
|
|
<template slot="action" slot-scope="text, record">
|
|
<a-button
|
|
<a-button
|
|
size="small"
|
|
size="small"
|
|
@@ -102,6 +108,10 @@
|
|
<!-- 退库 -->
|
|
<!-- 退库 -->
|
|
<recallModal :isOpenModal="showModal" :currentData="currentData" @close="showModal=false" @refresh="$refs.table.refresh(true)"></recallModal>
|
|
<recallModal :isOpenModal="showModal" :currentData="currentData" @close="showModal=false" @refresh="$refs.table.refresh(true)"></recallModal>
|
|
</a-spin>
|
|
</a-spin>
|
|
|
|
+ <!-- 新增回调单(选择货架) -->
|
|
|
|
+ <basic-info-modal :openModal="openInfoModal" @ok="handleInfoOk" @close="openInfoModal=false" />
|
|
|
|
+ <!-- 调回单详情 -->
|
|
|
|
+ <detailModal :openModal="showDetail" :itemData="detailContent" @close="showDetail=false"></detailModal>
|
|
</a-card>
|
|
</a-card>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -114,9 +124,11 @@ 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 basicInfoModal from './basicInfoModal.vue'
|
|
|
|
+import detailModal from './detailModal'
|
|
import { shelfRecallList, shelfRecallDetailList, shelfRecallCancel, shelfRecallStateCount, shelfRecallDelete } 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, basicInfoModal, detailModal },
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
@@ -140,10 +152,11 @@ export default {
|
|
shelfSn: undefined, // 数字货架sn
|
|
shelfSn: undefined, // 数字货架sn
|
|
bizType: 'ALL'
|
|
bizType: 'ALL'
|
|
},
|
|
},
|
|
|
|
+ openInfoModal: false,
|
|
columns: [
|
|
columns: [
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '调回单号', dataIndex: 'recallBillNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '调回单号', scopedSlots: { customRender: 'recallBillNo' }, width: '20%', align: 'center' },
|
|
{ title: '货架名称', dataIndex: 'shelfInfo.shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '货架名称', dataIndex: 'shelfInfo.shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '状态', dataIndex: 'billStateDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '状态', dataIndex: 'billStateDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '调回总量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
|
|
{ title: '调回总量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
|
|
@@ -159,6 +172,8 @@ export default {
|
|
{ title: '单位', dataIndex: 'product.unit', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
{ title: '单位', dataIndex: 'product.unit', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
],
|
|
],
|
|
innerData: [],
|
|
innerData: [],
|
|
|
|
+ showDetail: false,
|
|
|
|
+ detailContent: null,
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
this.disabled = true
|
|
this.disabled = true
|
|
@@ -323,6 +338,14 @@ export default {
|
|
_this.setTableH()
|
|
_this.setTableH()
|
|
})
|
|
})
|
|
this.getSumByType()
|
|
this.getSumByType()
|
|
|
|
+ },
|
|
|
|
+ // 详情
|
|
|
|
+ handleDetail (con) {
|
|
|
|
+ this.detailContent = con
|
|
|
|
+ this.showDetail = true
|
|
|
|
+ },
|
|
|
|
+ handleInfoOk () {
|
|
|
|
+
|
|
}
|
|
}
|
|
},
|
|
},
|
|
mounted () {
|
|
mounted () {
|
|
@@ -385,4 +408,7 @@ export default {
|
|
height: 30px!important;
|
|
height: 30px!important;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ .btnStyle{
|
|
|
|
+ margin:10px 0 20px;
|
|
|
|
+ }
|
|
</style>
|
|
</style>
|