From 8044a8634171e2faee1145b313211603f2649e12 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 10 Apr 2025 09:06:54 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=9E=8D=E8=B5=84?=
 =?UTF-8?q?=E5=B9=B3=E4=BB=93=E4=BB=98=E6=AC=BE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../financingClosingPayment/financingClosingPayment.vue      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue
index 4a67166cdb..d88f16ea2b 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue
@@ -53,6 +53,11 @@
                 <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
+            <el-table-column label="支付状态" align="center" width="110">
+              <template slot-scope="scope">
+                <span>{{ scope.row.state == '1' ? '未支付' : scope.row.state == '2' ? '支付中' : scope.row.state == '3' ? '已支付' : '' }}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="costTitleValue" label="款项名称" align="center" width="140" />
             <el-table-column prop="openDate" label="融资付款开通日期" align="center" width="160" />
             <el-table-column prop="period" label="期数" align="center" width="100" />

From ea9a7d5e9859889fe69b8ec0b4b575fbae781749 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 10 Apr 2025 09:31:53 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=9E=8D=E8=B5=84?=
 =?UTF-8?q?=E5=B9=B3=E4=BB=93=E4=BB=98=E6=AC=BE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../financingClosingPayment/financingClosingPayment.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue
index d88f16ea2b..267f4007fe 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/financingClosingPayment/financingClosingPayment.vue
@@ -50,7 +50,7 @@
             <el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center" />
             <el-table-column fixed label="操作" width="180" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
+                <el-button type="primary" :disabled="scope.row.state == '2' || scope.row.state == '3'" size="mini" @click="toEdit(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
             <el-table-column label="支付状态" align="center" width="110">

From 3b5f6a7b6d1501a39c1942f1b40705ce2134db19 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 10 Apr 2025 09:42:45 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E3=80=81=E9=A2=84=E6=9C=9F=E5=88=B0?=
 =?UTF-8?q?=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/storage/deliveryNotice/index.vue    |  2 +-
 .../receivingGoods/receivingGoodsAdd.vue      | 26 +++++++------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/yxt-as-ui/src/views/storage/deliveryNotice/index.vue b/yxt-as-ui/src/views/storage/deliveryNotice/index.vue
index e3b7a2c38a..e8f504d21c 100644
--- a/yxt-as-ui/src/views/storage/deliveryNotice/index.vue
+++ b/yxt-as-ui/src/views/storage/deliveryNotice/index.vue
@@ -399,7 +399,7 @@ export default {
       if (this.selectionList[0].billState === '已收货(部分终止)') {
         this.$message({
           type: 'warning',
-          message: '此记录已终止,不可在收货。',
+          message: '此记录已终止,不可再收货。',
           showClose: true
         })
         return
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
index 86edc07208..36d4708701 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
@@ -56,7 +56,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty"><span class="must">*</span> 收货人是否与上架人一致</div>
+              <div class="span-sty"><span class="must">*</span>收货人是否与上架人一致</div>
               <el-form-item prop="isUpShelf">
                 <el-radio-group v-model="formobj.isUpShelf" size="small" class="addinputInfo">
                   <el-radio :label="1">是</el-radio>
@@ -369,37 +369,29 @@ export default {
 }
 </script>
 <style scoped>
-/deep/ .el-form-item__error {
-  margin-left: 120px !important;
-}
-
 .must {
   color: #f00;
 }
 
 .span-sty {
-  width: 130px !important;
+  width: 150px !important;
 }
 
 .addinputInfo {
-  margin-left: 120px !important;
+  margin-left: 140px !important;
 }
 
 .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-  margin-left: 120px !important;
-  width: calc(100% - 115px);
+  margin-left: 140px !important;
+  width: calc(100% - 135px);
 }
 
-.first_row {
-  border-top: 1px solid #E0E3EB;
+/deep/ .el-form-item__error {
+  margin-left: 140px !important;
 }
 
-.titleOne {
-  padding: 7px;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
+.first_row {
+  border-top: 1px solid #E0E3EB;
 }
 
 .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {

From a5f3dc926d62ef0d5a45b695162dce02e513c1ac Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Thu, 10 Apr 2025 09:56:46 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=87=91=E8=9D=B6=E4=BB=98=E6=AC=BE=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fin/biz/finpaymentrecord/FinPaymentrecordService.java     | 3 ---
 .../kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java   | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
index 0bad6db5ab..37d80a0749 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
@@ -52,8 +52,6 @@ import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank;
 import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelow;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
 import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentrecord.*;
@@ -73,7 +71,6 @@ import com.yxt.anrui.fin.biz.kingdee.voucher.VoucherService;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.flow.FlowableFeign;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
-import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java
index f7316c8d4d..9252e25082 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java
@@ -47,8 +47,8 @@ public class ApPayBillCastToKingDeeBillFields {
             for (Map.Entry<String, String> entry : params.entrySet()) {
                 map_fEntityDetail_.put(entry.getKey(),entry.getValue());
             }
-            fPAYBILLENTRY_ =KingDeeUtils.replaceTemplateParams(fPAYBILLENTRY_, map_fEntityDetail_);
-            list_fEntityDetail_.add(JSONObject.parseObject(fPAYBILLENTRY_,Feature.OrderedField));
+           String fPAYBILLENTRY_NEW =KingDeeUtils.replaceTemplateParams(fPAYBILLENTRY_, map_fEntityDetail_);
+            list_fEntityDetail_.add(JSONObject.parseObject(fPAYBILLENTRY_NEW,Feature.OrderedField));
         }
 
         jsonFEntityModel_.put("FPAYBILLENTRY", JSONArray.parseArray(JSON.toJSONString(list_fEntityDetail_)));