Merge remote-tracking branch 'origin/master'

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  (必填项)
      */

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1310,8 +1310,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         //推送收款单
         ARReceivebill arReceivebill = new ARReceivebill();
         //业务日期
-//        arReceivebill.setFDATE(DateUtil.today());
-        arReceivebill.setFDATE(confirmation.getCreateDate());//收款日期
+        arReceivebill.setFDATE(DateUtil.today());
+        //收款日期
+        arReceivebill.setF_PAEZ_Date(confirmation.getCollectionDate());
         //收款组织
         ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(confirmation.getUseOrgSid());
         BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(confirmation.getPurchaseSystemSid()).getData();

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"

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) {