Skip to content
GitLab
Commit 4a96edb7 authored by 季圣华's avatar 季圣华
Browse files

给入库明细和出库明细接口增加备注的查询功能

parent 6d9b4f5a
Hide whitespace changes
Inline Side-by-side
jshERP-web/src/views/report/AllocationDetail.vue
View file @ 4a96edb7
...@@ -11,34 +11,6 @@ ...@@ -11,34 +11,6 @@
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="3" :sm="24">
<a-form-item label="调出仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
optionFilterProp="children"
:dropdownMatchSelectWidth="false"
showSearch allow-clear style="width: 100%"
placeholder="请选择仓库"
v-model="queryParam.depotIdF">
<a-select-option v-for="(depot,index) in depotList" :value="depot.id">
{{ depot.depotName }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="3" :sm="24">
<a-form-item label="调入仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
optionFilterProp="children"
:dropdownMatchSelectWidth="false"
showSearch allow-clear style="width: 100%"
placeholder="请选择仓库"
v-model="queryParam.depotId">
<a-select-option v-for="(depot,index) in depotList" :value="depot.id">
{{ depot.depotName }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="4" :sm="24"> <a-col :md="4" :sm="24">
<a-form-item label="单据编号" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="单据编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input> <a-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input>
...@@ -49,10 +21,10 @@ ...@@ -49,10 +21,10 @@
<a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input> <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="5" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-range-picker <a-range-picker
style="width: 210px" style="width: 100%"
v-model="queryParam.createTimeRange" v-model="queryParam.createTimeRange"
:default-value="defaultTimeStr" :default-value="defaultTimeStr"
format="YYYY-MM-DD" format="YYYY-MM-DD"
...@@ -61,11 +33,50 @@ ...@@ -61,11 +33,50 @@
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="24">
<a-form-item label="调出仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
optionFilterProp="children"
:dropdownMatchSelectWidth="false"
showSearch allow-clear style="width: 100%"
placeholder="请选择仓库"
v-model="queryParam.depotIdF">
<a-select-option v-for="(depot,index) in depotList" :value="depot.id">
{{ depot.depotName }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :md="4" :sm="24">
<a-form-item label="调入仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
optionFilterProp="children"
:dropdownMatchSelectWidth="false"
showSearch allow-clear style="width: 100%"
placeholder="请选择仓库"
v-model="queryParam.depotId">
<a-select-option v-for="(depot,index) in depotList" :value="depot.id">
{{ depot.depotName }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="4" :sm="24">
<a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入备注" v-model="queryParam.remark"></a-input>
</a-form-item>
</a-col>
</template>
<a-col :md="4" :sm="24" > <a-col :md="4" :sm="24" >
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery">查询</a-button> <a-button type="primary" @click="searchQuery">查询</a-button>
<a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button> <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
<a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button> <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span> </span>
</a-col> </a-col>
</a-row> </a-row>
...@@ -146,7 +157,8 @@ ...@@ -146,7 +157,8 @@
depotIdF: '', depotIdF: '',
beginTime: getNowFormatMonth() + '-01', beginTime: getNowFormatMonth() + '-01',
endTime: moment().format('YYYY-MM-DD'), endTime: moment().format('YYYY-MM-DD'),
subType: "调拨" subType: "调拨",
remark: ''
}, },
ipagination:{ ipagination:{
pageSize: 11, pageSize: 11,
......
jshERP-web/src/views/report/InDetail.vue
View file @ 4a96edb7
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="3" :sm="24"> <a-col :md="4" :sm="24">
<a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="选择供应商" v-model="queryParam.organId" <a-select placeholder="选择供应商" v-model="queryParam.organId"
:dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children"> :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
...@@ -17,20 +17,6 @@ ...@@ -17,20 +17,6 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="3" :sm="24">
<a-form-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
optionFilterProp="children"
:dropdownMatchSelectWidth="false"
showSearch allow-clear style="width: 100%"
placeholder="请选择仓库"
v-model="queryParam.depotId">
<a-select-option v-for="(depot,index) in depotList" :value="depot.id">
{{ depot.depotName }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="4" :sm="24"> <a-col :md="4" :sm="24">
<a-form-item label="单据编号" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="单据编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input> <a-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input>
...@@ -41,10 +27,10 @@ ...@@ -41,10 +27,10 @@
<a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input> <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="5" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-range-picker <a-range-picker
style="width: 210px" style="width: 100%"
v-model="queryParam.createTimeRange" v-model="queryParam.createTimeRange"
:default-value="defaultTimeStr" :default-value="defaultTimeStr"
format="YYYY-MM-DD" format="YYYY-MM-DD"
...@@ -53,11 +39,36 @@ ...@@ -53,11 +39,36 @@
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
<template v-if="toggleSearchStatus">
<a-col :md="4" :sm="24">
<a-form-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
optionFilterProp="children"
:dropdownMatchSelectWidth="false"
showSearch allow-clear style="width: 100%"
placeholder="请选择仓库"
v-model="queryParam.depotId">
<a-select-option v-for="(depot,index) in depotList" :value="depot.id">
{{ depot.depotName }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="4" :sm="24">
<a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入备注" v-model="queryParam.remark"></a-input>
</a-form-item>
</a-col>
</template>
<a-col :md="4" :sm="24" > <a-col :md="4" :sm="24" >
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery">查询</a-button> <a-button type="primary" @click="searchQuery">查询</a-button>
<a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button> <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
<a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button> <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span> </span>
</a-col> </a-col>
</a-row> </a-row>
...@@ -137,7 +148,8 @@ ...@@ -137,7 +148,8 @@
depotId: '', depotId: '',
beginTime: getNowFormatMonth() + '-01', beginTime: getNowFormatMonth() + '-01',
endTime: moment().format('YYYY-MM-DD'), endTime: moment().format('YYYY-MM-DD'),
type: "入库" type: "入库",
remark: ''
}, },
ipagination:{ ipagination:{
pageSize: 11, pageSize: 11,
......
jshERP-web/src/views/report/OutDetail.vue
View file @ 4a96edb7
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="3" :sm="24"> <a-col :md="4" :sm="24">
<a-form-item label="客户" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="客户" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="选择客户" v-model="queryParam.organId" <a-select placeholder="选择客户" v-model="queryParam.organId"
:dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children"> :dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
...@@ -17,20 +17,6 @@ ...@@ -17,20 +17,6 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="3" :sm="24">
<a-form-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
optionFilterProp="children"
:dropdownMatchSelectWidth="false"
showSearch allow-clear style="width: 100%"
placeholder="请选择仓库"
v-model="queryParam.depotId">
<a-select-option v-for="(depot,index) in depotList" :value="depot.id">
{{ depot.depotName }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="4" :sm="24"> <a-col :md="4" :sm="24">
<a-form-item label="单据编号" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="单据编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input> <a-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input>
...@@ -41,10 +27,10 @@ ...@@ -41,10 +27,10 @@
<a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input> <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="5" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-range-picker <a-range-picker
style="width: 210px" style="width: 100%"
v-model="queryParam.createTimeRange" v-model="queryParam.createTimeRange"
:default-value="defaultTimeStr" :default-value="defaultTimeStr"
format="YYYY-MM-DD" format="YYYY-MM-DD"
...@@ -53,11 +39,36 @@ ...@@ -53,11 +39,36 @@
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
<template v-if="toggleSearchStatus">
<a-col :md="4" :sm="24">
<a-form-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
optionFilterProp="children"
:dropdownMatchSelectWidth="false"
showSearch allow-clear style="width: 100%"
placeholder="请选择仓库"
v-model="queryParam.depotId">
<a-select-option v-for="(depot,index) in depotList" :value="depot.id">
{{ depot.depotName }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="4" :sm="24">
<a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入备注" v-model="queryParam.remark"></a-input>
</a-form-item>
</a-col>
</template>
<a-col :md="4" :sm="24" > <a-col :md="4" :sm="24" >
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery">查询</a-button> <a-button type="primary" @click="searchQuery">查询</a-button>
<a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button> <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
<a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button> <a-button style="margin-left: 8px" @click="exportExcel" icon="download">导出</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span> </span>
</a-col> </a-col>
</a-row> </a-row>
...@@ -137,7 +148,8 @@ ...@@ -137,7 +148,8 @@
depotId: '', depotId: '',
beginTime: getNowFormatMonth() + '-01', beginTime: getNowFormatMonth() + '-01',
endTime: moment().format('YYYY-MM-DD'), endTime: moment().format('YYYY-MM-DD'),
type: "出库" type: "出库",
remark: ''
}, },
ipagination:{ ipagination:{
pageSize: 11, pageSize: 11,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment