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

给出入库明细等增加单据号

parent bf981ed7
Hide whitespace changes
Inline Side-by-side
jshERP-web/src/views/report/AllocationDetail.vue
View file @ e4d2a5b7
...@@ -11,10 +11,11 @@ ...@@ -11,10 +11,11 @@
<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="4" :sm="24"> <a-col :md="3" :sm="24">
<a-form-item label="调出仓库" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="调出仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select <a-select
optionFilterProp="children" optionFilterProp="children"
:dropdownMatchSelectWidth="false"
showSearch allow-clear style="width: 100%" showSearch allow-clear style="width: 100%"
placeholder="请选择仓库" placeholder="请选择仓库"
v-model="queryParam.depotIdF"> v-model="queryParam.depotIdF">
...@@ -24,10 +25,11 @@ ...@@ -24,10 +25,11 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="24"> <a-col :md="3" :sm="24">
<a-form-item label="调入仓库" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="调入仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select <a-select
optionFilterProp="children" optionFilterProp="children"
:dropdownMatchSelectWidth="false"
showSearch allow-clear style="width: 100%" showSearch allow-clear style="width: 100%"
placeholder="请选择仓库" placeholder="请选择仓库"
v-model="queryParam.depotId"> v-model="queryParam.depotId">
...@@ -37,6 +39,11 @@ ...@@ -37,6 +39,11 @@
</a-select> </a-select>
</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-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input>
</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.materialParam"></a-input> <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
...@@ -133,6 +140,7 @@ ...@@ -133,6 +140,7 @@
// 查询条件 // 查询条件
queryParam: { queryParam: {
organId: '', organId: '',
number: '',
materialParam:'', materialParam:'',
depotId: '', depotId: '',
depotIdF: '', depotIdF: '',
...@@ -162,11 +170,11 @@ ...@@ -162,11 +170,11 @@
title: '单据编号', dataIndex: 'number', width: 100, title: '单据编号', dataIndex: 'number', width: 100,
scopedSlots: { customRender: 'numberCustomRender' }, scopedSlots: { customRender: 'numberCustomRender' },
}, },
{title: '条码', dataIndex: 'barCode', width: 100}, {title: '条码', dataIndex: 'barCode', width: 80},
{title: '名称', dataIndex: 'mname', width: 120}, {title: '名称', dataIndex: 'mname', width: 120},
{title: '规格', dataIndex: 'standard', width: 50}, {title: '规格', dataIndex: 'standard', width: 60},
{title: '型号', dataIndex: 'model', width: 50}, {title: '型号', dataIndex: 'model', width: 60},
{title: '单位', dataIndex: 'mUnit', width: 50}, {title: '单位', dataIndex: 'mUnit', width: 60},
{title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, {title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60},
{title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60}, {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60},
{title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60}, {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60},
......
jshERP-web/src/views/report/InDetail.vue
View file @ e4d2a5b7
...@@ -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="4" :sm="24"> <a-col :md="3" :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,10 +17,11 @@ ...@@ -17,10 +17,11 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="24"> <a-col :md="3" :sm="24">
<a-form-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select <a-select
optionFilterProp="children" optionFilterProp="children"
:dropdownMatchSelectWidth="false"
showSearch allow-clear style="width: 100%" showSearch allow-clear style="width: 100%"
placeholder="请选择仓库" placeholder="请选择仓库"
v-model="queryParam.depotId"> v-model="queryParam.depotId">
...@@ -30,6 +31,11 @@ ...@@ -30,6 +31,11 @@
</a-select> </a-select>
</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-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input>
</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.materialParam"></a-input> <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
...@@ -126,6 +132,7 @@ ...@@ -126,6 +132,7 @@
// 查询条件 // 查询条件
queryParam: { queryParam: {
organId: '', organId: '',
number: '',
materialParam:'', materialParam:'',
depotId: '', depotId: '',
beginTime: getNowFormatMonth() + '-01', beginTime: getNowFormatMonth() + '-01',
...@@ -154,11 +161,11 @@ ...@@ -154,11 +161,11 @@
title: '单据编号', dataIndex: 'number', width: 100, title: '单据编号', dataIndex: 'number', width: 100,
scopedSlots: { customRender: 'numberCustomRender' }, scopedSlots: { customRender: 'numberCustomRender' },
}, },
{title: '条码', dataIndex: 'barCode', width: 100}, {title: '条码', dataIndex: 'barCode', width: 80},
{title: '名称', dataIndex: 'mname', width: 120}, {title: '名称', dataIndex: 'mname', width: 120},
{title: '规格', dataIndex: 'standard', width: 50}, {title: '规格', dataIndex: 'standard', width: 60},
{title: '型号', dataIndex: 'model', width: 50}, {title: '型号', dataIndex: 'model', width: 60},
{title: '单位', dataIndex: 'mUnit', width: 50}, {title: '单位', dataIndex: 'mUnit', width: 60},
{title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, {title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60},
{title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60}, {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60},
{title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60}, {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60},
......
jshERP-web/src/views/report/OutDetail.vue
View file @ e4d2a5b7
...@@ -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="4" :sm="24"> <a-col :md="3" :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,10 +17,11 @@ ...@@ -17,10 +17,11 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="24"> <a-col :md="3" :sm="24">
<a-form-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select <a-select
optionFilterProp="children" optionFilterProp="children"
:dropdownMatchSelectWidth="false"
showSearch allow-clear style="width: 100%" showSearch allow-clear style="width: 100%"
placeholder="请选择仓库" placeholder="请选择仓库"
v-model="queryParam.depotId"> v-model="queryParam.depotId">
...@@ -30,6 +31,11 @@ ...@@ -30,6 +31,11 @@
</a-select> </a-select>
</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-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input>
</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.materialParam"></a-input> <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
...@@ -126,6 +132,7 @@ ...@@ -126,6 +132,7 @@
// 查询条件 // 查询条件
queryParam: { queryParam: {
organId: '', organId: '',
number: '',
materialParam:'', materialParam:'',
depotId: '', depotId: '',
beginTime: getNowFormatMonth() + '-01', beginTime: getNowFormatMonth() + '-01',
...@@ -154,11 +161,11 @@ ...@@ -154,11 +161,11 @@
title: '单据编号', dataIndex: 'number', width: 100, title: '单据编号', dataIndex: 'number', width: 100,
scopedSlots: { customRender: 'numberCustomRender' }, scopedSlots: { customRender: 'numberCustomRender' },
}, },
{title: '条码', dataIndex: 'barCode', width: 100}, {title: '条码', dataIndex: 'barCode', width: 80},
{title: '名称', dataIndex: 'mname', width: 120}, {title: '名称', dataIndex: 'mname', width: 120},
{title: '规格', dataIndex: 'standard', width: 50}, {title: '规格', dataIndex: 'standard', width: 60},
{title: '型号', dataIndex: 'model', width: 50}, {title: '型号', dataIndex: 'model', width: 60},
{title: '单位', dataIndex: 'mUnit', width: 50}, {title: '单位', dataIndex: 'mUnit', width: 60},
{title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, {title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60},
{title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, {title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.operNumber - b.operNumber, width: 60},
{title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.operNumber - b.operNumber, width: 60}, {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.operNumber - b.operNumber, width: 60},
......
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