仓库管理,查询统计-库存明细查询 库存汇总查询 字典 关联查询
This commit is contained in:
@@ -3033,25 +3033,28 @@ export default {
|
||||
confirm: '确 定',
|
||||
cancel: '取 消'
|
||||
},
|
||||
// ***************收货单据管理*************
|
||||
// ***************Stock Summary Management*************
|
||||
searchStockSummary: {
|
||||
export: '导出',
|
||||
productId: '物料编码111111111',
|
||||
inputProductId: '请输入物料编码',
|
||||
productName: '物料名称',
|
||||
inputProductName: '请输入物料名称',
|
||||
spec: '规格',
|
||||
inputSpec: '请输入规格',
|
||||
lotNo: '批号',
|
||||
inputLotNo: '请输入批号',
|
||||
warehouseId: '仓库',
|
||||
inputWarehouseId: '请输入仓库',
|
||||
roadwayId: '巷道',
|
||||
inputRoadwayId: '请输入巷道',
|
||||
search: '搜索',
|
||||
reset: '重置',
|
||||
unit: '单位',
|
||||
quantity: '数量',
|
||||
groupOptions: 'Group Options',
|
||||
export: 'Export',
|
||||
productId: 'Product Code',
|
||||
inputProductId: 'Please enter product code',
|
||||
productName: 'Product Name',
|
||||
inputProductName: 'Please enter product name',
|
||||
spec: 'Specification',
|
||||
inputSpec: 'Please enter specification',
|
||||
lotNo: 'Lot Number',
|
||||
inputLotNo: 'Please enter lot number',
|
||||
warehouseId: 'Warehouse',
|
||||
inputWarehouseId: 'Please enter warehouse',
|
||||
roadwayId: 'Roadway',
|
||||
inputRoadwayId: 'Please enter roadway',
|
||||
cargoSpace: 'cargoSpace',
|
||||
inputCargoSpace: 'inputCargoSpace',
|
||||
search: 'Search',
|
||||
reset: 'Reset',
|
||||
unit: 'Unit',
|
||||
quantity: 'Quantity',
|
||||
},
|
||||
// ***************预警库存查询*************
|
||||
searchViewStockWarning: {
|
||||
@@ -3129,6 +3132,17 @@ export default {
|
||||
confirm: '确 定',
|
||||
cancel: '取 消'
|
||||
},
|
||||
// ***************Product Basic Fields**************
|
||||
basproduct1:{
|
||||
englishName:"English Name",
|
||||
netWeightPerUnit:"Net Weight Per Unit",
|
||||
long:"Length MM",
|
||||
wide:"Width MM",
|
||||
tall:"Height MM",
|
||||
volume:"Volume m³",
|
||||
price:"Price",
|
||||
notes:"Description"
|
||||
},
|
||||
// ***************客户管理**************
|
||||
basCustomer: {
|
||||
customerNo: 'customerNo',
|
||||
|
||||
@@ -562,6 +562,11 @@ export default {
|
||||
},
|
||||
// ****************盘点差异管理*****************
|
||||
checkDifference: {
|
||||
unaudited:'未审核',
|
||||
audited:'已审核',
|
||||
inputStatus:'请选择审核状态',
|
||||
status:'审核状态',
|
||||
audit:'审核',
|
||||
createTime: '创建时间',
|
||||
checkGuid: '盘点id',
|
||||
checkStockDetailId: '盘点单据id',
|
||||
@@ -659,7 +664,8 @@ export default {
|
||||
height:'高',
|
||||
volume:'体积',
|
||||
productId:'物料编码',
|
||||
cargoSpaceStatus: '货位状态'
|
||||
cargoSpaceStatus: '锁定状态',
|
||||
cargoSpaceStockStatus: '货位状态'
|
||||
|
||||
|
||||
},
|
||||
@@ -2813,7 +2819,9 @@ export default {
|
||||
deleteConfirm: '是否确认删除库存明细查询编号为"{id}"的数据项?',
|
||||
deleteSuccess: '删除成功',
|
||||
addSuccess: '新增成功',
|
||||
editSuccess: '修改成功'
|
||||
editSuccess: '修改成功',
|
||||
stockStatus: '库存状态',
|
||||
productStatus: '物料状态',
|
||||
},
|
||||
// ***************平库出库流水*************
|
||||
searchViewFlatWarehouseOutFlow: {
|
||||
@@ -3024,6 +3032,7 @@ export default {
|
||||
},
|
||||
// ***************收货单据管理*************
|
||||
searchStockSummary: {
|
||||
groupOptions: '分组选项',
|
||||
export: '导出',
|
||||
productId: '物料编码',
|
||||
inputProductId: '请输入物料编码',
|
||||
@@ -3035,8 +3044,8 @@ export default {
|
||||
inputLotNo: '请输入批号',
|
||||
warehouseId: '仓库',
|
||||
inputWarehouseId: '请输入仓库',
|
||||
roadwayId: '巷道',
|
||||
inputRoadwayId: '请输入巷道',
|
||||
cargoSpace: '货位',
|
||||
inputCargoSpace: '请输入货位',
|
||||
search: '搜索',
|
||||
reset: '重置',
|
||||
unit: '单位',
|
||||
|
||||
@@ -1194,6 +1194,7 @@ export default {
|
||||
title: '货位管理',
|
||||
cargoSpaceId: '货位编码',
|
||||
warehouseId: '仓库编码',
|
||||
warehouseName: '仓库',
|
||||
roadwayId: '巷道号',
|
||||
cargoAreaId: '货区编码',
|
||||
cargoSpaceType: '货位类型',
|
||||
@@ -2819,7 +2820,9 @@ export default {
|
||||
deleteConfirm: '是否确认删除库存明细查询编号为"{id}"的数据项?',
|
||||
deleteSuccess: '删除成功',
|
||||
addSuccess: '新增成功',
|
||||
editSuccess: '修改成功'
|
||||
editSuccess: '修改成功',
|
||||
stockStatus: '库存状态',
|
||||
productStatus: '物料状态',
|
||||
},
|
||||
// ***************平库出库流水*************
|
||||
searchViewFlatWarehouseOutFlow: {
|
||||
@@ -3030,6 +3033,7 @@ export default {
|
||||
},
|
||||
// ***************收货单据管理*************
|
||||
searchStockSummary: {
|
||||
groupOptions: '分组选项',
|
||||
export: '导出',
|
||||
productId: '物料编码',
|
||||
inputProductId: '请输入物料编码',
|
||||
@@ -3041,8 +3045,8 @@ export default {
|
||||
inputLotNo: '请输入批号',
|
||||
warehouseId: '仓库',
|
||||
inputWarehouseId: '请输入仓库',
|
||||
roadwayId: '巷道',
|
||||
inputRoadwayId: '请输入巷道',
|
||||
cargoSpace: '货位',
|
||||
inputCargoSpace: '请输入货位',
|
||||
search: '搜索',
|
||||
reset: '重置',
|
||||
unit: '单位',
|
||||
|
||||
@@ -2,49 +2,51 @@
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" :label-width="labelWidthForSearch">
|
||||
<!-- 仓库ID -->
|
||||
<el-form-item :label="$t('cargoSpace.warehouseId')" prop="warehouseId">
|
||||
<el-input
|
||||
v-model="queryParams.warehouseId"
|
||||
:placeholder="$t('cargoSpace.warehouseId')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
<el-form-item :label="$t('cargoSpace.warehouseName')" prop="warehouseId"><!-- 仓库id -->
|
||||
<el-select v-model="queryParams.warehouseId" :placeholder="$t('cargoSpace.warehouseName')">
|
||||
<el-option
|
||||
v-for="item in warehouseOptions"
|
||||
:key="item.warehouseId"
|
||||
:label="item.warehouseName"
|
||||
:value="item.warehouseId"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 巷道号 -->
|
||||
<el-form-item :label="$t('cargoSpace.roadwayId')" prop="roadwayId">
|
||||
<!-- <el-form-item :label="$t('cargoSpace.roadwayId')" prop="roadwayId">
|
||||
<el-input
|
||||
v-model="queryParams.roadwayId"
|
||||
:placeholder="$t('cargoSpace.roadwayId')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form-item>-->
|
||||
<!-- 货区编号 -->
|
||||
<el-form-item :label="$t('cargoSpace.cargoAreaId')" prop="cargoAreaId">
|
||||
<!-- <el-form-item :label="$t('cargoSpace.cargoAreaId')" prop="cargoAreaId">
|
||||
<el-input
|
||||
v-model="queryParams.cargoAreaId"
|
||||
:placeholder="$t('cargoSpace.cargoAreaId')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form-item>-->
|
||||
<!-- 货位类型 -->
|
||||
<el-form-item :label="$t('cargoSpace.cargoSpaceType')" prop="theTypeName">
|
||||
<!-- <el-form-item :label="$t('cargoSpace.cargoSpaceType')" prop="theTypeName">
|
||||
<el-input
|
||||
v-model="queryParams.theTypeName"
|
||||
:placeholder="$t('cargoSpace.cargoSpaceType')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="货位名称" prop="cargoSpaceName">
|
||||
</el-form-item>-->
|
||||
<el-form-item label="货位名称" prop="cargoSpaceName">
|
||||
<el-input
|
||||
v-model="queryParams.cargoSpaceName"
|
||||
placeholder="请输入货位名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item> -->
|
||||
</el-form-item>
|
||||
<!-- 排 -->
|
||||
<el-form-item :label="$t('cargoSpace.platoon')" prop="thePlatoon">
|
||||
<el-input
|
||||
@@ -74,21 +76,25 @@
|
||||
</el-form-item>
|
||||
<!-- 货位状态 -->
|
||||
<el-form-item :label="$t('cargoSpace.status')" prop="status">
|
||||
<el-input
|
||||
v-model="queryParams.status"
|
||||
:placeholder="$t('cargoSpace.status')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
<el-select v-model="queryParams.status" :placeholder="$t('cargoSpace.status')" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.cargo_space_status"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 是否锁定 -->
|
||||
<el-form-item :label="$t('cargoSpace.locked')" prop="locked">
|
||||
<el-input
|
||||
v-model="queryParams.locked"
|
||||
:placeholder="$t('cargoSpace.locked')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
<el-select v-model="queryParams.locked" :placeholder="$t('cargoSpace.locked')" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.cargo_space_lock_status"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 托盘编码 -->
|
||||
<el-form-item :label="$t('cargoSpace.trayCode')" prop="trayCode">
|
||||
@@ -99,7 +105,6 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<!-- <el-form-item label="是否双伸 Y N " prop="issDouble">
|
||||
<el-input
|
||||
v-model="queryParams.issDouble"
|
||||
@@ -205,35 +210,43 @@
|
||||
<!-- 仓库ID -->
|
||||
<el-table-column :label="$t('cargoSpace.warehouseId')" align="center" prop="warehouseId" />
|
||||
<!-- 巷道号 -->
|
||||
<el-table-column :label="$t('cargoSpace.roadwayId')" align="center" prop="roadwayId" />
|
||||
<!-- <el-table-column :label="$t('cargoSpace.roadwayId')" align="center" prop="roadwayId" />-->
|
||||
<!-- 货区编号 -->
|
||||
<el-table-column :label="$t('cargoSpace.cargoAreaId')" align="center" prop="cargoAreaId" />
|
||||
<!-- <el-table-column :label="$t('cargoSpace.cargoAreaId')" align="center" prop="cargoAreaId" />-->
|
||||
<!-- 货位类型 -->
|
||||
<!-- <el-table-column :label="$t('cargoSpace.cargoSpaceType')" align="center" prop="theType" /> -->
|
||||
<!-- 货位类型名称 -->
|
||||
<el-table-column :label="$t('cargoSpace.cargoSpaceTypeName')" align="center" prop="theTypeName" />
|
||||
<!-- <el-table-column :label="$t('cargoSpace.cargoSpaceTypeName')" align="center" prop="theTypeName" />-->
|
||||
<!-- 货位名称 -->
|
||||
<el-table-column :label="$t('cargoSpace.cargoSpaceName')" align="center" prop="cargoSpaceName" />
|
||||
<!-- 排 -->
|
||||
<!-- <el-table-column :label="$t('cargoSpace.platoon')" align="center" prop="thePlatoon" /> -->
|
||||
<el-table-column :label="$t('cargoSpace.platoon')" align="center" prop="thePlatoon" />
|
||||
<!-- 列 -->
|
||||
<!-- <el-table-column :label="$t('cargoSpace.column')" align="center" prop="theColumn" /> -->
|
||||
<el-table-column :label="$t('cargoSpace.column')" align="center" prop="theColumn" />
|
||||
<!-- 层 -->
|
||||
<!-- <el-table-column :label="$t('cargoSpace.floor')" align="center" prop="theFloor" /> -->
|
||||
<el-table-column :label="$t('cargoSpace.floor')" align="center" prop="theFloor" />
|
||||
<!-- 货位编码 -->
|
||||
<el-table-column :label="$t('cargoSpace.status')" align="center" prop="status" />
|
||||
<el-table-column :label="$t('cargoSpace.status')" align="center" prop="status" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.status"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 是否锁定 -->
|
||||
<el-table-column :label="$t('cargoSpace.locked')" align="center" prop="locked" />
|
||||
<el-table-column :label="$t('cargoSpace.locked')" align="center" prop="locked" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 托盘编码 -->
|
||||
<el-table-column :label="$t('cargoSpace.trayCode')" align="center" prop="trayCode" />
|
||||
<!-- 货物高度 -->
|
||||
<el-table-column :label="$t('cargoSpace.cargoHeight')" align="center" prop="cargoHight" />
|
||||
<!-- 是否双伸 -->
|
||||
<el-table-column :label="$t('cargoSpace.isDouble')" align="center" prop="issDouble" />
|
||||
<!-- <el-table-column :label="$t('cargoSpace.isDouble')" align="center" prop="issDouble" />-->
|
||||
<!-- 双货位分组编码 -->
|
||||
<!-- <el-table-column :label="$t('cargoSpace.groupCodingNo')" align="center" prop="groupCodingNo" /> -->
|
||||
<!-- 双货位分组编码名称1、2… -->
|
||||
<el-table-column :label="$t('cargoSpace.groupCodingName')" align="center" prop="groupCoding" />
|
||||
<!-- <el-table-column :label="$t('cargoSpace.groupCodingName')" align="center" prop="groupCoding" />-->
|
||||
<!-- 双货位标识 0 外1内 -->
|
||||
<!-- <el-table-column :label="$t('cargoSpace.cargoSpaceLogo')" align="center" prop="cargoSpaceLogo" /> -->
|
||||
<!-- 本仓库区域 1--8 A 9--15 B -->
|
||||
@@ -260,7 +273,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
@@ -345,9 +358,11 @@
|
||||
|
||||
<script>
|
||||
import { listCargoSpace, getCargoSpace, delCargoSpace, addCargoSpace, updateCargoSpace } from "@/api/bas/cargoSpace"
|
||||
import {listWarehouse} from "@/api/bas/warehouse"
|
||||
|
||||
export default {
|
||||
name: "CargoSpace",
|
||||
dicts:['cargo_space_status','cargo_space_lock_status'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
@@ -364,6 +379,7 @@ export default {
|
||||
total: 0,
|
||||
// 库存信息表格数据
|
||||
cargoSpaceList: [],
|
||||
warehouseOptions:[],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
@@ -427,9 +443,16 @@ export default {
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getWarehouseList();
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
/** 获取仓库列表 */
|
||||
getWarehouseList() {
|
||||
listWarehouse().then(response => {
|
||||
this.warehouseOptions = response.rows;
|
||||
});
|
||||
},
|
||||
/** 查询库存信息列表 */
|
||||
getList() {
|
||||
this.loading = true
|
||||
@@ -540,11 +563,11 @@ export default {
|
||||
},
|
||||
comped: {
|
||||
labelWidthForSearch() {
|
||||
const lang = this.$i18n.locale;
|
||||
const lang = this.$i18n.locale;
|
||||
return lang.startsWith('en') ? '84px' : '68px';
|
||||
},
|
||||
labelWidthForFunction() {
|
||||
const lang = this.$i18n.locale;
|
||||
const lang = this.$i18n.locale;
|
||||
return lang.startsWith('en') ? '150px' : '120px';
|
||||
}
|
||||
},
|
||||
|
||||
@@ -2,15 +2,15 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" :label-width="labelWidthForSearch">
|
||||
<el-form-item :label="$t('warehouse.Id')" prop="warehouseId">
|
||||
<!-- 仓库ID(序号) -->
|
||||
<!-- <el-form-item :label="$t('warehouse.Id')" prop="warehouseId">
|
||||
<!– 仓库ID(序号) –>
|
||||
<el-input
|
||||
v-model="queryParams.warehouseId"
|
||||
:placeholder="$t('warehouse.placeholderId')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form-item>-->
|
||||
<!-- 仓库编号 -->
|
||||
<el-form-item :label="$t('warehouse.warehouseId')" prop="warehouseNo">
|
||||
<el-input
|
||||
@@ -76,6 +76,17 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item :label="$t('warehouse.warehouseType')" prop="warehouseType">
|
||||
<el-select v-model="queryParams.warehouseType" :placeholder="$t('warehouse.placeholderWarehouseType')" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.warehouse_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item
|
||||
<el-form-item>
|
||||
<!-- 【查询】按钮 -->
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('warehouse.search') }}</el-button>
|
||||
@@ -152,7 +163,11 @@
|
||||
<!-- 仓库级别 -->
|
||||
<el-table-column :label="$t('warehouse.warehouseKind')" align="center" prop="warehouseKind" />
|
||||
<!-- 仓库类型 -->
|
||||
<el-table-column :label="$t('warehouse.warehouseType')" align="center" prop="warehouseType" />
|
||||
<el-table-column :label="$t('warehouse.warehouseType')" align="center" prop="warehouseType" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.warehouse_type" :value="scope.row.warehouseType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 仓库是否可用 -->
|
||||
<el-table-column :label="$t('warehouse.isCurrent')" align="center" prop="isCurrent">
|
||||
<template slot-scope="scope">
|
||||
@@ -248,7 +263,7 @@ import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehous
|
||||
|
||||
export default {
|
||||
name: "Warehouse",
|
||||
dicts: ['sys_yes_no'],
|
||||
dicts: ['sys_yes_no','warehouse_type'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
|
||||
@@ -1,22 +1,23 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="分组选项">
|
||||
<el-form-item :label="$t('searchStockSummary.groupOptions')">
|
||||
<el-checkbox-group v-model="queryParams.groupFields" @change="handleQuery">
|
||||
<el-checkbox label="productId">物料编码</el-checkbox>
|
||||
<el-checkbox label="productName">物料名称</el-checkbox>
|
||||
<el-checkbox label="spec">规格</el-checkbox>
|
||||
<el-checkbox label="unit">单位</el-checkbox>
|
||||
<el-checkbox label="lotNo">批号</el-checkbox>
|
||||
<el-checkbox label="warehouseId">仓库</el-checkbox>
|
||||
<el-checkbox label="roadwayId">巷道</el-checkbox>
|
||||
<el-checkbox label="price">价格</el-checkbox>
|
||||
<el-checkbox label="spare1">英文名称</el-checkbox>
|
||||
<el-checkbox label="spare2">单件净重</el-checkbox>
|
||||
<el-checkbox label="spare5">长度</el-checkbox>
|
||||
<el-checkbox label="spare6">宽度</el-checkbox>
|
||||
<el-checkbox label="spare7">高度</el-checkbox>
|
||||
<el-checkbox label="spare8">体积</el-checkbox>
|
||||
<el-checkbox label="productId">{{$t('searchStockSummary.productId')}}</el-checkbox>
|
||||
<el-checkbox label="productName">{{$t('searchStockSummary.productName')}}</el-checkbox>
|
||||
<!-- <el-checkbox label="spec">{{$t('searchStockSummary.spec')}}</el-checkbox>-->
|
||||
<el-checkbox label="unit">{{$t('searchStockSummary.unit')}}</el-checkbox>
|
||||
<!-- <el-checkbox label="lotNo">{{$t('searchStockSummary.lotNo')}}</el-checkbox>-->
|
||||
<el-checkbox label="warehouseId">{{$t('searchStockSummary.warehouseId')}}</el-checkbox>
|
||||
<!-- <el-checkbox label="roadwayId">{{$t('searchStockSummary.roadwayId')}}</el-checkbox>-->
|
||||
<el-checkbox label="cargoSpaceId">{{$t('searchStockSummary.cargoSpace')}}</el-checkbox>
|
||||
<el-checkbox label="price">{{$t('basproduct1.price')}}</el-checkbox>
|
||||
<el-checkbox label="spare1">{{$t('basproduct1.englishName')}}</el-checkbox>
|
||||
<el-checkbox label="spare2">{{$t('basproduct1.netWeightPerUnit')}}</el-checkbox>
|
||||
<el-checkbox label="spare5">{{$t('basproduct1.long')}}</el-checkbox>
|
||||
<el-checkbox label="spare6">{{$t('basproduct1.wide')}}</el-checkbox>
|
||||
<el-checkbox label="spare7">{{$t('basproduct1.tall')}}</el-checkbox>
|
||||
<el-checkbox label="spare8">{{$t('basproduct1.volume')}}</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</el-form-item>
|
||||
<br>
|
||||
@@ -62,10 +63,10 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('searchStockSummary.roadwayId')" prop="roadwayId"> <!-- 巷道 -->
|
||||
<el-form-item :label="$t('searchStockSummary.cargoSpace')" prop="cargoSpaceId"> <!-- 巷道 -->
|
||||
<el-input
|
||||
v-model="queryParams.roadwayId"
|
||||
:placeholder="$t('searchStockSummary.inputRoadwayId')"
|
||||
v-model="queryParams.cargoSpaceId"
|
||||
:placeholder="$t('searchStockSummary.inputCargoSpace')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
@@ -98,11 +99,11 @@
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column :label="$t('searchStockSummary.productId')" align="center" prop="productId" v-if="queryParams.groupFields.includes('productId')" /> <!-- 物料编码 -->
|
||||
<el-table-column :label="$t('searchStockSummary.productName')" align="center" prop="productName" v-if="queryParams.groupFields.includes('productName')" /> <!-- 物料名称 -->
|
||||
<el-table-column :label="$t('searchStockSummary.spec')" align="center" prop="spec" v-if="queryParams.groupFields.includes('spec')" /> <!-- 规格 -->
|
||||
<!-- <el-table-column :label="$t('searchStockSummary.spec')" align="center" prop="spec" v-if="queryParams.groupFields.includes('spec')" /> <!– 规格 –>-->
|
||||
<el-table-column :label="$t('searchStockSummary.unit')" align="center" prop="unit" v-if="queryParams.groupFields.includes('unit')" /> <!-- 单位 -->
|
||||
<el-table-column :label="$t('searchStockSummary.lotNo')" align="center" prop="lotNo" v-if="queryParams.groupFields.includes('lotNo')" /> <!-- 批号 -->
|
||||
<el-table-column :label="$t('searchStockSummary.warehouseId')" align="center" prop="warehouseId" v-if="queryParams.groupFields.includes('warehouseId')" /> <!-- 仓库 -->
|
||||
<el-table-column :label="$t('searchStockSummary.roadwayId')" align="center" prop="roadwayId" v-if="queryParams.groupFields.includes('roadwayId')" /> <!-- 巷道 -->
|
||||
<!-- <el-table-column :label="$t('searchStockSummary.lotNo')" align="center" prop="lotNo" v-if="queryParams.groupFields.includes('lotNo')" /> <!– 批号 –>-->
|
||||
<el-table-column :label="$t('searchStockSummary.warehouseId')" align="center" prop="warehouseName" v-if="queryParams.groupFields.includes('warehouseId')" /> <!-- 仓库 -->
|
||||
<el-table-column :label="$t('searchStockSummary.cargoSpace')" align="center" prop="cargoSpaceName" v-if="queryParams.groupFields.includes('cargoSpaceId')" /> <!-- 货位 -->
|
||||
<el-table-column :label="$t('searchStockSummary.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
|
||||
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" v-if="queryParams.groupFields.includes('spare1')" /><!-- 英文名称 -->
|
||||
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" v-if="queryParams.groupFields.includes('spare2')" /><!-- 单件净重 -->
|
||||
@@ -168,7 +169,7 @@ export default {
|
||||
created() {
|
||||
// 初始化时全选分组选项
|
||||
this.queryParams.groupFields = [
|
||||
'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'roadwayId',
|
||||
'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'cargoSpaceId',
|
||||
'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
|
||||
];
|
||||
this.getList();
|
||||
@@ -217,7 +218,7 @@ export default {
|
||||
this.resetForm("queryForm");
|
||||
// 重置时恢复全选状态
|
||||
this.queryParams.groupFields = [
|
||||
'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'roadwayId',
|
||||
'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'cargoSpaceId',
|
||||
'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
|
||||
];
|
||||
this.handleQuery();
|
||||
|
||||
@@ -163,6 +163,27 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus"><!-- 物料状态 -->
|
||||
<el-select v-model="queryParams.productStatus" :placeholder="$t('stockManagement.selectProductStatus')" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.product_status"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('stockManagement.stockStatus')" prop="stockStatus"><!-- 库存状态 -->
|
||||
<el-select v-model="queryParams.stockStatus" :placeholder="$t('stockManagement.stockStatus')" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.stock_status"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('searchViewStockDetail.search')}} <!-- 搜索 --></el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('searchViewStockDetail.reset')}} <!-- 重置 --></el-button>
|
||||
@@ -223,18 +244,36 @@
|
||||
<el-table-column :label="$t('searchViewStockDetail.trayCode')" align="center" prop="trayCode" />
|
||||
<el-table-column :label="$t('searchViewStockDetail.quantity')" align="center" prop="quantity" />
|
||||
<el-table-column :label="$t('searchViewStockDetail.jobId')" align="center" prop="jobId" />
|
||||
<el-table-column :label="$t('searchViewStockDetail.lotNo')" align="center" prop="lotNo" />
|
||||
<!-- <el-table-column :label="$t('searchViewStockDetail.lotNo')" align="center" prop="lotNo" />-->
|
||||
<el-table-column :label="$t('searchViewStockDetail.stockinDetailId')" align="center" prop="stockinDetailId" />
|
||||
<el-table-column :label="$t('searchViewStockDetail.inDate')" align="center" prop="inDate" />
|
||||
<el-table-column :label="$t('searchViewStockDetail.warehouseId')" align="center" prop="warehouseId" />
|
||||
<el-table-column :label="$t('searchViewStockDetail.stackingId')" align="center" prop="stackingId" />
|
||||
<el-table-column :label="$t('searchViewStockDetail.warehouseId')" align="center" prop="warehouseName" />
|
||||
<!-- <el-table-column :label="$t('searchViewStockDetail.stackingId')" align="center" prop="stackingId" />-->
|
||||
<el-table-column :label="$t('searchViewStockDetail.cargoSpaceName')" align="center" prop="cargoSpaceName" />
|
||||
<el-table-column :label="$t('searchViewStockDetail.roadwayId')" align="center" prop="roadwayId" />
|
||||
<el-table-column :label="$t('searchViewStockDetail.cargoSpaceStatus')" align="center" prop="cargoSpaceStatus" />
|
||||
<el-table-column :label="$t('searchViewStockDetail.locked')" align="center" prop="locked" />
|
||||
<el-table-column :label="$t('searchViewStockDetail.cargoSpaceStatus')" align="center" prop="cargoSpaceStatus" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('searchViewStockDetail.stockStatus')" align="center" prop="stockStatus" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('searchViewStockDetail.productStatus')" align="center" prop="productStatus" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('searchViewStockDetail.locked')" align="center" prop="locked" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('searchViewStockDetail.productId')" align="center" prop="productId" />
|
||||
<el-table-column :label="$t('searchViewStockDetail.productName')" align="center" prop="productName" />
|
||||
<el-table-column :label="$t('searchViewStockDetail.spec')" align="center" prop="spec" />
|
||||
<!-- <el-table-column :label="$t('searchViewStockDetail.spec')" align="center" prop="spec" />-->
|
||||
<el-table-column :label="$t('searchViewStockDetail.unit')" align="center" prop="unit" />
|
||||
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
|
||||
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
|
||||
@@ -347,6 +386,7 @@ import { listWarehouse } from "@/api/bas/warehouse"
|
||||
|
||||
export default {
|
||||
name: "ViewStockDetail",
|
||||
dicts: ['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
|
||||
Reference in New Issue
Block a user