|
@@ -14,23 +14,32 @@
|
|
|
<!-- 搜索条件 -->
|
|
|
<div ref="tableSearch" class="table-page-search-wrapper">
|
|
|
<a-form layout="inline">
|
|
|
- <a-row :gutter="15">
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
+ <a-row type="flex" :gutter="15">
|
|
|
+ <a-col flex="300px">
|
|
|
<a-form-item label="业务单号">
|
|
|
<a-input v-model.trim="queryParam.outBizSubNo" allowClear placeholder="请输入业务单号"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
+ <a-col flex="300px">
|
|
|
<a-form-item label="客户名称">
|
|
|
<a-input v-model.trim="queryParam.demanderName" allowClear placeholder="请输入客户名称"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
+ <a-col flex="300px">
|
|
|
<a-form-item label="收货客户名称">
|
|
|
<dealerSubareaScopeList ref="dealerSubareaScopeList" defValKey="buyerSn" @change="custChange" v-model="queryParam.receiverSn" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="24">
|
|
|
+ <a-col flex="300px" v-show="isShowWarehouse">
|
|
|
+ <a-form-item label="仓库">
|
|
|
+ <warehouse
|
|
|
+ v-model="queryParam.warehouseSn"
|
|
|
+ isPermission
|
|
|
+ placeholder="请选择仓库"
|
|
|
+ />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col flex="auto">
|
|
|
<span class="table-page-search-submitButtons">
|
|
|
<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>
|
|
@@ -73,12 +82,15 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
+import { commonMixin } from '@/utils/mixin'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import { stockOutList } from '@/api/stockOut'
|
|
|
+import warehouse from '@/views/common/chooseWarehouse.js'
|
|
|
import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
|
|
|
export default {
|
|
|
name: 'SelectGlOrderModal',
|
|
|
- components: { STable, VSelect, dealerSubareaScopeList },
|
|
|
+ mixins: [commonMixin],
|
|
|
+ components: { STable, VSelect, dealerSubareaScopeList, warehouse },
|
|
|
props: {
|
|
|
openModal: { // 弹框显示状态
|
|
|
type: Boolean,
|
|
@@ -105,23 +117,9 @@ export default {
|
|
|
outBizSubNo: '',
|
|
|
demanderName: '',
|
|
|
receiverSn: undefined,
|
|
|
+ warehouseSn: undefined,
|
|
|
outBizTypeList: ['SALES', 'ALLOCATE']
|
|
|
},
|
|
|
- columns: [
|
|
|
- { title: '序号', dataIndex: 'no', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '出库单号', dataIndex: 'stockOutNo', width: '10%', align: 'center' },
|
|
|
- { title: '业务单号', dataIndex: 'outBizSubNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '客户名称', dataIndex: 'demanderName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '收货客户名称', dataIndex: 'receiverName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '产品款数', dataIndex: 'productTotalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '产品数量', dataIndex: 'productTotalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '单据审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '收款状态', dataIndex: 'financialStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '发货状态', dataIndex: 'sendFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
|
|
|
- ],
|
|
|
orginData: [],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
@@ -148,6 +146,28 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
+ columns () {
|
|
|
+ const _this = this
|
|
|
+ const arr = [
|
|
|
+ { title: '序号', dataIndex: 'no', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '出库单号', dataIndex: 'stockOutNo', width: '8%', align: 'center' },
|
|
|
+ { title: '业务单号', dataIndex: 'outBizSubNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '客户名称', dataIndex: 'demanderName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '收货客户名称', dataIndex: 'receiverName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
+ { title: '产品款数', dataIndex: 'productTotalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '产品数量', dataIndex: 'productTotalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '单据审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '收款状态', dataIndex: 'financialStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '发货状态', dataIndex: 'sendFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
|
|
|
+ ]
|
|
|
+ if(this.isShowWarehouse){
|
|
|
+ arr.splice(7,0,{ title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } })
|
|
|
+ }
|
|
|
+ return arr
|
|
|
+ },
|
|
|
totalAmount () {
|
|
|
let ret = 0
|
|
|
this.handlePlData.map(item => {
|
|
@@ -185,6 +205,7 @@ export default {
|
|
|
outBizSubNo: '',
|
|
|
demanderName: '',
|
|
|
receiverSn: undefined,
|
|
|
+ warehouseSn: undefined,
|
|
|
outBizTypeList: ['SALES', 'ALLOCATE']
|
|
|
}
|
|
|
this.orginData = []
|