|
@@ -1,6 +1,6 @@
|
|
<template>
|
|
<template>
|
|
- <a-card size="small" :bordered="false" class="bulkWarehousingOrderList-wrap">
|
|
|
|
- <a-spin :spinning="spinning" tip="Loading...">
|
|
|
|
|
|
+ <div>
|
|
|
|
+ <a-card size="small" :bordered="false" class="searchBox">
|
|
<!-- 搜索条件 -->
|
|
<!-- 搜索条件 -->
|
|
<div ref="tableSearch" class="table-page-search-wrapper">
|
|
<div ref="tableSearch" class="table-page-search-wrapper">
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
<a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
|
|
@@ -25,12 +25,13 @@
|
|
<a-input id="bulkWarehousingOrderList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入商户名称"/>
|
|
<a-input id="bulkWarehousingOrderList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入商户名称"/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
+ <template v-if="advanced">
|
|
<a-col :md="6" :sm="24">
|
|
<a-col :md="6" :sm="24">
|
|
<a-form-item label="金蝶单号">
|
|
<a-form-item label="金蝶单号">
|
|
<a-input id="bulkWarehousingOrderList-kingdeeNo" v-model.trim="queryParam.kingdeeNo" allowClear placeholder="请输入金蝶单号"/>
|
|
<a-input id="bulkWarehousingOrderList-kingdeeNo" v-model.trim="queryParam.kingdeeNo" allowClear placeholder="请输入金蝶单号"/>
|
|
</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.sparePartsType"
|
|
v-model="queryParam.sparePartsType"
|
|
@@ -41,7 +42,7 @@
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="4" :sm="24" v-show="isShowWarehouse">
|
|
|
|
|
|
+ <a-col :md="6" :sm="24" v-show="isShowWarehouse">
|
|
<a-form-item label="入库仓库">
|
|
<a-form-item label="入库仓库">
|
|
<warehouse
|
|
<warehouse
|
|
v-model="queryParam.warehouseSn"
|
|
v-model="queryParam.warehouseSn"
|
|
@@ -51,7 +52,7 @@
|
|
/>
|
|
/>
|
|
</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.state"
|
|
v-model="queryParam.state"
|
|
@@ -63,27 +64,34 @@
|
|
></v-select>
|
|
></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
- <span class="table-page-search-submitButtons">
|
|
|
|
- <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderList-refresh">查询</a-button>
|
|
|
|
- <a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="bulkWarehousingOrderList-reset">重置</a-button>
|
|
|
|
- <a-button
|
|
|
|
- style="margin-left: 10px"
|
|
|
|
- v-if="$hasPermissions('B_sparePartsExport')"
|
|
|
|
- type="primary"
|
|
|
|
- class="button-warning"
|
|
|
|
- @click="handleExport"
|
|
|
|
- :disabled="disabled"
|
|
|
|
- :loading="exportLoading"
|
|
|
|
- >导出明细</a-button>
|
|
|
|
- </span>
|
|
|
|
|
|
+ </template>
|
|
|
|
+ <a-col :md="24" :sm="24" style="text-align: center;">
|
|
|
|
+ <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderList-refresh">查询</a-button>
|
|
|
|
+ <a-button style="margin-left: 10px" @click="resetSearchForm()" :disabled="disabled" id="bulkWarehousingOrderList-reset">重置</a-button>
|
|
|
|
+ <a-button
|
|
|
|
+ style="margin-left: 10px"
|
|
|
|
+ v-if="$hasPermissions('B_sparePartsExport')"
|
|
|
|
+ type="primary"
|
|
|
|
+ class="button-warning"
|
|
|
|
+ @click="handleExport"
|
|
|
|
+ :disabled="disabled"
|
|
|
|
+ :loading="exportLoading"
|
|
|
|
+ >导出明细</a-button>
|
|
|
|
+ <a @click="advanced=!advanced" style="margin-left: 8px">
|
|
|
|
+ {{ advanced ? '收起' : '展开' }}
|
|
|
|
+ <a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
|
+ </a>
|
|
</a-col>
|
|
</a-col>
|
|
</a-row>
|
|
</a-row>
|
|
</a-form>
|
|
</a-form>
|
|
</div>
|
|
</div>
|
|
|
|
+ </a-card>
|
|
|
|
+
|
|
|
|
+ <a-card size="small" :bordered="false" class="bulkWarehousingOrderList-wrap">
|
|
|
|
+ <a-spin :spinning="spinning" tip="Loading...">
|
|
<!-- 操作按钮 -->
|
|
<!-- 操作按钮 -->
|
|
<div class="table-operator">
|
|
<div class="table-operator">
|
|
- <a-button v-if="$hasPermissions('B_sparePartsNew')" id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
|
|
|
|
|
|
+ <a-button v-if="$hasPermissions('B_sparePartsNew')" id="bulkWarehousingOrderList-add" type="primary" @click="handleAdd">新增</a-button>
|
|
<a-button
|
|
<a-button
|
|
v-if="$hasPermissions('B_sparePartsBatchAudit')"
|
|
v-if="$hasPermissions('B_sparePartsBatchAudit')"
|
|
id="bulkWarehousingOrderList-batchAudit"
|
|
id="bulkWarehousingOrderList-batchAudit"
|
|
@@ -91,8 +99,8 @@
|
|
class="button-warning"
|
|
class="button-warning"
|
|
:loading="loading"
|
|
:loading="loading"
|
|
@click="handleBatchAudit"
|
|
@click="handleBatchAudit"
|
|
- style="margin: 0 15px;">批量审核</a-button>
|
|
|
|
- <span style="margin-left: 8px">
|
|
|
|
|
|
+ style="margin: 0 3px;">批量审核</a-button>
|
|
|
|
+ <span style="margin-left: 10px">
|
|
<template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
|
|
<template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
|
|
</span>
|
|
</span>
|
|
</div>
|
|
</div>
|
|
@@ -100,13 +108,14 @@
|
|
<s-table
|
|
<s-table
|
|
class="sTable fixPagination"
|
|
class="sTable fixPagination"
|
|
ref="table"
|
|
ref="table"
|
|
- :style="{ height: tableHeight+84.5+'px' }"
|
|
|
|
|
|
+ :style="{ height: tableHeight+70+'px' }"
|
|
size="small"
|
|
size="small"
|
|
:rowKey="(record) => record.sparePartsSn"
|
|
:rowKey="(record) => record.sparePartsSn"
|
|
rowKeyName="sparePartsSn"
|
|
rowKeyName="sparePartsSn"
|
|
:row-selection="$hasPermissions('B_sparePartsBatchAudit')?{ columnWidth: '4%', getCheckboxProps: record => ({ props: { disabled: record.state != 'WAIT_AUDIT' } }) }:null"
|
|
:row-selection="$hasPermissions('B_sparePartsBatchAudit')?{ columnWidth: '4%', getCheckboxProps: record => ({ props: { disabled: record.state != 'WAIT_AUDIT' } }) }:null"
|
|
@rowSelection="rowSelectionFun"
|
|
@rowSelection="rowSelectionFun"
|
|
:columns="columns"
|
|
:columns="columns"
|
|
|
|
+ :pageSize="30"
|
|
:data="loadData"
|
|
:data="loadData"
|
|
:scroll="{ y: tableHeight }"
|
|
:scroll="{ y: tableHeight }"
|
|
:defaultLoadData="false"
|
|
:defaultLoadData="false"
|
|
@@ -152,6 +161,7 @@
|
|
<auditNoPassModal v-drag ref="auditNoPassModal" :openModal="openAuditNoModal" @close="openAuditNoModal=false" />
|
|
<auditNoPassModal v-drag ref="auditNoPassModal" :openModal="openAuditNoModal" @close="openAuditNoModal=false" />
|
|
<batchAuditNoModal v-drag ref="batchAuditNoModal" :openModal="openBatchAuditNoModal" @close="openBatchAuditNoModal=false" @ok="hanldeAuditOk" />
|
|
<batchAuditNoModal v-drag ref="batchAuditNoModal" :openModal="openBatchAuditNoModal" @close="openBatchAuditNoModal=false" @ok="hanldeAuditOk" />
|
|
</a-card>
|
|
</a-card>
|
|
|
|
+ </div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
@@ -178,6 +188,7 @@ export default {
|
|
exportLoading: false,
|
|
exportLoading: false,
|
|
openAuditNoModal: false,
|
|
openAuditNoModal: false,
|
|
openBatchAuditNoModal: false,
|
|
openBatchAuditNoModal: false,
|
|
|
|
+ advanced: true,
|
|
tableHeight: 0,
|
|
tableHeight: 0,
|
|
// 查询参数
|
|
// 查询参数
|
|
queryParam: {
|
|
queryParam: {
|
|
@@ -218,8 +229,8 @@ export default {
|
|
columns () {
|
|
columns () {
|
|
const arr = [
|
|
const arr = [
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '入库单号', scopedSlots: { customRender: 'sparePartsNo' }, width: '10%', align: 'center' },
|
|
|
|
- { title: '商户名称', dataIndex: 'supplierName', align: 'center', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
|
|
+ { title: '入库单号', scopedSlots: { customRender: 'sparePartsNo' }, width: '8%', align: 'center' },
|
|
|
|
+ { title: '商户名称', dataIndex: 'supplierName', align: 'left', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '入库数量', dataIndex: 'productTotalQty', 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: 'productTotalCost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
// { title: '入库成本', dataIndex: 'productTotalCost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '入库类型', dataIndex: 'sparePartsTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '入库类型', dataIndex: 'sparePartsTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
@@ -235,7 +246,7 @@ export default {
|
|
arr.splice(4, 0, { title: '入库成本', dataIndex: 'productTotalCost', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
arr.splice(4, 0, { title: '入库成本', dataIndex: 'productTotalCost', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
|
|
}
|
|
}
|
|
if (this.isShowWarehouse) {
|
|
if (this.isShowWarehouse) {
|
|
- arr.splice(this.$hasPermissions('M_bulkWarehousingOrderList_costPrice')?6:5, 0, { title: '入库仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
|
|
|
|
|
|
+ arr.splice(this.$hasPermissions('M_bulkWarehousingOrderList_costPrice')?6:5, 0, { title: '入库仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } })
|
|
}
|
|
}
|
|
return arr
|
|
return arr
|
|
}
|
|
}
|
|
@@ -380,10 +391,16 @@ export default {
|
|
},
|
|
},
|
|
setTableH () {
|
|
setTableH () {
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
- this.tableHeight = window.innerHeight - tableSearchH - 240
|
|
|
|
|
|
+ this.tableHeight = window.innerHeight - tableSearchH - 250
|
|
}
|
|
}
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|
|
|
|
+ advanced (newValue, oldValue) {
|
|
|
|
+ const _this = this
|
|
|
|
+ this.$nextTick(() => { // 页面渲染完成后的回调
|
|
|
|
+ _this.setTableH()
|
|
|
|
+ })
|
|
|
|
+ },
|
|
'$store.state.app.winHeight' (newValue, oldValue) { // 窗口变更时,需同时更改表格高度
|
|
'$store.state.app.winHeight' (newValue, oldValue) { // 窗口变更时,需同时更改表格高度
|
|
this.setTableH()
|
|
this.setTableH()
|
|
}
|
|
}
|
|
@@ -411,14 +428,3 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
</script>
|
|
</script>
|
|
-<style lang="less">
|
|
|
|
- .bulkWarehousingOrderList-wrap{
|
|
|
|
- .active{
|
|
|
|
- color: #ed1c24;
|
|
|
|
- cursor: pointer;
|
|
|
|
- }
|
|
|
|
- .common{
|
|
|
|
- color: rgba(0, 0, 0);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-</style>
|
|
|