diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java index ae88bc9f..bd3baa7a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java @@ -207,6 +207,8 @@ public class PaymentdocController { //修改采购订单为已付款申请 PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(entitys.getPurchaseorderId()); purchaseorderEntity.setIsPayment("1"); + int sum = purchaseorderEntity.getPaymentTime() + 1; + purchaseorderEntity.setPaymentTime(sum); purchaseorderService.updateById(purchaseorderEntity); } List PaymentdocItem1List = JsonUtil.getJsonToList(paymentdocCrForm.getPaymentdocitem1List(),PaymentdocItem1Entity.class); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java index a78ef888..08c6ef85 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchaseorderEntity.java @@ -148,4 +148,7 @@ public class PurchaseorderEntity { @TableField("is_payment") private String isPayment; + @TableField("PAYMENT_TIME") + private Integer paymentTime; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java index 0781422a..bd8519b4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java @@ -155,6 +155,9 @@ public class PurchaseorderitemEntity { @TableField("IS_PAYMENT") private String isPayment; + @TableField("PAYMENT_TIME") + private Integer paymentTime; + @TableField(exist = false) private List poundlistEntityList; @TableField(exist = false) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java index aa052b4a..f7bde4b0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java @@ -126,6 +126,9 @@ public class PurchaseorderInfoVO{ @JsonProperty("isPayment") private String isPayment; + @JsonProperty("paymentTime") + private String paymentTime; + /** 子表数据 **/ @JsonProperty("purchaseorder_item0List") private List purchaseorder_item0List; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java index 8608bd94..e7b53789 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java @@ -136,6 +136,9 @@ public class PurchaseorderListVO{ @JsonProperty("isPayment") private String isPayment; + @JsonProperty("paymentTime") + private String paymentTime; + @JsonProperty("poundlistEntityList") private List poundlistEntityList; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java index b98eda69..d9b01aaa 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java @@ -2,6 +2,7 @@ package jnpf.purchaseorder.model.purchaseorder; +import com.baomidou.mybatisplus.annotation.TableField; import jnpf.payment.model.payment.PaymentListVO; import jnpf.purchaseback.entity.PurchasebackEntity; import jnpf.purchaseorder.model.purchaseorder.Purchaseorder_item0Model; @@ -119,6 +120,9 @@ public class PurchaseorderUpForm{ @JsonProperty("status") private String status; + @JsonProperty("paymentTime") + private String paymentTime; + /** 子表数据 **/ @JsonProperty("purchaseorder_item0List") private List purchaseorder_item0List; diff --git a/SC-web/src/views/scm/basicInformation/natural/index.vue b/SC-web/src/views/scm/basicInformation/natural/index.vue index 43e195ea..240794ed 100644 --- a/SC-web/src/views/scm/basicInformation/natural/index.vue +++ b/SC-web/src/views/scm/basicInformation/natural/index.vue @@ -82,6 +82,12 @@ v-has="'btn_download'" >导出 + + @@ -429,6 +437,13 @@ export default { } this.search(); }, + printData(){ + let printHtml = document.getElementById('table-data').innerHTML; + let sysPrint = document.getElementById('iframe-spr'); + sysPrint.contentDocument.body.innerHTML = printHtml; + sysPrint.contentDocument.execCommand('Print'); + //window.print(); + } }, }; diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue index d769e0ee..ff99e9c0 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue @@ -284,7 +284,7 @@ +