feat(wms-report): 新增品质筛选条件并优化部分查询组件
1. 多个报表页面新增品质筛选下拉选择器 2. 统一添加coil_quality_status字典依赖 3. 替换部分旧的逻辑库位选择组件为warehouse-select 4. 调整部分表单字段的prop属性和代码格式
This commit is contained in:
@@ -71,12 +71,19 @@
|
||||
<dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dict-type="coil_manufacturer"
|
||||
placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" multiple />
|
||||
</el-form-item>
|
||||
<!-- 逻辑库位仅在 team, day, month, year, all 类型时显示 -->
|
||||
<el-form-item v-if="['team', 'day', 'month', 'year', 'all'].includes(reportType)" label="逻辑库位"
|
||||
<el-form-item label="品质" prop="qualityStatusCsv">
|
||||
<muti-select v-model="queryParams.qualityStatusCsv" :options="dict.type.coil_quality_status"
|
||||
placeholder="请选择品质" clearable />
|
||||
</el-form-item>
|
||||
<!-- <el-form-item v-if="['team', 'day', 'month', 'year', 'all'].includes(reportType)" label="逻辑库位"
|
||||
prop="warehouseIds">
|
||||
<el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
|
||||
<el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="逻辑库位" prop="warehouseId">
|
||||
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
||||
style="width: 100%; display: inline-block; width: 200px;" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="handleQuery">查询</el-button>
|
||||
@@ -219,7 +226,7 @@ export default {
|
||||
name: 'MergeTemplate',
|
||||
props: {
|
||||
actionType: {
|
||||
type: Number,
|
||||
type: [Number, String],
|
||||
required: true
|
||||
},
|
||||
productionLine: {
|
||||
@@ -246,7 +253,7 @@ export default {
|
||||
ColumnsSetting,
|
||||
TimeRangePicker
|
||||
},
|
||||
dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
|
||||
dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer', 'coil_quality_status'],
|
||||
data() {
|
||||
// 工具函数:个位数补零
|
||||
const addZero = (num) => num.toString().padStart(2, '0')
|
||||
@@ -466,7 +473,7 @@ export default {
|
||||
this.loading = true;
|
||||
|
||||
// 所有报表类型都使用原始的 listPendingAction 方式获取数据
|
||||
const res = await listPendingAction({ ...this.queryParams, actionType: this.actionType, actionStatus: 2 });
|
||||
const res = await listPendingAction({ ...this.queryParams, actionTypes: this.actionType, actionStatus: 2 });
|
||||
// 获取两层数据
|
||||
const lossIds = res.rows.filter(item => item.coilId).map(item => item.coilId);
|
||||
const lossActionIds = res.rows.filter(item => item.actionId).map(item => item.actionId);
|
||||
|
||||
Reference in New Issue
Block a user