|
@@ -21,18 +21,18 @@
|
|
<a-input id="matchSoo-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
|
|
<a-input id="matchSoo-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-item label="备货单号">
|
|
|
|
+ <a-input id="matchSoo-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
<template v-if="advanced">
|
|
<template v-if="advanced">
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <a-form-item label="备货单号">
|
|
|
|
- <a-input id="matchSoo-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
|
|
|
|
- </a-form-item>
|
|
|
|
- </a-col>
|
|
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
<a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
<dealerSubareaScopeList ref="shbuyerName" id="matchSoo-shbuyerName" @change="shcustChange" />
|
|
<dealerSubareaScopeList ref="shbuyerName" id="matchSoo-shbuyerName" @change="shcustChange" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-item label="业务状态">
|
|
<a-form-item label="业务状态">
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.billStatus"
|
|
v-model="queryParam.billStatus"
|
|
@@ -43,7 +43,7 @@
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-item label="单据状态">
|
|
<a-form-item label="单据状态">
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.voidFlag"
|
|
v-model="queryParam.voidFlag"
|
|
@@ -54,7 +54,7 @@
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-item label="对单状态">
|
|
<a-form-item label="对单状态">
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.checkStatus"
|
|
v-model="queryParam.checkStatus"
|
|
@@ -70,26 +70,31 @@
|
|
<rangeDate ref="checkDate" :value="checktime" @change="checkDateChange" />
|
|
<rangeDate ref="checkDate" :value="checktime" @change="checkDateChange" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-model-item label="所在区域">
|
|
<a-form-model-item label="所在区域">
|
|
<subarea id="matchSoo-subarea" ref="subarea" @change="subareaChange"></subarea>
|
|
<subarea id="matchSoo-subarea" ref="subarea" @change="subareaChange"></subarea>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="4" :sm="24">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
<a-form-model-item label="地区" prop="shippingAddrProvinceSn">
|
|
<a-form-model-item label="地区" prop="shippingAddrProvinceSn">
|
|
<Area id="matchSoo-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
|
|
<Area id="matchSoo-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
+ <a-col :md="6" :sm="24">
|
|
|
|
+ <a-form-model-item label="出库仓库">
|
|
|
|
+ <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
|
|
|
|
+ </a-form-model-item>
|
|
|
|
+ </a-col>
|
|
</template>
|
|
</template>
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <span class="table-page-search-submitButtons">
|
|
|
|
|
|
+ <a-col :md="24" :sm="24">
|
|
|
|
+ <div class="table-page-search-submitButtons" style="text-align:center;">
|
|
<a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
|
|
<a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
|
|
<a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
|
|
<a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
|
|
<a @click="advanced=!advanced" style="margin-left: 8px">
|
|
<a @click="advanced=!advanced" style="margin-left: 8px">
|
|
{{ advanced ? '收起' : '展开' }}
|
|
{{ advanced ? '收起' : '展开' }}
|
|
<a-icon :type="advanced ? 'up' : 'down'"/>
|
|
<a-icon :type="advanced ? 'up' : 'down'"/>
|
|
</a>
|
|
</a>
|
|
- </span>
|
|
|
|
|
|
+ </div>
|
|
</a-col>
|
|
</a-col>
|
|
</a-row>
|
|
</a-row>
|
|
</a-form>
|
|
</a-form>
|
|
@@ -154,11 +159,12 @@ import Area from '@/views/common/area.js'
|
|
import { dispatchlList, dispatchCheck } from '@/api/dispatch'
|
|
import { dispatchlList, dispatchCheck } from '@/api/dispatch'
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
import commonModal from '@/views/common/commonModal.vue'
|
|
import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
|
|
import salesDetail from '@/views/salesManagement/salesQuery/detail.vue'
|
|
|
|
+import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
|
|
import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
|
|
export default {
|
|
export default {
|
|
name: 'MatchSendOutOrderList',
|
|
name: 'MatchSendOutOrderList',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
- components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, Area, commonModal, salesDetail, dispatchDetail },
|
|
|
|
|
|
+ components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, Area, commonModal, salesDetail, dispatchDetail, chooseWarehouse },
|
|
data () {
|
|
data () {
|
|
return {
|
|
return {
|
|
spinning: false,
|
|
spinning: false,
|
|
@@ -181,7 +187,7 @@ export default {
|
|
salesBillNo: '', // 销售单号
|
|
salesBillNo: '', // 销售单号
|
|
dispatchBillNo: '', // 备货单号
|
|
dispatchBillNo: '', // 备货单号
|
|
billStatus: undefined, // 业务状态
|
|
billStatus: undefined, // 业务状态
|
|
- subareaArea:{
|
|
|
|
|
|
+ subareaArea: {
|
|
subareaSn: undefined,
|
|
subareaSn: undefined,
|
|
subareaAreaSn: undefined
|
|
subareaAreaSn: undefined
|
|
},
|
|
},
|
|
@@ -218,6 +224,7 @@ export default {
|
|
{ title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '10%', align: 'center' },
|
|
{ title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '10%', align: 'center' },
|
|
{ title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center' },
|
|
{ title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center' },
|
|
{ title: '客户名称', dataIndex: 'buyerName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '客户名称', dataIndex: 'buyerName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
+ { title: '出库仓库', dataIndex: 'warehouse', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '收货客户名称', dataIndex: 'receiverName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '收货客户名称', dataIndex: 'receiverName', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '产品款数', dataIndex: 'totalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '产品款数', dataIndex: 'totalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '产品数量', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '产品数量', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
@@ -250,6 +257,10 @@ export default {
|
|
},
|
|
},
|
|
shcustChange (val) {
|
|
shcustChange (val) {
|
|
this.queryParam.receiverSn = val.key
|
|
this.queryParam.receiverSn = val.key
|
|
|
|
+ },
|
|
|
|
+ // 选择出库仓库
|
|
|
|
+ handleWarehouse (val) {
|
|
|
|
+
|
|
},
|
|
},
|
|
// 详情
|
|
// 详情
|
|
handleDetail (row, type) {
|
|
handleDetail (row, type) {
|
|
@@ -283,7 +294,7 @@ export default {
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- subareaChange(val){
|
|
|
|
|
|
+ subareaChange (val) {
|
|
this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
|
|
this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
|
|
this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
|
|
this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
|
|
},
|
|
},
|
|
@@ -305,7 +316,7 @@ export default {
|
|
salesBillNo: '', // 销售单号
|
|
salesBillNo: '', // 销售单号
|
|
dispatchBillNo: '', // 备货单号
|
|
dispatchBillNo: '', // 备货单号
|
|
billStatus: undefined, // 业务状态
|
|
billStatus: undefined, // 业务状态
|
|
- subareaArea:{
|
|
|
|
|
|
+ subareaArea: {
|
|
subareaSn: undefined,
|
|
subareaSn: undefined,
|
|
subareaAreaSn: undefined
|
|
subareaAreaSn: undefined
|
|
},
|
|
},
|
|
@@ -313,7 +324,7 @@ export default {
|
|
shippingAddrProvinceSn: undefined,
|
|
shippingAddrProvinceSn: undefined,
|
|
checkStatus: undefined
|
|
checkStatus: undefined
|
|
}
|
|
}
|
|
- if(this.advanced){
|
|
|
|
|
|
+ if (this.advanced) {
|
|
this.$refs.subarea.clearData()
|
|
this.$refs.subarea.clearData()
|
|
}
|
|
}
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|