|
@@ -20,7 +20,7 @@
|
|
<a-descriptions-item label="签收时间">{{ detailData&&detailData.putStockTime || '--' }}</a-descriptions-item>
|
|
<a-descriptions-item label="签收时间">{{ detailData&&detailData.putStockTime || '--' }}</a-descriptions-item>
|
|
<a-descriptions-item label="出库备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
|
|
<a-descriptions-item label="出库备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
|
|
<a-descriptions-item label="关联销售单" :span="3" v-if="detailData.billState=='WAIT_CHECK' || detailData.billState=='WAIT_OUT_STOCK' || detailData.billState=='FINISH'">
|
|
<a-descriptions-item label="关联销售单" :span="3" v-if="detailData.billState=='WAIT_CHECK' || detailData.billState=='WAIT_OUT_STOCK' || detailData.billState=='FINISH'">
|
|
- <a-button type="link" class="button-info" v-for="item in salesOrderList" :key="item.id">{{ item.orderNo }};</a-button>
|
|
|
|
|
|
+ <a style="margin-right:10px;color:#00aaff;" v-for="item in salesOrderList" :key="item.id" @click="viewSales(item)">{{ item.salesBillNo }};</a>
|
|
<a-button type="primary" class="button-info" @click="showPlModal=true">生成销售单</a-button>
|
|
<a-button type="primary" class="button-info" @click="showPlModal=true">生成销售单</a-button>
|
|
</a-descriptions-item>
|
|
</a-descriptions-item>
|
|
</a-descriptions>
|
|
</a-descriptions>
|
|
@@ -47,15 +47,20 @@
|
|
<!-- 生成销售单 -->
|
|
<!-- 生成销售单 -->
|
|
<commonModal modalTit="" :openModal="showPlModal" @close="showPlModal=false" @ok="createSales">
|
|
<commonModal modalTit="" :openModal="showPlModal" @close="showPlModal=false" @ok="createSales">
|
|
<div style="display: flex;justify-content: center;margin-bottom: 15px;">
|
|
<div style="display: flex;justify-content: center;margin-bottom: 15px;">
|
|
- <div style="padding:5px 20px;">产品款数:<span style="color:red;">9</span></div>
|
|
|
|
- <div style="padding:5px 20px;">产品总件数:<span style="color:red;">12</span></div>
|
|
|
|
|
|
+ <div style="padding:5px 20px;">产品款数:<span style="color:red;">{{ listData&&listData.length }}</span></div>
|
|
|
|
+ <div style="padding:5px 20px;">产品总件数:<span style="color:red;">{{ totalNums }}</span></div>
|
|
</div>
|
|
</div>
|
|
<div style="text-align: center;" v-if="salesOrderList.length">
|
|
<div style="text-align: center;" v-if="salesOrderList.length">
|
|
<div style="margin-bottom: 5px;font-size: 14px;">此补货单已经存在对应的销售单</div>
|
|
<div style="margin-bottom: 5px;font-size: 14px;">此补货单已经存在对应的销售单</div>
|
|
<div style="margin-bottom: 15px;font-size: 14px;"><strong>确认再次生成销售单吗?</strong></div>
|
|
<div style="margin-bottom: 15px;font-size: 14px;"><strong>确认再次生成销售单吗?</strong></div>
|
|
<div style="line-height: 24px;">
|
|
<div style="line-height: 24px;">
|
|
- <div style="padding:5px;border-bottom: 1px solid #eee;color:#00aaff;display: flex;justify-content: space-between;align-items: center;" v-for="item in salesOrderList" :key="item.id">
|
|
|
|
- <div class="flex-grow:1;padding:0 5px;">{{ item.orderNo }};</div>
|
|
|
|
|
|
+ <div
|
|
|
|
+ style="padding:5px;border-bottom: 1px solid #eee;color:#00aaff;cursor: pointer;display: flex;justify-content: space-between;align-items: center;"
|
|
|
|
+ v-for="item in salesOrderList"
|
|
|
|
+ :key="item.id"
|
|
|
|
+ @click="viewSales(item)"
|
|
|
|
+ >
|
|
|
|
+ <div class="flex-grow:1;padding:0 5px;">{{ item.salesBillNo }};</div>
|
|
<div class="padding:0 5px;"><a-icon type="right" style="color:#00aaff;" /></div>
|
|
<div class="padding:0 5px;"><a-icon type="right" style="color:#00aaff;" /></div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -64,6 +69,21 @@
|
|
<div style="margin-bottom: 15px;font-size: 14px;"><strong>确认生成销售单吗?</strong></div>
|
|
<div style="margin-bottom: 15px;font-size: 14px;"><strong>确认生成销售单吗?</strong></div>
|
|
</div>
|
|
</div>
|
|
</commonModal>
|
|
</commonModal>
|
|
|
|
+ <!-- 销售单详情 -->
|
|
|
|
+ <a-modal
|
|
|
|
+ centered
|
|
|
|
+ class="outboundOrderDetail-modal"
|
|
|
|
+ :footer="null"
|
|
|
|
+ :maskClosable="false"
|
|
|
|
+ :bodyStyle="{padding:'12px'}"
|
|
|
|
+ title="销售单详情"
|
|
|
|
+ v-model="openDetailModal"
|
|
|
|
+ @cancel="openDetailModal=false"
|
|
|
|
+ width="80%">
|
|
|
|
+ <div style="max-height: 700px;overflow-y: auto;">
|
|
|
|
+ <salesDetailModal :outBizSn="orderSn" />
|
|
|
|
+ </div>
|
|
|
|
+ </a-modal>
|
|
</a-modal>
|
|
</a-modal>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -71,10 +91,11 @@
|
|
import { commonMixin } from '@/utils/mixin'
|
|
import { commonMixin } from '@/utils/mixin'
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
|
|
+import salesDetailModal from '@/views/salesManagement/salesQuery/detail.vue'
|
|
import { shelfReplenishDetailList, shelfReplenishDetail, queryRelationSalesBill, createSalesBill } from '@/api/shelfReplenish'
|
|
import { shelfReplenishDetailList, shelfReplenishDetail, queryRelationSalesBill, createSalesBill } from '@/api/shelfReplenish'
|
|
export default {
|
|
export default {
|
|
name: 'DetailModal',
|
|
name: 'DetailModal',
|
|
- components: { STable, VSelect, commonModal },
|
|
|
|
|
|
+ components: { STable, VSelect, commonModal, salesDetailModal },
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
props: {
|
|
props: {
|
|
openModal: { // 弹框显示状态
|
|
openModal: { // 弹框显示状态
|
|
@@ -94,6 +115,9 @@ export default {
|
|
spinning: false,
|
|
spinning: false,
|
|
disabled: false,
|
|
disabled: false,
|
|
showPlModal: false,
|
|
showPlModal: false,
|
|
|
|
+ openDetailModal: false,
|
|
|
|
+ orderSn: null,
|
|
|
|
+ listData: [],
|
|
// 表头
|
|
// 表头
|
|
columns: [
|
|
columns: [
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
@@ -130,6 +154,13 @@ export default {
|
|
modalTit () {
|
|
modalTit () {
|
|
const hjName = this.nowData && this.nowData.shelfInfo.shelfName ? this.nowData.shelfInfo.shelfName : ''
|
|
const hjName = this.nowData && this.nowData.shelfInfo.shelfName ? this.nowData.shelfInfo.shelfName : ''
|
|
return '补货单详情 —— ' + hjName
|
|
return '补货单详情 —— ' + hjName
|
|
|
|
+ },
|
|
|
|
+ totalNums () {
|
|
|
|
+ let ret = 0
|
|
|
|
+ this.listData.map(item => {
|
|
|
|
+ ret = ret + item.putQty
|
|
|
|
+ })
|
|
|
|
+ return ret
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
@@ -156,6 +187,7 @@ export default {
|
|
// 生成销售单
|
|
// 生成销售单
|
|
createSales () {
|
|
createSales () {
|
|
this.spinning = true
|
|
this.spinning = true
|
|
|
|
+ this.showPlModal = false
|
|
createSalesBill({ replenishBillSn: this.nowData.replenishBillSn }).then(res => {
|
|
createSalesBill({ replenishBillSn: this.nowData.replenishBillSn }).then(res => {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
this.$message.info(res.message)
|
|
this.$message.info(res.message)
|
|
@@ -164,6 +196,11 @@ export default {
|
|
this.spinning = false
|
|
this.spinning = false
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
+ // 查看销售单详情
|
|
|
|
+ viewSales (item) {
|
|
|
|
+ this.orderSn = item.salesBillSn
|
|
|
|
+ this.openDetailModal = true
|
|
|
|
+ },
|
|
pageInit () {
|
|
pageInit () {
|
|
const vm = this
|
|
const vm = this
|
|
vm.$nextTick(() => {
|
|
vm.$nextTick(() => {
|