diff --git a/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetailView.vue b/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetailView.vue index 439060b1..90aad00b 100644 --- a/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetailView.vue +++ b/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetailView.vue @@ -100,6 +100,11 @@ {{ form.ownerName }} + + + {{ form.purchaseDate }} + + {{ form.remark }} diff --git a/oms_web/oms_vue/src/views/purchaseorder/vendorConfirm.vue b/oms_web/oms_vue/src/views/purchaseorder/vendorConfirm.vue index cac7209c..43d74a38 100644 --- a/oms_web/oms_vue/src/views/purchaseorder/vendorConfirm.vue +++ b/oms_web/oms_vue/src/views/purchaseorder/vendorConfirm.vue @@ -211,6 +211,34 @@ + + + + + + + +
+ 取 消 + 确 定 +
+ @@ -273,6 +301,14 @@ export default { showHistoryDetailDrawer: false, // 历史详情订单数据 historyDetailOrderData: null, + // 采购日期确认弹窗 + purchaseDateDialogVisible: false, + purchaseDateForm: { + pruchaseDate: '' + }, + purchaseDateRules: { + pruchaseDate: [{ required: true, message: '请选择采购日期', trigger: 'change' }] + }, // 查询参数 queryParams: { pageNum: 1, @@ -344,17 +380,39 @@ export default { }, vendorConfirm(type) { + if (type === '1') { + this.purchaseDateForm.pruchaseDate = '' + this.purchaseDateDialogVisible = true; + this.$nextTick(() => { + this.$refs.purchaseDateForm && this.$refs.purchaseDateForm.clearValidate(); + }); + return; + } +// 调用后端发起供应商确认接口 + this.confirmVendor(type, null); + }, + confirmVendor(type, pruchaseDate) { // 调用后端发起供应商确认接口 let data = { id: this.detailOrderData.id, - confirmStatus: type // 设置确认状态为 1 (待确认) + confirmStatus: type, // 设置确认状态 + pruchaseDate }; vendorConfirmStatus(data).then(() => { this.showDetailDrawer=false; + this.purchaseDateDialogVisible = false; this.getList(); this.$modal.msgSuccess("操作成功"); }); }, + submitVendorConfirmWithDate() { + this.$refs.purchaseDateForm.validate(valid => { + if (!valid) { + return; + } + this.confirmVendor('1', this.purchaseDateForm.pruchaseDate); + }); + }, // 表单重置 /** 搜索按钮操作 */ handleQuery() { diff --git a/oms_web/oms_vue/src/views/system/product/selectProduct.vue b/oms_web/oms_vue/src/views/system/product/selectProduct.vue index ed87c034..eb6a8ca7 100644 --- a/oms_web/oms_vue/src/views/system/product/selectProduct.vue +++ b/oms_web/oms_vue/src/views/system/product/selectProduct.vue @@ -88,7 +88,7 @@ export default { watch: { visible(val) { if (val) { - this.queryParams.type = this.productType; // Update productType when dialog opens + this.initQueryParams(); this.getList(); } }, @@ -106,6 +106,18 @@ export default { } }, methods: { + /** 初始化查询条件 */ + initQueryParams() { + this.queryParams.pageNum = 1; + this.queryParams.pageSize = 10; + this.queryParams.productCode = null; + this.queryParams.model = null; + this.queryParams.type = this.productType; + this.queryParams.vendorCode = this.vendorCode || null; + if (this.$refs.queryForm) { + this.$refs.queryForm.resetFields(); + } + }, /** 查询产品列表 */ getList() { this.loading = true; diff --git a/oms_web/oms_vue/src/views/system/vendor/query.vue b/oms_web/oms_vue/src/views/system/vendor/query.vue index 4564eccf..a5c915ce 100644 --- a/oms_web/oms_vue/src/views/system/vendor/query.vue +++ b/oms_web/oms_vue/src/views/system/vendor/query.vue @@ -1,286 +1,229 @@ diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java index eaac6d26..161b7f27 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java @@ -4,6 +4,8 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; +import com.fasterxml.jackson.annotation.JsonAlias; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import lombok.Data; @@ -114,6 +116,11 @@ public class OmsPurchaseOrder extends BaseEntity /** 确认状态（待审批、已确认、或空） */ private String confirmStatus; + /** 采购日期 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @JsonAlias({"pruchaseDate"}) + private Date purchaseDate; + /** 流程类型（online线上 offline线下） */ @Excel(name = "流程类型", readConverterExp = "online=线上,offline=线下") private String flowType; diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java index a3e8859e..60d9b197 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java @@ -448,6 +448,9 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To @Override public int vendorConfirmStatus(OmsPurchaseOrder omsPurchaseOrder) { omsPurchaseOrder.setUpdateTime(DateUtils.getNowDate()); + if (OmsPurchaseOrder.ConfirmStatusEnum.REJECT.getCode().equals(omsPurchaseOrder.getConfirmStatus())) { + omsPurchaseOrder.setApproveStatus(ApproveStatusEnum.APPROVE_REJECT.getCode()); + } int i = omsPurchaseOrderMapper.updateOmsPurchaseOrder(omsPurchaseOrder); //发送邮件 diff --git a/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml index 114a0ec4..b132df40 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml @@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select t1.id, t1.purchase_no, t1.buyer_name, t1.buyer_address, t1.vendor_id, t1.currency, t1.purchaser_id, t1.purchaser_name , t1.purchaser_mobile, t1.purchaser_email, t1.warehouse_id, t1.pay_method, t1.owner_id, t1.owner_name, t1.remark, t1.total_amount - , t1.status, t1.approve_status, t1.approve_time, t1.approve_node, t1.confirm_status, t1.create_time, t1.update_time, t1.del_flag,t1.version,t1.flow_type + , t1.status, t1.approve_status, t1.approve_time, t1.approve_node, t1.confirm_status, t1.purchase_date, t1.create_time, t1.update_time, t1.del_flag,t1.version,t1.flow_type , t1.file_id from oms_purchase_order t1 @@ -70,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select t1.id, t1.purchase_no, t1.buyer_name, t1.buyer_address, t1.vendor_id, t1.currency, t1.purchaser_id, t1.purchaser_name , t1.purchaser_mobile, t1.purchaser_email, t1.warehouse_id, t1.pay_method, t1.owner_id, t1.owner_name, t1.remark, t1.total_amount,t1.flow_type - , t1.status, t1.approve_status, t1.approve_time, t1.approve_node, t1.confirm_status, t1.create_time, t1.update_time, t1.del_flag,t1.version + , t1.status, t1.approve_status, t1.approve_time, t1.approve_node, t1.confirm_status, t1.purchase_date, t1.create_time, t1.update_time, t1.del_flag,t1.version , t1.file_id ,t2.vendor_address,t2.vendor_name,t2.vendor_user,t2.vendor_code,t2.vendor_phone,t2.vendor_email,t3.warehouse_name,t1.remark, (select max(tax_rate) from oms_purchase_order_item as it where it.purchase_id = t1.id) as tax_rate @@ -118,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"