🐞 fix: 修复库存盘点筛选的选择器bug
This commit is contained in:
@@ -22,12 +22,12 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="20" class="main-panel">
|
<el-col :span="20" class="main-panel">
|
||||||
<div class="form-panel">
|
<div class="form-panel">
|
||||||
<el-form :inline="true" class="filter-form">
|
<el-form inline>
|
||||||
<el-form-item label="库位" class="form-item">
|
<el-form-item label="库位" class="form-item">
|
||||||
<WarehouseSelect v-model="defaultForm.warehouseId" />
|
<WarehouseSelect size="mini" style="width: 200px;" v-model="defaultForm.warehouseId" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="挂载单据" class="form-item">
|
<el-form-item label="挂载单据" class="form-item">
|
||||||
<el-select v-model="defaultForm.stockIoId" placeholder="请选择挂载单据" clearable class="form-input">
|
<el-select size="mini" v-model="defaultForm.stockIoId" placeholder="请选择挂载单据" clearable class="form-input">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in masterList"
|
v-for="item in masterList"
|
||||||
:key="item.stockIoId"
|
:key="item.stockIoId"
|
||||||
@@ -37,22 +37,16 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="数量" class="form-item">
|
<el-form-item label="数量" class="form-item">
|
||||||
<el-input v-model="defaultForm.quantity" class="form-input" />
|
<el-input size="mini" v-model="defaultForm.quantity" class="form-input" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="记录类型" class="form-item">
|
<el-form-item label="记录类型" class="form-item">
|
||||||
<el-select v-model="defaultForm.ioType" placeholder="请选择操作类型" clearable class="form-input">
|
<el-select size="mini" v-model="defaultForm.ioType" placeholder="请选择操作类型" clearable class="form-input">
|
||||||
<!-- <el-option-->
|
|
||||||
<!-- v-for="dict in dict.type.stock_io_type"-->
|
|
||||||
<!-- :key="dict.value"-->
|
|
||||||
<!-- :label="dict.label"-->
|
|
||||||
<!-- :value="dict.value"-->
|
|
||||||
<!-- />-->
|
|
||||||
<el-option label="入库" value="in" />
|
<el-option label="入库" value="in" />
|
||||||
<el-option label="出库" value="out" />
|
<el-option label="出库" value="out" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="批次号" class="form-item">
|
<el-form-item label="批次号" class="form-item">
|
||||||
<el-input v-model="defaultForm.batchNo" class="form-input" />
|
<el-input size="mini" v-model="defaultForm.batchNo" class="form-input" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-button type="primary" :disabled="selectedList.length === 0" @click="handleBatchConfirm">批量确认</el-button>
|
<el-button type="primary" :disabled="selectedList.length === 0" @click="handleBatchConfirm">批量确认</el-button>
|
||||||
</el-form>
|
</el-form>
|
||||||
@@ -60,7 +54,7 @@
|
|||||||
<div class="table-panel">
|
<div class="table-panel">
|
||||||
<el-table :data="messageList" style="width: 100%" height="100%" class="message-table" stripe @selection-change="handleSelectionChange">
|
<el-table :data="messageList" style="width: 100%" height="100%" class="message-table" stripe @selection-change="handleSelectionChange">
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
<el-table-column prop="time" label="时间" width="180" align="center" />
|
<el-table-column prop="time" label="时间" width="60" align="center" />
|
||||||
<el-table-column prop="itemId" label="物料" align="center">
|
<el-table-column prop="itemId" label="物料" align="center">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<ProductInfo v-if="scope.row.itemType == 'product' || scope.row.itemType == 'semi'" :productId="scope.row.itemId" />
|
<ProductInfo v-if="scope.row.itemType == 'product' || scope.row.itemType == 'semi'" :productId="scope.row.itemId" />
|
||||||
@@ -106,10 +100,10 @@
|
|||||||
<el-input v-model="scope.row.batchNo" class="table-input" />
|
<el-input v-model="scope.row.batchNo" class="table-input" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center">
|
<el-table-column label="操作" align="center" width="120" fixed="right">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button type="primary" @click="handleDelete(scope.row)">删除</el-button>
|
<el-button type="primary" size="mini" @click="handleDelete(scope.row)">删除</el-button>
|
||||||
<el-button type="primary" @click="handleConfirm(scope.row)">确认</el-button>
|
<el-button type="primary" size="mini" @click="handleConfirm(scope.row)">确认</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
@@ -332,13 +326,6 @@ export default {
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
|
|
||||||
.main-panel {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
height: calc(100vh - 40px);
|
|
||||||
padding: 0 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.panel-header {
|
.panel-header {
|
||||||
padding: 15px 20px;
|
padding: 15px 20px;
|
||||||
border-bottom: 1px solid #ebeef5;
|
border-bottom: 1px solid #ebeef5;
|
||||||
@@ -434,6 +421,8 @@ export default {
|
|||||||
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
|
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
|
||||||
padding: 15px 20px;
|
padding: 15px 20px;
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.filter-form {
|
.filter-form {
|
||||||
|
|||||||
@@ -11,19 +11,7 @@
|
|||||||
<div class="stock-main-col">
|
<div class="stock-main-col">
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||||
<!-- 移除仓库筛选项 -->
|
<!-- 移除仓库筛选项 -->
|
||||||
<el-form-item label="物品类型" prop="itemType">
|
<MaterialSelect :itemType.sync="queryParams.itemType" :itemId.sync="queryParams.itemId" @change="getList" />
|
||||||
<el-select v-model="queryParams.itemType" placeholder="请选择物品类型" clearable>
|
|
||||||
<el-option v-for="dict in dict.type.stock_item_type" :key="dict.value" :label="dict.label"
|
|
||||||
:value="dict.value" />
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="物料" prop="itemId">
|
|
||||||
<raw-material-select v-if="queryParams.itemType === 'raw_material'" v-model="queryParams.itemId"
|
|
||||||
placeholder="请选择原材料" style="width: 100%;" clearable />
|
|
||||||
<product-select v-else-if="queryParams.itemType === 'product'" v-model="queryParams.itemId"
|
|
||||||
placeholder="请选择产品" style="width: 100%;" clearable />
|
|
||||||
<el-input v-else v-model="queryParams.itemId" placeholder="请先选择物品类型" :disabled="true" style="width: 100%;" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="单位" prop="unit">
|
<el-form-item label="单位" prop="unit">
|
||||||
<el-input v-model="queryParams.unit" placeholder="请输入单位" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.unit" placeholder="请输入单位" clearable @keyup.enter.native="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -148,6 +136,7 @@ import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
|
|||||||
import BomInfoMini from "@/components/KLPService/Renderer/BomInfoMini";
|
import BomInfoMini from "@/components/KLPService/Renderer/BomInfoMini";
|
||||||
import StockIo from './panels/stockIo.vue';
|
import StockIo from './panels/stockIo.vue';
|
||||||
import WarehouseTree from "@/components/KLPService/WarehouseTree/index.vue";
|
import WarehouseTree from "@/components/KLPService/WarehouseTree/index.vue";
|
||||||
|
import MaterialSelect from "@/components/KLPService/MaterialSelect";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "Stock",
|
name: "Stock",
|
||||||
@@ -161,7 +150,8 @@ export default {
|
|||||||
ProductInfo,
|
ProductInfo,
|
||||||
BomInfoMini,
|
BomInfoMini,
|
||||||
StockIo,
|
StockIo,
|
||||||
WarehouseTree
|
WarehouseTree,
|
||||||
|
MaterialSelect
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
|||||||
Reference in New Issue
Block a user