@@ -76,7 +76,7 @@ | |||||
:value="opt.value"> | :value="opt.value"> | ||||
<span>{{ opt.label }}</span> | <span>{{ opt.label }}</span> | ||||
<span v-if="col.customLabel" style="display: inline-clock; margin-left: 12px; font-size: 0.9em"> | <span v-if="col.customLabel" style="display: inline-clock; margin-left: 12px; font-size: 0.9em"> | ||||
{{ opt[col.customLabel] || "-" }} | |||||
{{ opt[col.customLabel] || "无描述" }} | |||||
</span> | </span> | ||||
</el-option> | </el-option> | ||||
</el-select> | </el-select> | ||||
@@ -94,7 +94,7 @@ | |||||
:value="opt.value"> | :value="opt.value"> | ||||
<span>{{ opt.label }}</span> | <span>{{ opt.label }}</span> | ||||
<span v-if="col.customLabel" style="display: inline-clock; margin-left: 12px; font-size: 0.9em"> | <span v-if="col.customLabel" style="display: inline-clock; margin-left: 12px; font-size: 0.9em"> | ||||
{{ opt[col.customLabel] || "-" }} | |||||
{{ opt[col.customLabel] || "无描述" }} | |||||
</span> | </span> | ||||
</el-option> | </el-option> | ||||
</el-select> | </el-select> | ||||
@@ -298,9 +298,21 @@ export default { | |||||
col, | col, | ||||
"options", | "options", | ||||
"list" in res.data | "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, | label: col.optionLabel ? i[col.optionLabel] : i.name, | ||||
value: col.optionValue ? i[col.optionValue] : i.id, | value: col.optionValue ? i[col.optionValue] : i.id, | ||||
[col.customLabel]: i[col.customLabel], | |||||
})) | })) | ||||
: res.data.map((i) => ({ | : res.data.map((i) => ({ | ||||
label: col.optionLabel ? i[col.optionLabel] : i.name, | label: col.optionLabel ? i[col.optionLabel] : i.name, | ||||
@@ -125,9 +125,10 @@ export default function () { | |||||
label: "原料", | label: "原料", | ||||
prop: "material", | prop: "material", | ||||
optionValue: 'code', | optionValue: 'code', | ||||
customLabel: 'description', | |||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" }, | rules: { required: true, message: "必填项不能为空", trigger: "blur" }, | ||||
// elparams: { placeholder: "请输入原料名称" }, | // elparams: { placeholder: "请输入原料名称" }, | ||||
elparams: { placeholder: "请选择原料" }, | |||||
elparams: { filterable: true, placeholder: "请选择原料" }, | |||||
fetchData: () => this.$http.get("/pms/material/page", { params: { limit: 999, page: 1 } }), | fetchData: () => this.$http.get("/pms/material/page", { params: { limit: 999, page: 1 } }), | ||||
// rules: { required: true, message: "必填项不能为空", trigger: "change" }, | // rules: { required: true, message: "必填项不能为空", trigger: "change" }, | ||||
}, | }, | ||||
@@ -149,7 +150,8 @@ export default function () { | |||||
options: [], | options: [], | ||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" }, | rules: { required: true, message: "必填项不能为空", trigger: "blur" }, | ||||
fetchData: () => this.$http.get("/pms/materialStorage/page", { params: { page: 1, limit: 999, typeDictValue: '0' } }), | 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', | prop: 'silo2', | ||||
@@ -158,7 +160,8 @@ export default function () { | |||||
options: [], | options: [], | ||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" }, | rules: { required: true, message: "必填项不能为空", trigger: "blur" }, | ||||
fetchData: () => this.$http.get("/pms/materialStorage/page", { params: { page: 1, limit: 999, typeDictValue: '0' } }), | 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', | prop: 'silo3', | ||||
@@ -167,7 +170,8 @@ export default function () { | |||||
options: [], | options: [], | ||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" }, | rules: { required: true, message: "必填项不能为空", trigger: "blur" }, | ||||
fetchData: () => this.$http.get("/pms/materialStorage/page", { params: { page: 1, limit: 999, typeDictValue: '0' } }), | fetchData: () => this.$http.get("/pms/materialStorage/page", { params: { page: 1, limit: 999, typeDictValue: '0' } }), | ||||
elparams: { placeholder: "请选择上料料仓3" } | |||||
elparams: { filterable: true, placeholder: "请选择上料料仓3" }, | |||||
customLabel: 'description', | |||||
}, | }, | ||||
], | ], | ||||
[ | [ | ||||
@@ -163,8 +163,9 @@ export default function () { | |||||
prop: "baseMaterialId", | prop: "baseMaterialId", | ||||
options: [], | options: [], | ||||
optionLabel: "code", | optionLabel: "code", | ||||
customLabel: 'description', | |||||
fetchData: () => this.$http.get("/pms/baseMaterial/page", { params: { limit: 999, page: 1, key: "" } }), | fetchData: () => this.$http.get("/pms/baseMaterial/page", { params: { limit: 999, page: 1, key: "" } }), | ||||
elparams: { placeholder: "请选择基础原料" }, | |||||
elparams: { filterable: true, placeholder: "请选择基础原料" }, | |||||
}, | }, | ||||
// { | // { | ||||
// input: true, | // input: true, | ||||
@@ -110,7 +110,7 @@ export default function () { | |||||
options: [], | options: [], | ||||
customLabel: 'description', | customLabel: 'description', | ||||
rules: { required: true, message: "必填项不能为空", trigger: "change" }, | rules: { required: true, message: "必填项不能为空", trigger: "change" }, | ||||
elparams: { placeholder: "请选择原料" }, | |||||
elparams: { filterable: true, placeholder: "请选择原料" }, | |||||
}, | }, | ||||
// { | // { | ||||
// input: true, | // input: true, | ||||