diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorder/vo/PurchaseOrderPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorder/vo/PurchaseOrderPageReqVO.java
index bfdbc54f..28550d9e 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorder/vo/PurchaseOrderPageReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseorder/vo/PurchaseOrderPageReqVO.java
@@ -29,7 +29,7 @@ public class PurchaseOrderPageReqVO extends PageParam {
private Long supplierId;
@Schema(description = "供应商名称")
- private Long supplierName;
+ private String supplierName;
@Schema(description = "采购合同号")
private String contractNo;
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 754ae5d2..1c6e75ef 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
@@ -163,7 +163,7 @@
@change="(val) => handleMatName(scope, val)" class="!w-180px">
-->
-
+
@@ -554,19 +554,19 @@ const handleDelete2 = (index: number) => {
// 保存物料信息
const saveMaterials = async () =>{
- formData.value.matItemDOList.forEach(item => {
+ formData.value.matItemDOList.forEach(async item => {
var subData = item as unknown as PurchaseOrderMaterialApi.PurchaseOrderMaterialVO
subData.materialId = item.matId
subData.purchaseOrderId = formData.value.id
if (subData.id == undefined) {
- subData.id = PurchaseOrderMaterialApi.createPurchaseOrderMaterial(subData)
+ subData.id = await PurchaseOrderMaterialApi.createPurchaseOrderMaterial(subData)
} else {
- PurchaseOrderMaterialApi.updatePurchaseOrderMaterial(subData)
+ await PurchaseOrderMaterialApi.updatePurchaseOrderMaterial(subData)
}
})
formData.value.matItemRemoveList.forEach(item =>{
if (item.id != undefined) {
- PurchaseOrderMaterialApi.deletePurchaseOrderMaterial(item.id)
+ await PurchaseOrderMaterialApi.deletePurchaseOrderMaterial(item.id)
}
})
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue
index 37358187..49d1e042 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue
@@ -189,7 +189,9 @@ const getList = async () => {
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
- queryParams.createTime= formatDate(queryParams.createTime, 'YYYY-MM-DD')
+ if(queryParams.createTime !== "Invalid Date"){
+ queryParams.createTime= formatDate(queryParams.createTime, 'YYYY-MM-DD')
+ }
getList()
}