From 98c161da37edcb386a24d92b4155effbea173183 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 9 Mar 2023 08:48:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=8D=95=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E6=97=A5=E6=9C=9F=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 178bf1a1ae..d55ec056b6 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -1310,8 +1310,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(confirmation.getUseOrgSid()); BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(confirmation.getPurchaseSystemSid()).getData(); From b49325fcee418f1e1ec694f99df32bffdc1acec6 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 9 Mar 2023 09:05:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=87=91=E8=9D=B6?= =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=88=B0=E6=AC=BE?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/fin/api/kingdee/arreceivebill/ARReceivebill.java | 6 ++++++ .../FinCollectionConfirmationService.java | 2 ++ .../yxt/anrui/fin/biz/kingdee/arreceivebill/data_model.json | 1 + 3 files changed, 9 insertions(+) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/arreceivebill/ARReceivebill.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/arreceivebill/ARReceivebill.java index 610435a753..33052afcaa 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/arreceivebill/ARReceivebill.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/arreceivebill/ARReceivebill.java @@ -48,6 +48,12 @@ public class ARReceivebill { @JsonProperty("F_PAEZ_AssistantKey") @NotBlank(message = "F_PAEZ_AssistantKey不能为空") public String F_PAEZ_AssistantKey; + /** + * 到款日期 + */ + @JsonProperty("F_PAEZ_Date") + @NotBlank(message = "F_PAEZ_Date不能为空") + public String F_PAEZ_Date; /** * //备注:FREMARK (必填项) */ diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index d55ec056b6..730b56f4ea 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -1311,6 +1311,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(confirmation.getUseOrgSid()); BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(confirmation.getPurchaseSystemSid()).getData(); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_model.json index b6cf661233..9217eda55e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/arreceivebill/data_model.json @@ -5,6 +5,7 @@ }, "FBillNo": "@KD_FBillNo", "FDATE": "@KD_FDATE", + "F_PAEZ_Date": "@KD_F_PAEZ_Date", "FCONTACTUNITTYPE": "BD_Customer", "FCONTACTUNIT": { "FNumber": "@KD_FCONTACTUNIT" From f2c287d5a624b1d5f1d947c93c85c9a0ee51b448 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 9 Mar 2023 11:33:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E7=AE=A1=E7=90=86--=E6=89=80=E5=9C=A8=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue index 655d96888c..1a8be37bc5 100644 --- a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue +++ b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue @@ -1106,7 +1106,7 @@ export default { } else { this.isQuit = true } - this.orgName_list = data.sysStaffOrg.orgSid + this.orgName_list = data.sysStaffOrg.orgSidPath.split('/') let bb = {} this.postSid_list.forEach((e) => { if (e.sid === data.sysStaffPost.postSid) {