From 872a90151e96a37932eb1543173c4509b7b1d110 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 16:59:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_银川_中盛建材' into dev_银川_中盛建材
---
src/views/basicData/product/ProductSelectDialog.vue | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/src/views/basicData/product/ProductSelectDialog.vue b/src/views/basicData/product/ProductSelectDialog.vue
index 3c826a5..bd0c7f5 100644
--- a/src/views/basicData/product/ProductSelectDialog.vue
+++ b/src/views/basicData/product/ProductSelectDialog.vue
@@ -1,28 +1,39 @@
<template>
<el-dialog v-model="visible"
title="閫夋嫨浜у搧"
- width="900px"
+ width="1000px"
destroy-on-close
:close-on-click-modal="false">
<el-form :inline="true"
:model="query"
- class="mb-2">
+ class="mb-2 search-form">
+ <el-form-item label="浜у搧鍚嶇О">
+ <el-input v-model="query.materialName"
+ size="small"
+ placeholder="杈撳叆浜у搧鍚嶇О"
+ clearable
+ @keyup.enter="onSearch" />
+ </el-form-item>
<el-form-item label="瑙勬牸">
<el-input v-model="query.specification"
+ size="small"
placeholder="杈撳叆瑙勬牸"
clearable
@keyup.enter="onSearch" />
</el-form-item>
<el-form-item label="鐗╂枡缂栫爜">
<el-input v-model="query.materialCode"
+ size="small"
placeholder="杈撳叆鐗╂枡缂栫爜"
clearable
@keyup.enter="onSearch" />
</el-form-item>
- <el-form-item>
+ <el-form-item style="200px">
<el-button type="primary"
+ size="small"
@click="onSearch">鎼滅储</el-button>
- <el-button @click="onReset">閲嶇疆</el-button>
+ <el-button size="small"
+ @click="onReset">閲嶇疆</el-button>
</el-form-item>
</el-form>
<!-- 鍒楄〃 -->
@@ -101,6 +112,7 @@
const query = reactive({
specification: "",
materialCode: "",
+ materialName: "",
});
const page = reactive({
@@ -163,6 +175,7 @@
function onReset() {
query.specification = "";
query.materialCode = "";
+ query.materialName = "";
page.pageNum = 1;
loadData();
}
@@ -194,6 +207,8 @@
const res: any = await modelListPage({
specification: query.specification.trim(),
materialCode: query.materialCode.trim(),
+ materialName: query.materialName.trim(),
+ type: 1,
current: page.pageNum,
size: page.pageSize,
});
@@ -218,3 +233,26 @@
loadData();
});
</script>
+
+<style scoped>
+ .search-form {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ margin-bottom: 10px;
+ }
+
+ .search-form .el-form-item {
+ margin-bottom: 0;
+ }
+
+ .search-form .el-input {
+ width: 180px;
+ }
+ .el-form--inline .el-form-item {
+ margin-right: 5px;
+ }
+ .justify-end {
+ margin-top: 10px;
+ }
+</style>
--
Gitblit v1.9.3