修改库存管理 联查 查询条件 字典相关问题
This commit is contained in:
@@ -93,6 +93,15 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item :label="$t('stockManagement.materialDesc')" prop="productName"><!-- 物料描述 -->
|
||||
<el-input
|
||||
v-model="queryParams.productName"
|
||||
:placeholder="$t('stockManagement.materialDesc')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="出库数量" prop="outQuantity">
|
||||
<el-input
|
||||
v-model="queryParams.outQuantity"
|
||||
@@ -126,21 +135,16 @@
|
||||
/>
|
||||
</el-form-item>-->
|
||||
<el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"><!-- 仓库id -->
|
||||
<el-input
|
||||
v-model="queryParams.warehouseId"
|
||||
:placeholder="$t('stockManagement.inputWarehouseId')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('stockManagement.stackingId')" prop="stackingId"><!-- 垛型ID -->
|
||||
<el-input
|
||||
v-model="queryParams.stackingId"
|
||||
:placeholder="$t('stockManagement.inputStackingId')"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
<el-select v-model="queryParams.warehouseId" :placeholder="$t('stockManagement.warehouseId')">
|
||||
<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="备用字段1" prop="spare1">
|
||||
<el-input
|
||||
v-model="queryParams.spare1"
|
||||
@@ -196,7 +200,7 @@
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
@@ -204,8 +208,8 @@
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['stock:management:add']"
|
||||
>{{$t('stockManagement.add')}} <!-- 新增 --></el-button>
|
||||
</el-col>
|
||||
>{{$t('stockManagement.add')}} <!– 新增 –></el-button>
|
||||
</el-col>-->
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
@@ -245,30 +249,43 @@
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column :label="$t('stockManagement.stockId')" align="center" prop="stockId" /> <!-- 库存id -->
|
||||
<el-table-column :label="$t('stockManagement.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位id -->
|
||||
<el-table-column :label="$t('stockManagement.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位id -->
|
||||
<el-table-column :label="$t('stockManagement.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('stockManagement.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('stockManagement.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('stockManagement.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
|
||||
<el-table-column :label="$t('stockManagement.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
|
||||
<el-table-column :label="$t('stockManagement.backDate')" align="center" prop="backDate" /> <!-- 回流时间 -->
|
||||
<el-table-column :label="$t('stockManagement.productGuid')" align="center" prop="productGuid" /> <!-- 物料GUID -->
|
||||
<!-- <el-table-column :label="$t('stockManagement.backDate')" align="center" prop="backDate" /> <!– 回流时间 –>-->
|
||||
<el-table-column :label="$t('stockManagement.productId')" align="center" prop="extraField.productId" /> <!-- 物料Id -->
|
||||
<el-table-column :label="$t('stockManagement.materialDesc')" align="center" prop="extraField.materialDesc" /> <!-- 物料描述 -->
|
||||
<el-table-column :label="$t('stockManagement.englishDesc')" align="center" prop="extraField.englishDesc" /> <!-- 物料英文描述 -->
|
||||
<el-table-column :label="$t('stockManagement.netWeight')" align="center" prop="extraField.netWeight" /> <!-- 净重 -->
|
||||
<el-table-column :label="$t('stockManagement.length')" align="center" prop="extraField.length" /> <!-- 长 -->
|
||||
<el-table-column :label="$t('stockManagement.width')" align="center" prop="extraField.width" /> <!-- 宽 -->
|
||||
<el-table-column :label="$t('stockManagement.height')" align="center" prop="extraField.height" /> <!-- 高 -->
|
||||
<el-table-column :label="$t('stockManagement.volume')" align="center" prop="extraField.volume" /> <!-- 体积 -->
|
||||
<el-table-column :label="$t('stockManagement.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
|
||||
<el-table-column :label="$t('stockManagement.jobId')" align="center" prop="jobId" /> <!-- 作业ID -->
|
||||
<el-table-column :label="$t('stockManagement.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
|
||||
<el-table-column :label="$t('stockManagement.outQuantity')" align="center" prop="outQuantity" /> <!-- 出库数量 -->
|
||||
<el-table-column :label="$t('stockManagement.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单id -->
|
||||
<!-- <el-table-column :label="$t('stockManagement.outQuantity')" align="center" prop="outQuantity" /> <!– 出库数量 –>-->
|
||||
<el-table-column :label="$t('stockManagement.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
|
||||
<el-table-column :label="$t('stockManagement.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单id -->
|
||||
<el-table-column :label="$t('stockManagement.inType')" align="center" prop="inType" /> <!-- 入库类型 -->
|
||||
<el-table-column :label="$t('stockManagement.inClassId')" align="center" prop="inClassId" /> <!-- 入库班组ID -->
|
||||
<el-table-column :label="$t('stockManagement.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库 -->
|
||||
<el-table-column :label="$t('stockManagement.stackingId')" align="center" prop="stackingId" /> <!-- 垛型ID -->
|
||||
<!-- <el-table-column :label="$t('stockManagement.inClassId')" align="center" prop="inClassId" /> <!– 入库班组ID –>-->
|
||||
<el-table-column :label="$t('stockManagement.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
|
||||
<el-table-column :label="$t('stockManagement.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
|
||||
<!-- <el-table-column :label="$t('stockManagement.stackingId')" align="center" prop="stackingId" /> <!– 垛型ID –>-->
|
||||
<el-table-column :label="$t('stockManagement.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
@@ -316,73 +333,83 @@
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus"> <!-- 物料状态 -->
|
||||
<el-select v-model="form.productStatus" :placeholder="$t('stockManagement.selectProductStatus')">
|
||||
<el-form-item :label="$t('stockManagement.cargoSpaceStatus')" prop="cargoSpaceStatus"> <!-- 货位状态 -->
|
||||
<el-select v-model="form.cargoSpaceStatus" :placeholder="$t('stockManagement.cargoSpaceStatus')">
|
||||
<el-option
|
||||
v-for="dict in dict.type.product_status"
|
||||
v-for="dict in dict.type.cargo_space_status"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('stockManagement.lotNo')" prop="lotNo"> <!-- 批次号 -->
|
||||
<el-input v-model="form.lotNo" :placeholder="$t('stockManagement.inputLotNo')" />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('stockManagement.inDate')" prop="inDate"> <!-- 入库时间 -->
|
||||
<el-input v-model="form.inDate" :placeholder="$t('stockManagement.inputInDate')" />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('stockManagement.backDate')" prop="backDate"> <!-- 回流时间 -->
|
||||
<el-input v-model="form.backDate" :placeholder="$t('stockManagement.inputBackDate')" />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('stockManagement.productGuid')" prop="productGuid"> <!-- 物料GUID -->
|
||||
<el-input v-model="form.productGuid" :placeholder="$t('stockManagement.inputProductGuid')" />
|
||||
</el-form-item>
|
||||
<!-- <el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus"> <!– 物料状态 –>-->
|
||||
<!-- <el-select v-model="form.productStatus" :placeholder="$t('stockManagement.selectProductStatus')">-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="dict in dict.type.product_status"-->
|
||||
<!-- :key="dict.value"-->
|
||||
<!-- :label="dict.label"-->
|
||||
<!-- :value="dict.value"-->
|
||||
<!-- ></el-option>-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item :label="$t('stockManagement.lotNo')" prop="lotNo"> <!– 批次号 –>-->
|
||||
<!-- <el-input v-model="form.lotNo" :placeholder="$t('stockManagement.inputLotNo')" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item :label="$t('stockManagement.inDate')" prop="inDate"> <!– 入库时间 –>-->
|
||||
<!-- <el-input v-model="form.inDate" :placeholder="$t('stockManagement.inputInDate')" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item :label="$t('stockManagement.backDate')" prop="backDate"> <!– 回流时间 –>-->
|
||||
<!-- <el-input v-model="form.backDate" :placeholder="$t('stockManagement.inputBackDate')" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item :label="$t('stockManagement.productGuid')" prop="productGuid"> <!– 物料GUID –>-->
|
||||
<!-- <el-input v-model="form.productGuid" :placeholder="$t('stockManagement.inputProductGuid')" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item :label="$t('stockManagement.quantity')" prop="quantity"> <!-- 库存数量 -->
|
||||
<el-input v-model="form.quantity" :placeholder="$t('stockManagement.inputQuantity')" />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('stockManagement.jobId')" prop="jobId"> <!-- 作业ID -->
|
||||
<el-input v-model="form.jobId" :placeholder="$t('stockManagement.inputJobId')" />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('stockManagement.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
|
||||
<el-input v-model="form.trayCode" :placeholder="$t('stockManagement.inputTrayCode')" />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('stockManagement.outQuantity')" prop="outQuantity"> <!-- 出库数量 -->
|
||||
<el-input v-model="form.outQuantity" :placeholder="$t('stockManagement.inputOutQuantity')" />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('stockManagement.stockinDetailId')" prop="stockinDetailId"> <!-- 入库子单id -->
|
||||
<el-input v-model="form.stockinDetailId" :placeholder="$t('stockManagement.inputStockinDetailId')" />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('stockManagement.stockinId')" prop="stockinId"> <!-- 入库主单 -->
|
||||
<el-input v-model="form.stockinId" :placeholder="$t('stockManagement.inputStockinId')" />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('stockManagement.inClassId')" prop="inClassId"> <!-- 入库班组ID -->
|
||||
<el-input v-model="form.inClassId" :placeholder="$t('stockManagement.inputInClassId')" />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
|
||||
<el-input v-model="form.warehouseId" :placeholder="$t('stockManagement.inputWarehouseId')" />
|
||||
</el-form-item>
|
||||
<el-form-item label="垛型ID" prop="stackingId">
|
||||
<el-input v-model="form.stackingId" placeholder="请输入垛型ID" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段1" prop="spare1">
|
||||
<el-input v-model="form.spare1" placeholder="请输入备用字段1" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段2" prop="spare2">
|
||||
<el-input v-model="form.spare2" placeholder="请输入备用字段2" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段3" prop="spare3">
|
||||
<el-input v-model="form.spare3" placeholder="请输入备用字段3" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段4" prop="spare4">
|
||||
<el-input v-model="form.spare4" placeholder="请输入备用字段4" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段5" prop="spare5">
|
||||
<el-input v-model="form.spare5" placeholder="请输入备用字段5" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段6" prop="spare6">
|
||||
<el-input v-model="form.spare6" placeholder="请输入备用字段6" />
|
||||
</el-form-item>
|
||||
<!-- <el-form-item :label="$t('stockManagement.jobId')" prop="jobId"> <!– 作业ID –>-->
|
||||
<!-- <el-input v-model="form.jobId" :placeholder="$t('stockManagement.inputJobId')" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item :label="$t('stockManagement.trayCode')" prop="trayCode"> <!– 托盘条码 –>-->
|
||||
<!-- <el-input v-model="form.trayCode" :placeholder="$t('stockManagement.inputTrayCode')" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item :label="$t('stockManagement.outQuantity')" prop="outQuantity"> <!– 出库数量 –>-->
|
||||
<!-- <el-input v-model="form.outQuantity" :placeholder="$t('stockManagement.inputOutQuantity')" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item :label="$t('stockManagement.stockinDetailId')" prop="stockinDetailId"> <!– 入库子单id –>-->
|
||||
<!-- <el-input v-model="form.stockinDetailId" :placeholder="$t('stockManagement.inputStockinDetailId')" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item :label="$t('stockManagement.stockinId')" prop="stockinId"> <!– 入库主单 –>-->
|
||||
<!-- <el-input v-model="form.stockinId" :placeholder="$t('stockManagement.inputStockinId')" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item :label="$t('stockManagement.inClassId')" prop="inClassId"> <!– 入库班组ID –>-->
|
||||
<!-- <el-input v-model="form.inClassId" :placeholder="$t('stockManagement.inputInClassId')" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"> <!– 仓库 –>-->
|
||||
<!-- <el-input v-model="form.warehouseId" :placeholder="$t('stockManagement.inputWarehouseId')" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="垛型ID" prop="stackingId">-->
|
||||
<!-- <el-input v-model="form.stackingId" placeholder="请输入垛型ID" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="备用字段1" prop="spare1">-->
|
||||
<!-- <el-input v-model="form.spare1" placeholder="请输入备用字段1" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="备用字段2" prop="spare2">-->
|
||||
<!-- <el-input v-model="form.spare2" placeholder="请输入备用字段2" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="备用字段3" prop="spare3">-->
|
||||
<!-- <el-input v-model="form.spare3" placeholder="请输入备用字段3" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="备用字段4" prop="spare4">-->
|
||||
<!-- <el-input v-model="form.spare4" placeholder="请输入备用字段4" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="备用字段5" prop="spare5">-->
|
||||
<!-- <el-input v-model="form.spare5" placeholder="请输入备用字段5" />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="备用字段6" prop="spare6">-->
|
||||
<!-- <el-input v-model="form.spare6" placeholder="请输入备用字段6" />-->
|
||||
<!-- </el-form-item>-->
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">{{$t('stockManagement.confirm')}} <!-- 确定 --></el-button>
|
||||
@@ -394,10 +421,10 @@
|
||||
|
||||
<script>
|
||||
import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
|
||||
|
||||
import {listWarehouse} from "@/api/bas/warehouse"
|
||||
export default {
|
||||
name: "Management",
|
||||
dicts: ['product_status', 'stock_status'],
|
||||
dicts: ['product_status', 'stock_status','cargo_space_status'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
@@ -414,6 +441,8 @@ export default {
|
||||
total: 0,
|
||||
// 库存信息表格数据
|
||||
managementList: [],
|
||||
// 仓库选项
|
||||
warehouseOptions: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
@@ -451,16 +480,23 @@ export default {
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
stockId: [
|
||||
/*stockId: [
|
||||
{ required: true, message: this.$t('stockManagement.stockIdRequired'), trigger: "blur" } // 库存id不能为空
|
||||
],
|
||||
]*/
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList()
|
||||
this.getWarehouseList();
|
||||
},
|
||||
methods: {
|
||||
/** 获取仓库列表 */
|
||||
getWarehouseList() {
|
||||
listWarehouse().then(response => {
|
||||
this.warehouseOptions = response.rows;
|
||||
});
|
||||
},
|
||||
/** 查询库存信息列表 */
|
||||
getList() {
|
||||
this.loading = true
|
||||
|
||||
Reference in New Issue
Block a user