diff --git a/public/importTemplates/orderImport.xlsx b/public/importTemplates/orderImport.xlsx
index 531ae69..498152e 100644
Binary files a/public/importTemplates/orderImport.xlsx and b/public/importTemplates/orderImport.xlsx differ
diff --git a/public/index.html b/public/index.html
index a89db15..7027717 100644
--- a/public/index.html
+++ b/public/index.html
@@ -38,8 +38,8 @@
<% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
diff --git a/src/components/SmallDialog.vue b/src/components/SmallDialog.vue
index d17cc70..9c91c3f 100644
--- a/src/components/SmallDialog.vue
+++ b/src/components/SmallDialog.vue
@@ -27,7 +27,10 @@
v-bind="col.elparams"
@change="handleSelectChange(col, $event)"
>
-
+
+ {{ opt.label }}
+ {{ opt[col.customLabel] || '-' }}
+
({ label: item.name, value: item.id }))
+ !col.customLabel
+ ? res.data.list.map((item) => ({ label: item.name, value: item.id }))
+ : res.data.list.map((item) => ({ label: item.name, value: item.id, [col.customLabel]: item[col.customLabel] }))
);
+ console.log(res.data.list.map((item) => ({ label: item.name, value: item.id, [col.customLabel]: item[col.customLabel] })))
} else {
this.$set(col, "options", []);
}
diff --git a/src/views/modules/pms/bomDetails/config.js b/src/views/modules/pms/bomDetails/config.js
index 3522faa..6daaa2c 100644
--- a/src/views/modules/pms/bomDetails/config.js
+++ b/src/views/modules/pms/bomDetails/config.js
@@ -174,6 +174,7 @@ export default function () {
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
elparams: { placeholder: "请选择物料", filterable: true },
options: [],
+ customLabel: 'description',
fetchData: () => this.$http.get("/pms/material/page", { params: { limit: 999, page: 1 } }),
},
],