+ :label="getLabel(item)" :value="item.productId">
+
- {{ item.productName }}
- {{ getSku(item) }}
+ {{ getLabel(item) }}
+
@@ -140,10 +141,17 @@ export default {
},
methods: {
getProductOptions() {
- listProductWithBom({ pageNum: 1, pageSize: 1000, type: 'product' }).then(res => {
+ listProductWithBom({ pageNum: 1, pageSize: 1000 }).then(res => {
this.productOptions = res.rows || [];
});
},
+ getLabel(item) {
+ // 产品名称[规格](SKU),如果有则写,没有则省略
+ if (!item.specification) {
+ return `${item.productName}(${this.getSku(item)})`
+ }
+ return `${item.productName}[${item.specification}](${this.getSku(item)})`
+ },
getSku(item) {
const boms = item.bomItems || [];
console.log(boms, '产品BOM');
diff --git a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
index 5eddac8f..e98ebd63 100644
--- a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
+++ b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
@@ -7,11 +7,12 @@
未搜索到原材料
+ :label="getLabel(item)" :value="item.rawMaterialId">
- {{ item.rawMaterialName }}
- {{ getSku(item) }}
+ {{ getLabel(item) }}
+
@@ -148,6 +149,13 @@ export default {
const rawMaterial = this.options.find(p => p.rawMaterialId === val);
this.$emit('change', rawMaterial);
},
+ getLabel(item) {
+ // 原材料名称[规格](SKU),如果有则写,没有则省略
+ if (!item.specification) {
+ return `${item.rawMaterialName}(${this.getSku(item)})`
+ }
+ return `${item.rawMaterialName}[${item.specification}](${this.getSku(item)})`
+ },
getSku(item) {
const boms = item.bomItems;
if (!boms || boms.length === 0) {
diff --git a/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue b/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
index 5928b3ce..9caa53e1 100644
--- a/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
+++ b/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
@@ -22,6 +22,9 @@
{{ product.productCode || '--' }}
+
+ {{ product.specification || '--' }}
+
diff --git a/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue b/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
index 3200a7d4..fae21e1a 100644
--- a/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
+++ b/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
@@ -12,6 +12,7 @@
{{ material.rawMaterialId }}
{{ material.rawMaterialName }}
{{ material.rawMaterialCode }}
+
{{ material.specification }}
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 5e0d1dc2..cb93dd28 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -391,7 +391,7 @@ export default {
...row,
itemName: item?.itemName || '',
material: material?.attrValue || '',
- specification: specification?.attrValue || '',
+ specification: specification?.attrValue || item?.specification || '',
};
},
/** 下载二维码 */
diff --git a/klp-ui/src/views/wms/product/index.vue b/klp-ui/src/views/wms/product/index.vue
index f6e21c59..2f6c32f6 100644
--- a/klp-ui/src/views/wms/product/index.vue
+++ b/klp-ui/src/views/wms/product/index.vue
@@ -20,6 +20,9 @@
+
+
+
@@ -306,7 +314,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 20,
- type: 'product',
+ type: undefined,
productCode: undefined,
productName: undefined,
owner: undefined,
@@ -317,6 +325,7 @@ export default {
thickness: undefined,
width: undefined,
innerDiameter: undefined,
+ specification: undefined,
isEnabled: undefined,
},
// 表单参数
@@ -381,7 +390,8 @@ export default {
createBy: undefined,
updateTime: undefined,
updateBy: undefined,
- type: 'product'
+ type: undefined,
+ specification: undefined,
};
this.resetForm("form");
},
diff --git a/klp-ui/src/views/wms/rawMaterial/index.vue b/klp-ui/src/views/wms/rawMaterial/index.vue
index 1bbc76f6..691b80a7 100644
--- a/klp-ui/src/views/wms/rawMaterial/index.vue
+++ b/klp-ui/src/views/wms/rawMaterial/index.vue
@@ -17,6 +17,9 @@
@keyup.enter.native="handleQuery"
/>
+
+
+