|
@@ -36,7 +36,7 @@
|
|
</template>
|
|
</template>
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<span class="table-page-search-submitButtons">
|
|
<span class="table-page-search-submitButtons">
|
|
- <a-button type="info" style="margin-left: 5px" @click="openCreatRoModal=true" >生成补货单</a-button>
|
|
|
|
|
|
+ <!-- <a-button type="info" style="margin-left: 5px" @click="openCreatRoModal=true" >生成补货单</a-button> -->
|
|
<a-button type="primary" style="margin-left: 5px" @click="queryByTypeSum" :disabled="disabled" id="replenishmentManagementList-refresh">查询</a-button>
|
|
<a-button type="primary" style="margin-left: 5px" @click="queryByTypeSum" :disabled="disabled" id="replenishmentManagementList-refresh">查询</a-button>
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="replenishmentManagementList-reset">重置</a-button>
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="replenishmentManagementList-reset">重置</a-button>
|
|
<a @click="advanced = !advanced" style="margin-left: 5px">
|
|
<a @click="advanced = !advanced" style="margin-left: 5px">
|
|
@@ -47,6 +47,11 @@
|
|
</a-col>
|
|
</a-col>
|
|
</a-row>
|
|
</a-row>
|
|
</a-form>
|
|
</a-form>
|
|
|
|
+ <!-- 操作按钮 -->
|
|
|
|
+ <div class="table-operator">
|
|
|
|
+ <a-button type="primary" class="button-error">待补货产品</a-button>
|
|
|
|
+ <span style="margin-left:10px;color:#999;">请点击此按钮,选择需要补货的产品创建补货单</span>
|
|
|
|
+ </div>
|
|
</div>
|
|
</div>
|
|
<s-table
|
|
<s-table
|
|
class="sTable fixPagination"
|
|
class="sTable fixPagination"
|
|
@@ -76,13 +81,17 @@
|
|
</a-table>
|
|
</a-table>
|
|
<!-- 操作 -->
|
|
<!-- 操作 -->
|
|
<template slot="action" slot-scope="text, record">
|
|
<template slot="action" slot-scope="text, record">
|
|
- <a-button v-if="record.billState=='WAIT_CONFIRM'" size="small" type="link" class="button-primary" @click.stop="handleConfirm(record)">确认</a-button>
|
|
|
|
|
|
+ <!-- <a-button v-if="record.billState=='WAIT_CONFIRM'" size="small" type="link" class="button-primary" @click.stop="handleConfirm(record)">确认</a-button> -->
|
|
<a-button v-if="record.billState=='WAIT_OUT_STOCK'" size="small" type="link" class="button-primary" @click.stop="handleOutWarehousing(record)">出库</a-button>
|
|
<a-button v-if="record.billState=='WAIT_OUT_STOCK'" size="small" type="link" class="button-primary" @click.stop="handleOutWarehousing(record)">出库</a-button>
|
|
<a-button v-if="record.billState=='WAIT_CHECK'" size="small" type="link" class="button-primary" @click.stop="handlePutWarehousing(record)">签收</a-button>
|
|
<a-button v-if="record.billState=='WAIT_CHECK'" size="small" type="link" class="button-primary" @click.stop="handlePutWarehousing(record)">签收</a-button>
|
|
<a-button v-if="record.billState=='WAIT_CONFIRM' || record.billState=='WAIT_OUT_STOCK'" size="small" type="link" class="button-primary" @click.stop="handleCancelOrder(record)">取消补货单</a-button>
|
|
<a-button v-if="record.billState=='WAIT_CONFIRM' || record.billState=='WAIT_OUT_STOCK'" size="small" type="link" class="button-primary" @click.stop="handleCancelOrder(record)">取消补货单</a-button>
|
|
<a-button v-if="record.billState=='CANCEL'" size="small" type="link" class="button-error" @click.stop="handleDelete(record)">删除</a-button>
|
|
<a-button v-if="record.billState=='CANCEL'" size="small" type="link" class="button-error" @click.stop="handleDelete(record)">删除</a-button>
|
|
<a-button v-if="record.billState!='CANCEL'&&record.billState!='WAIT_CONFIRM'" size="small" type="link" class="button-primary" @click.stop="handlePrintSticker(record)">打印贴签</a-button>
|
|
<a-button v-if="record.billState!='CANCEL'&&record.billState!='WAIT_CONFIRM'" size="small" type="link" class="button-primary" @click.stop="handlePrintSticker(record)">打印贴签</a-button>
|
|
</template>
|
|
</template>
|
|
|
|
+ <!-- 补货单号 -->
|
|
|
|
+ <template slot="replenishBillNo" slot-scope="text, record">
|
|
|
|
+ <span class="table-td-link" @click.stop="handleDetail(record)">{{ record.replenishBillNo }}</span>
|
|
|
|
+ </template>
|
|
</s-table>
|
|
</s-table>
|
|
<!-- 确认 -->
|
|
<!-- 确认 -->
|
|
<confirm-modal :openModal="openConfirmModal" :nowData="nowData" @ok="handleValidate" @close="handleCancel" />
|
|
<confirm-modal :openModal="openConfirmModal" :nowData="nowData" @ok="handleValidate" @close="handleCancel" />
|
|
@@ -100,6 +109,8 @@
|
|
<out-warehousing-modal :openModal="openOutWarehousingModal" :nowData="nowData" @ok="handleOutWarehousingOk" @close="handleCancel" />
|
|
<out-warehousing-modal :openModal="openOutWarehousingModal" :nowData="nowData" @ok="handleOutWarehousingOk" @close="handleCancel" />
|
|
<!-- 签收 -->
|
|
<!-- 签收 -->
|
|
<put-warehousing-modal :openModal="openPutWarehousingModal" :nowData="nowData" @ok="handlePutWarehousingOk" @close="handleCancel" />
|
|
<put-warehousing-modal :openModal="openPutWarehousingModal" :nowData="nowData" @ok="handlePutWarehousingOk" @close="handleCancel" />
|
|
|
|
+ <!-- 详情 -->
|
|
|
|
+ <detailModal :openModal="openDetailModal" :nowData="nowData" @close="handleCancel" />
|
|
<!-- 生成补货单 -->
|
|
<!-- 生成补货单 -->
|
|
<creatReplenishmentOrder :openModal="openCreatRoModal" :nowData="nowData" @ok="resetSearchForm" @close="openCreatRoModal=false" />
|
|
<creatReplenishmentOrder :openModal="openCreatRoModal" :nowData="nowData" @ok="resetSearchForm" @close="openCreatRoModal=false" />
|
|
</a-spin>
|
|
</a-spin>
|
|
@@ -118,9 +129,10 @@ import stockModal from './stockModal.vue'
|
|
import printStickerModal from './printStickerModal.vue'
|
|
import printStickerModal from './printStickerModal.vue'
|
|
import outWarehousingModal from './outWarehousingModal.vue'
|
|
import outWarehousingModal from './outWarehousingModal.vue'
|
|
import putWarehousingModal from './putWarehousingModal.vue'
|
|
import putWarehousingModal from './putWarehousingModal.vue'
|
|
|
|
+import detailModal from './detailModal.vue'
|
|
import { shelfReplenishList, shelfReplenishDetailList, shelfReplenishCancel, shelfReplenishStateCount, shelfReplenishDetailStock, shelfReplenishConfirm, shelfReplenishDelete } from '@/api/shelfReplenish'
|
|
import { shelfReplenishList, shelfReplenishDetailList, shelfReplenishCancel, shelfReplenishStateCount, shelfReplenishDetailStock, shelfReplenishConfirm, shelfReplenishDelete } from '@/api/shelfReplenish'
|
|
export default {
|
|
export default {
|
|
- components: { STable, VSelect, rangeDate, shelfSList, confirmModal, creatReplenishmentOrder, stockModal, printStickerModal, outWarehousingModal, putWarehousingModal },
|
|
|
|
|
|
+ components: { STable, VSelect, rangeDate, shelfSList, confirmModal, creatReplenishmentOrder, stockModal, printStickerModal, outWarehousingModal, putWarehousingModal, detailModal },
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
@@ -148,11 +160,10 @@ export default {
|
|
columns: [
|
|
columns: [
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '补货单号', dataIndex: 'replenishBillNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
|
- { title: '货架名称', dataIndex: 'shelfInfo.shelfName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
|
|
+ { title: '补货单号', dataIndex: 'replenishBillNo', scopedSlots: { customRender: 'replenishBillNo' }, width: '15%', align: 'center' },
|
|
|
|
+ { title: '货架名称', dataIndex: 'shelfInfo.shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '状态', dataIndex: 'billStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '状态', dataIndex: 'billStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '补货应发总量', dataIndex: 'totalQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
- { title: '实发总量', dataIndex: 'totalConfirmQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
|
|
+ { title: '补货总量', dataIndex: 'totalConfirmQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '签收总量', dataIndex: 'totalPutQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '签收总量', dataIndex: 'totalPutQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '17%', align: 'left' }
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '17%', align: 'left' }
|
|
],
|
|
],
|
|
@@ -184,17 +195,17 @@ export default {
|
|
},
|
|
},
|
|
subColumns: [
|
|
subColumns: [
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
|
|
|
|
+ { title: '货位号', dataIndex: 'product.code', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '产品编码', dataIndex: 'product.code', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '产品编码', dataIndex: 'product.code', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '产品名称', dataIndex: 'product.name', width: '32%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '产品名称', dataIndex: 'product.name', width: '32%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
- { title: '补货应发总量', dataIndex: 'qty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
- { title: '实发总量', dataIndex: 'confirmQty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
- { title: '签收总量', dataIndex: 'putQty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
|
|
+ { title: '补货数量', dataIndex: 'qty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
|
+ { title: '签收数量', dataIndex: 'putQty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '单位', dataIndex: 'product.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
{ title: '单位', dataIndex: 'product.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
],
|
|
],
|
|
listData: [],
|
|
listData: [],
|
|
tabPaneData: [
|
|
tabPaneData: [
|
|
{ bizName: '全部', bizType: 'ALL', countNum: 0 },
|
|
{ bizName: '全部', bizType: 'ALL', countNum: 0 },
|
|
- { bizName: '待确认', bizType: 'WAIT_CONFIRM', countNum: 0 },
|
|
|
|
|
|
+ // { bizName: '待确认', bizType: 'WAIT_CONFIRM', countNum: 0 },
|
|
{ bizName: '待出库', bizType: 'WAIT_OUT_STOCK', countNum: 0 },
|
|
{ bizName: '待出库', bizType: 'WAIT_OUT_STOCK', countNum: 0 },
|
|
{ bizName: '待签收', bizType: 'WAIT_CHECK', countNum: 0 },
|
|
{ bizName: '待签收', bizType: 'WAIT_CHECK', countNum: 0 },
|
|
{ bizName: '已完成', bizType: 'FINISH', countNum: 0 },
|
|
{ bizName: '已完成', bizType: 'FINISH', countNum: 0 },
|
|
@@ -207,6 +218,7 @@ export default {
|
|
openOutWarehousingModal: false,
|
|
openOutWarehousingModal: false,
|
|
openPutWarehousingModal: false,
|
|
openPutWarehousingModal: false,
|
|
openCreatRoModal: false,
|
|
openCreatRoModal: false,
|
|
|
|
+ openDetailModal: false,
|
|
validateType: 'confirm',
|
|
validateType: 'confirm',
|
|
stockList: [],
|
|
stockList: [],
|
|
paramsData: null
|
|
paramsData: null
|
|
@@ -218,14 +230,10 @@ export default {
|
|
this.nowData = row
|
|
this.nowData = row
|
|
this.openConfirmModal = true
|
|
this.openConfirmModal = true
|
|
},
|
|
},
|
|
- // cancel
|
|
|
|
- handleCancel () {
|
|
|
|
- this.nowData = null
|
|
|
|
- this.openConfirmModal = false
|
|
|
|
- this.openStockModal = false
|
|
|
|
- this.openPrintStickerModal = false
|
|
|
|
- this.openOutWarehousingModal = false
|
|
|
|
- this.openPutWarehousingModal = false
|
|
|
|
|
|
+ // 补货详情
|
|
|
|
+ handleDetail (row) {
|
|
|
|
+ this.nowData = row
|
|
|
|
+ this.openDetailModal = true
|
|
},
|
|
},
|
|
// 库存不足 确认 ok
|
|
// 库存不足 确认 ok
|
|
handleStockOk (type, params) {
|
|
handleStockOk (type, params) {
|
|
@@ -248,9 +256,7 @@ export default {
|
|
this.openPrintStickerModal = true
|
|
this.openPrintStickerModal = true
|
|
},
|
|
},
|
|
// 打印贴签 ok
|
|
// 打印贴签 ok
|
|
- handlePrintStickerOk () {
|
|
|
|
-
|
|
|
|
- },
|
|
|
|
|
|
+ handlePrintStickerOk () {},
|
|
// 出库
|
|
// 出库
|
|
handleOutWarehousing (row) {
|
|
handleOutWarehousing (row) {
|
|
this.nowData = row
|
|
this.nowData = row
|
|
@@ -262,11 +268,21 @@ export default {
|
|
this.openOutWarehousingModal = false
|
|
this.openOutWarehousingModal = false
|
|
this.queryByTypeSum(true)
|
|
this.queryByTypeSum(true)
|
|
},
|
|
},
|
|
|
|
+ // cancel
|
|
|
|
+ handleCancel () {
|
|
|
|
+ this.nowData = null
|
|
|
|
+ this.openConfirmModal = false
|
|
|
|
+ this.openStockModal = false
|
|
|
|
+ this.openPrintStickerModal = false
|
|
|
|
+ this.openOutWarehousingModal = false
|
|
|
|
+ this.openPutWarehousingModal = false
|
|
|
|
+ this.openDetailModal = false
|
|
|
|
+ },
|
|
handleValidate (type, params) {
|
|
handleValidate (type, params) {
|
|
- // this.spinning = true
|
|
|
|
if (type == 'confirm') { // 确认
|
|
if (type == 'confirm') { // 确认
|
|
this.confirmFun(params)
|
|
this.confirmFun(params)
|
|
}
|
|
}
|
|
|
|
+ // this.spinning = true
|
|
// 校验产品库存是否足够
|
|
// 校验产品库存是否足够
|
|
// shelfReplenishDetailStock(params).then(res => {
|
|
// shelfReplenishDetailStock(params).then(res => {
|
|
// if (res.status == 200) {
|
|
// if (res.status == 200) {
|
|
@@ -414,11 +430,11 @@ export default {
|
|
this.spinning = true
|
|
this.spinning = true
|
|
shelfReplenishStateCount(params).then(res => {
|
|
shelfReplenishStateCount(params).then(res => {
|
|
if (res.data && res.status == 200) {
|
|
if (res.data && res.status == 200) {
|
|
- this.tabPaneData[1].countNum = res.data.WAIT_CONFIRM || 0
|
|
|
|
- this.tabPaneData[2].countNum = res.data.WAIT_OUT_STOCK || 0
|
|
|
|
- this.tabPaneData[3].countNum = res.data.WAIT_CHECK || 0
|
|
|
|
- this.tabPaneData[4].countNum = res.data.FINISH || 0
|
|
|
|
- this.tabPaneData[5].countNum = res.data.CANCEL || 0
|
|
|
|
|
|
+ // this.tabPaneData[1].countNum = res.data.WAIT_CONFIRM || 0
|
|
|
|
+ this.tabPaneData[1].countNum = res.data.WAIT_OUT_STOCK || 0
|
|
|
|
+ this.tabPaneData[2].countNum = res.data.WAIT_CHECK || 0
|
|
|
|
+ this.tabPaneData[3].countNum = res.data.FINISH || 0
|
|
|
|
+ this.tabPaneData[4].countNum = res.data.CANCEL || 0
|
|
this.queryParam.bizType = this.curBizType
|
|
this.queryParam.bizType = this.curBizType
|
|
this.$refs.table.refresh(!flag)
|
|
this.$refs.table.refresh(!flag)
|
|
}
|
|
}
|