feat(CoilSelector): 添加物料类型选择并优化相关字段显示逻辑

添加物料类型选择下拉框,并根据选择的类型动态显示相关字段
将selectType默认值改为通过props传入的defaultType
优化查询逻辑,确保itemType与selectType保持一致
This commit is contained in:
砂糖
2026-04-14 16:08:33 +08:00
parent 5f5e5cacb4
commit a99126a9a3

View File

@@ -35,23 +35,29 @@
<el-input v-model="queryParams.currentCoilNo" placeholder="请输入当前卷号" clearable size="small"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="物料">
<muti-select v-model="queryParams.itemName" :options="dict.type.coil_itemname" placeholder="请选择物料"
<el-form-item label="物料类型">
<el-select v-model="queryParams.itemType" placeholder="请选择物料类型" size="small" clearable>
<el-option label="成品" value="product" />
<el-option label="原料" value="raw_material" />
</el-select>
</el-form-item>
<el-form-item label="物料名称" v-if="queryParams.itemType">
<muti-select v-model="queryParams.itemName" :options="dict.type.coil_itemname" placeholder="请选择物料名称"
clearable />
</el-form-item>
<el-form-item label="规格">
<el-form-item label="规格" v-if="queryParams.itemType">
<memo-input storageKey="coilSpec" v-model="queryParams.itemSpecification" placeholder="请输入规格" clearable
size="small" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="材质">
<el-form-item label="材质" v-if="queryParams.itemType">
<muti-select v-model="queryParams.itemMaterial" :options="dict.type.coil_material" placeholder="请选择材质"
clearable />
</el-form-item>
<el-form-item label="厂家">
<el-form-item label="厂家" v-if="queryParams.itemType">
<muti-select v-model="queryParams.itemManufacturer" :options="dict.type.coil_manufacturer" placeholder="请选择厂家"
clearable />
</el-form-item>
<el-form-item label="表面处理">
<el-form-item label="表面处理" v-if="queryParams.itemType">
<el-input v-model="queryParams.itemSurfaceTreatmentDesc" placeholder="请输入表面处理" clearable size="small" />
</el-form-item>
<el-form-item label="切边" prop="trimmingRequirement" v-if="orderBy">
@@ -266,6 +272,10 @@ export default {
orderId: {
type: String,
default: null
},
defaultType: {
type: String,
default: 'product'
}
},
data() {
@@ -287,7 +297,8 @@ export default {
itemMaterial: null,
itemManufacturer: null,
actualWarehouseId: null,
selectType: 'product',
itemType: this.defaultType,
selectType: this.defaultType,
status: 0, // 不包含已发货的钢卷
dataType: 1 // 只查询当前数据,不查询历史数据
},
@@ -485,6 +496,7 @@ export default {
...this.queryParams,
...this.filters,
};
queryPayload.selectType = queryPayload.itemType;
// 处于销售视角且my视图时只查询当前用户的钢卷
console.log('this.salesRestricted', this.salesRestricted, this.currentTab, this.currentUserId);
if (this.salesRestricted && this.currentTab === 'my') {
@@ -536,7 +548,8 @@ export default {
currentCoilNo: null,
grade: null,
dataType: 1,
selectType: 'raw_material',
itemType: this.defaultType,
selectType: this.defaultType,
};
this.getList();
},