diff --git a/src/components/DialogJustForm.vue b/src/components/DialogJustForm.vue
index cd27b82..2aa42b9 100644
--- a/src/components/DialogJustForm.vue
+++ b/src/components/DialogJustForm.vue
@@ -76,7 +76,7 @@
:value="opt.value">
{{ opt.label }}
- {{ opt[col.customLabel] || "-" }}
+ {{ opt[col.customLabel] || "无描述" }}
diff --git a/src/components/DialogWithMenu.vue b/src/components/DialogWithMenu.vue
index 9be8f89..7ad81f8 100644
--- a/src/components/DialogWithMenu.vue
+++ b/src/components/DialogWithMenu.vue
@@ -94,7 +94,7 @@
:value="opt.value">
{{ opt.label }}
- {{ opt[col.customLabel] || "-" }}
+ {{ opt[col.customLabel] || "无描述" }}
@@ -298,9 +298,21 @@ export default {
col,
"options",
"list" in res.data
- ? res.data.list.map((i) => ({
+ ? "customLabel" in col
+ ? res.data.list.map((i) => ({
+ label: col.optionLabel ? i[col.optionLabel] : i.name,
+ value: col.optionValue ? i[col.optionValue] : i.id,
+ [col.customLabel]: i[col.customLabel],
+ }))
+ : res.data.list.map((i) => ({
+ label: col.optionLabel ? i[col.optionLabel] : i.name,
+ value: col.optionValue ? i[col.optionValue] : i.id,
+ }))
+ : "customLabel" in col
+ ? res.data.map((i) => ({
label: col.optionLabel ? i[col.optionLabel] : i.name,
value: col.optionValue ? i[col.optionValue] : i.id,
+ [col.customLabel]: i[col.customLabel],
}))
: res.data.map((i) => ({
label: col.optionLabel ? i[col.optionLabel] : i.name,
diff --git a/src/views/modules/pms/brokeLog/config.js b/src/views/modules/pms/brokeLog/config.js
index 8d7626c..3db7914 100644
--- a/src/views/modules/pms/brokeLog/config.js
+++ b/src/views/modules/pms/brokeLog/config.js
@@ -125,9 +125,10 @@ export default function () {
label: "原料",
prop: "material",
optionValue: 'code',
+ customLabel: 'description',
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { placeholder: "请输入原料名称" },
- elparams: { placeholder: "请选择原料" },
+ elparams: { filterable: true, placeholder: "请选择原料" },
fetchData: () => this.$http.get("/pms/material/page", { params: { limit: 999, page: 1 } }),
// rules: { required: true, message: "必填项不能为空", trigger: "change" },
},
@@ -149,7 +150,8 @@ export default function () {
options: [],
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
fetchData: () => this.$http.get("/pms/materialStorage/page", { params: { page: 1, limit: 999, typeDictValue: '0' } }),
- elparams: { placeholder: "请选择上料料仓1" }
+ elparams: { filterable: true, placeholder: "请选择上料料仓1" },
+ customLabel: 'description',
},
{
prop: 'silo2',
@@ -158,7 +160,8 @@ export default function () {
options: [],
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
fetchData: () => this.$http.get("/pms/materialStorage/page", { params: { page: 1, limit: 999, typeDictValue: '0' } }),
- elparams: { placeholder: "请选择上料料仓2" }
+ elparams: { filterable: true, placeholder: "请选择上料料仓2" },
+ customLabel: 'description',
},
{
prop: 'silo3',
@@ -167,7 +170,8 @@ export default function () {
options: [],
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
fetchData: () => this.$http.get("/pms/materialStorage/page", { params: { page: 1, limit: 999, typeDictValue: '0' } }),
- elparams: { placeholder: "请选择上料料仓3" }
+ elparams: { filterable: true, placeholder: "请选择上料料仓3" },
+ customLabel: 'description',
},
],
[
diff --git a/src/views/modules/pms/material/config.js b/src/views/modules/pms/material/config.js
index d129510..386320a 100644
--- a/src/views/modules/pms/material/config.js
+++ b/src/views/modules/pms/material/config.js
@@ -163,8 +163,9 @@ export default function () {
prop: "baseMaterialId",
options: [],
optionLabel: "code",
+ customLabel: 'description',
fetchData: () => this.$http.get("/pms/baseMaterial/page", { params: { limit: 999, page: 1, key: "" } }),
- elparams: { placeholder: "请选择基础原料" },
+ elparams: { filterable: true, placeholder: "请选择基础原料" },
},
// {
// input: true,
diff --git a/src/views/modules/pms/materialStorageDynamic/config.js b/src/views/modules/pms/materialStorageDynamic/config.js
index 82ff94e..7aa554c 100644
--- a/src/views/modules/pms/materialStorageDynamic/config.js
+++ b/src/views/modules/pms/materialStorageDynamic/config.js
@@ -110,7 +110,7 @@ export default function () {
options: [],
customLabel: 'description',
rules: { required: true, message: "必填项不能为空", trigger: "change" },
- elparams: { placeholder: "请选择原料" },
+ elparams: { filterable: true, placeholder: "请选择原料" },
},
// {
// input: true,