root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:出入库报表相关修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-09-19 08:43:19 +08:00
parent 4394288ff5
commit 40f7c722de
26 changed files with 385 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
View File

@@ -192,6 +192,9 @@
<el-table-column prop="warehousing_qty" label="待入数" :formatter="rounding" />
<el-table-column prop="unit_name" label="计量单位" />
<el-table-column prop="instorage_time" label="入库时间" min-width="150" />
<el-table-column prop="paper_type" label="管件类型" min-width="150" />
<el-table-column prop="paper_code" label="管件编码" min-width="150" />
<el-table-column prop="paper_name" label="管件描述" min-width="250" />
</el-table>
<!--分页组件-->
<pagination />

4
lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
View File

@@ -348,10 +348,10 @@ export default {
this.crud.notify('移入仓库不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (this.form.out_stor_id === this.form.stor_id) {
/*if (this.form.out_stor_id === this.form.stor_id) {
this.crud.notify('移出仓库和移入仓库不能一致！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
}*/
}
},
[CRUD.HOOK.afterToEdit]() {

38
lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue
View File

@@ -49,6 +49,42 @@
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-input
v-model="query.width_standard"
clearable
size="mini"
placeholder="幅宽"
style="width: 250px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-input
v-model="query.thickness_request"
clearable
size="mini"
placeholder="厚度"
style="width: 250px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-input
v-model="query.customer_name"
clearable
size="mini"
placeholder="客户"
style="width: 250px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-input
v-model="query.struct_code"
clearable
size="mini"
placeholder="仓位"
style="width: 250px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<rrOperation />
</div>
</div>
@@ -62,7 +98,7 @@
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="instorage_time" label="入库日期" :min-width="flexWidth('instorage_time',crud.data,'入库日期')" />
<el-table-column sortable prop="instorage_time" label="入库日期" :min-width="flexWidth('instorage_time',crud.data,'入库日期')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<el-table-column prop="struct_name" label="仓位" :min-width="flexWidth('struct_name',crud.data,'仓位')" />

110
lms/nladmin-ui/src/views/wms/st/outbill/MoneyDialog.vue
View File

@@ -13,17 +13,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="收货单位:">
<el-input v-model="formMst.consignee" size="mini" style="width: 210px" />
<el-input v-model="formMst.consignee" size="mini" style="width: 210px"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收货人:">
<el-input v-model="formMst.receiver" size="mini" style="width: 210px" />
<el-input v-model="formMst.receiver" size="mini" style="width: 210px"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收货地址:">
<el-input v-model="formMst.receiptaddress" size="mini" style="width: 210px" />
<el-input v-model="formMst.receiptaddress" size="mini" style="width: 210px"/>
</el-form-item>
</el-col>
</el-row>
@@ -31,61 +31,44 @@
<el-row>
<el-col :span="8">
<el-form-item label="收货人联系电话:">
<el-input v-model="formMst.receiptphone" size="mini" style="width: 210px" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物流公司:">
<el-input v-model="formMst.logisticscompany" size="mini" style="width: 210px" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="司机:">
<el-input v-model="formMst.drivername" size="mini" style="width: 210px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="车牌号:">
<el-input v-model="formMst.carno" size="mini" style="width: 210px" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="司机联系电话:">
<el-input v-model="formMst.driverphone" size="mini" style="width: 210px" />
<el-input v-model="formMst.receiptphone" size="mini" style="width: 210px"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="合同号:">
<el-input v-model="formMst.contractno" size="mini" style="width: 210px" />
<el-input v-model="formMst.contractno" size="mini" style="width: 210px"/>
</el-form-item>
<!-- <el-form-item label="物流公司:">
<el-input v-model="formMst.logisticscompany" size="mini" style="width: 210px"/>
</el-form-item>-->
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="送货单位:">
<el-input v-model="formMst.deliveryunit" size="mini" style="width: 210px" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="送货方地址:">
<el-input v-model="formMst.deliveryaddress" size="mini" style="width: 210px" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="送货方联系人:">
<el-input v-model="formMst.deliveryname" size="mini" style="width: 210px" />
<el-input v-model="formMst.deliveryunit" size="mini" style="width: 210px"/>
</el-form-item>
<!-- <el-form-item label="司机:">
<el-input v-model="formMst.drivername" size="mini" style="width: 210px"/>
</el-form-item>-->
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="送货联系电话:">
<el-input v-model="formMst.deliveryphone" size="mini" style="width: 210px" />
<el-form-item label="送货方地址:">
<el-select
v-model="formMst.deliveryaddress"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 210px"
>
<el-option
v-for="item in addressList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -109,25 +92,42 @@
</el-col>
<el-col :span="8">
<el-form-item label="预估运费:">
<el-input v-model="formMst.estimated_freight" size="mini" style="width: 210px" />
<el-input v-model="formMst.estimated_freight" size="mini" style="width: 210px"/>
</el-form-item>
<!-- <el-form-item label="送货方联系人:">
<el-input v-model="formMst.deliveryname" size="mini" style="width: 210px"/>
</el-form-item>-->
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<!-- <el-form-item label="送货联系电话:">
<el-input v-model="formMst.deliveryphone" size="mini" style="width: 210px"/>
</el-form-item>-->
</el-col>
<el-col :span="8">
</el-col>
<el-col :span="8">
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="运转费:">
<el-input v-model="formMst.run_freight" size="mini" style="width: 210px" />
<el-input v-model="formMst.run_freight" size="mini" style="width: 210px"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="卸车费:">
<el-input v-model="formMst.unload_freight" size="mini" style="width: 210px" />
<el-input v-model="formMst.unload_freight" size="mini" style="width: 210px"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="其他费用:">
<el-input v-model="formMst.other_freight" size="mini" style="width: 210px" />
<el-input v-model="formMst.other_freight" size="mini" style="width: 210px"/>
</el-form-item>
</el-col>
</el-row>
@@ -135,19 +135,19 @@
<el-row>
<el-col :span="8">
<el-form-item label="运单号:">
<el-input v-model="formMst.order_number" size="mini" style="width: 210px" />
<el-input v-model="formMst.order_number" size="mini" style="width: 210px"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="车型:">
<el-input v-model="formMst.car_type" size="mini" style="width: 210px" />
<el-input v-model="formMst.car_type" size="mini" style="width: 210px"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span />
<span/>
</el-col>
<el-col :span="4">
<span>
@@ -190,6 +190,12 @@ export default {
data() {
return {
transportaList: [],
addressList: [
{ 'value': '甘肃海亮兰州仓', 'label': '甘肃海亮兰州仓' },
{ 'value': '塘厦外仓', 'label': '塘厦外仓' },
{ 'value': '宁德四川外仓', 'label': '宁德四川外仓' },
{ 'value': '宁德蕉城外仓', 'label': '宁德蕉城外仓' },
{ 'value': '宁德江苏外仓', 'label': '宁德江苏外仓' }],
formMst: {},
dialogVisible: false
}

3
lms/nladmin-ui/src/views/wms/stat/inbillquery/index.vue
View File

@@ -189,6 +189,9 @@
<el-table-column show-overflow-tooltip prop="input_optname" label="入库人" :min-width="flexWidth('input_optname',crud.data,'入库人')" />
<el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="width" label="产品规格" :min-width="flexWidth('width',crud.data,'产品规格')" />
<el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
<el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="paper_type" label="管件类型" :min-width="flexWidth('paper_type',crud.data,'管件类型')" />
<el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="paper_code" label="管件编码" :min-width="flexWidth('paper_code',crud.data,'管件编码')" />
<el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="paper_name" label="管件描述" :min-width="flexWidth('paper_name',crud.data,'管件描述')" />
<el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="mass_per_unit_area" label="单位面积" :min-width="flexWidth('mass_per_unit_area',crud.data,'单位面积')" />
<el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="demand_limit" label="客户需求抗拉下限" :min-width="flexWidth('demand_limit',crud.data,'客户需求抗拉下限')" />
<el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="standard_limit" label="内控标准抗拉下线" :min-width="flexWidth('standard_limit',crud.data,'内控标准抗拉下线')" />

8
lms/nladmin-ui/src/views/wms/stat/outbillquery/index.vue
View File

@@ -43,13 +43,12 @@
<el-form-item label="业务类型">
<el-select
v-model="query.bill_type"
v-model="query.bill_types"
clearable
filterable
multiple
size="mini"
placeholder="业务类型"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_OUT_TYPE"
@@ -123,6 +122,9 @@
<el-table-column show-overflow-tooltip prop="input_time" label="出库日期" :min-width="flexWidth('input_time',crud.data,'出库日期')" />
<el-table-column show-overflow-tooltip prop="width" label="产品规格" :min-width="flexWidth('width',crud.data,'产品规格')" />
<el-table-column show-overflow-tooltip prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
<el-table-column show-overflow-tooltip prop="paper_type" label="管件类型" :min-width="flexWidth('paper_type',crud.data,'管件类型')" />
<el-table-column show-overflow-tooltip prop="paper_code" label="管件编码" :min-width="flexWidth('paper_code',crud.data,'管件编码')" />
<el-table-column show-overflow-tooltip prop="paper_name" label="管件描述" :min-width="flexWidth('paper_name',crud.data,'管件描述')" />
<el-table-column show-overflow-tooltip prop="mass_per_unit_area" label="单位面积" :formatter="crud.formatNum2" :min-width="flexWidth('mass_per_unit_area',crud.data,'单位面积')" />
<el-table-column show-overflow-tooltip prop="input_optname" label="制单人" :min-width="flexWidth('input_optname',crud.data,'制单人')" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />