diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/vo/MaterialRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/vo/MaterialRespVO.java
index 5b0b4006..58380b30 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/vo/MaterialRespVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/material/vo/MaterialRespVO.java
@@ -27,6 +27,9 @@ public class MaterialRespVO {
@ExcelProperty("物料名称")
private String name;
+ @Schema(description = "物料名称和编码")
+ private String codeAndName;
+
@Schema(description = "品牌")
@ExcelProperty("品牌")
private String brand;
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
index 1e0b2341..11c71d5e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/edit.vue
@@ -361,7 +361,6 @@ const formData = ref({
purchaseNo:undefined,
supplierId:undefined,
contractNo:undefined,
- purchaseNo:undefined,
projectMaterialPlanNo: undefined,
projectMaterialPlanId: undefined,
goodsType: undefined,
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
index 8d19529c..8ebd2b11 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
@@ -21,7 +21,7 @@
-
@@ -95,11 +95,11 @@
-
+
编辑
- 查看
+ 查看详情