From f3a39a110bf0b1509830523d156a5fa00867fb6b Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 9 Apr 2025 11:15:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81?=
=?UTF-8?q?=E9=80=80=E8=B4=A7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../merchandisereturn/merchandisereturnAdd.vue | 16 ++++++++++++++++
.../merchandisereturn/merchandisereturnInfo.vue | 4 ++++
.../merchandisereturnDaiBan.vue | 4 ++++
.../shangpintuihuoFlow/merchandisereturnEdit.vue | 16 ++++++++++++++++
.../merchandisereturnYiBan.vue | 4 ++++
5 files changed, 44 insertions(+)
diff --git a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
index 42bbdd4254..b3e8654762 100644
--- a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
+++ b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
@@ -139,6 +139,10 @@
+
+
+
+
@@ -191,6 +195,10 @@
+
+
+
+
@@ -513,6 +521,14 @@ export default {
goodsSkuTitle: row.goodsSpuName,
goodsSkuCode: row.goodsSkuCode,
unit: row.unit,
+ warehouseName: row.warehouseName,
+ warehouseSid: row.warehouseSid,
+ wareZoneName: row.wareZoneName,
+ wareZoneSid: row.wareZoneSid,
+ wareAreaName: row.wareAreaName,
+ wareAreaSid: row.wareAreaSid,
+ warehouseRackCode: row.warehouseRackCode,
+ warehouseRackSid: row.warehouseRackSid,
goodsSkuOwnSpec: row.goodsSkuOwnSpec,
currentCount: row.count,
returnedCount: row.returnedCount,
diff --git a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
index b2ea016cdf..7ddceeaac8 100644
--- a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
+++ b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
@@ -128,6 +128,10 @@
+
+
+
+
diff --git a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
index e4cf7bb83c..8dbfb2a7d9 100644
--- a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
@@ -131,6 +131,10 @@
+
+
+
+
diff --git a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
index a0258df10b..bea1b6b3de 100644
--- a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
@@ -138,6 +138,10 @@
+
+
+
+
@@ -191,6 +195,10 @@
+
+
+
+
@@ -506,6 +514,14 @@ export default {
goodsSkuTitle: '',
goodsSkuCode: row.goodsSkuCode,
unit: row.unit,
+ warehouseName: row.warehouseName,
+ warehouseSid: row.warehouseSid,
+ wareZoneName: row.wareZoneName,
+ wareZoneSid: row.wareZoneSid,
+ wareAreaName: row.wareAreaName,
+ wareAreaSid: row.wareAreaSid,
+ warehouseRackCode: row.warehouseRackCode,
+ warehouseRackSid: row.warehouseRackSid,
goodsSkuOwnSpec: row.goodsSkuOwnSpec,
currentCount: row.count,
returnedCount: row.returnedCount,
diff --git a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
index 9c3206cda8..fd35af9f2e 100644
--- a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
@@ -128,6 +128,10 @@
+
+
+
+
From 2b9618b6c9bc39e136309fe00f276eb3603c076f Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 9 Apr 2025 14:25:11 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=B4=A2=E8=B5=94?=
=?UTF-8?q?=E5=8D=95=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../claimbilling/claimbillingAdd.vue | 22 +++++++++++++++++--
.../suopeikaipiaoFlow/claimbillingEdit.vue | 22 +++++++++++++++++--
2 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue b/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue
index 94f5067bc4..d283344507 100644
--- a/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue
+++ b/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue
@@ -32,7 +32,7 @@
开票单位
-
+
@@ -338,13 +338,27 @@ export default {
}
},
computed: {
+ // 开票金额 = 开票索赔单列表(工时费 + 材料费 + 厂家补助 + 施救费 + 外出费 + 其它费用) + 调增当月收入项目列表中金额合计 - 调减当月收入项目列表中金额合计
kpjeTtotal() {
- let kpje = '0'
+ let kpje = 0
+ // 开票索赔单列表(工时费 + 材料费 + 厂家补助 + 施救费 + 外出费 + 其它费用)
if (this.formobj.detailList.length > 0) {
this.formobj.detailList.forEach((e) => {
kpje = Math.round((parseFloat(kpje) + parseFloat(e.claimHourAmount) + parseFloat(e.claimGoodsAmount) + parseFloat(e.claimOutAmount) + parseFloat(e.claimSubsidyAmount) + parseFloat(e.claimRescueAmount) + parseFloat(e.claimOtherAmount)) * 100) / 100
})
}
+ // 调增当月收入项目列表中金额合计
+ if (this.formobj.supplementaryItems.length > 0) {
+ this.formobj.supplementaryItems.forEach((e) => {
+ kpje = Math.round((parseFloat(kpje) + parseFloat(e.amount)) * 100) / 100
+ })
+ }
+ // 调减当月收入项目列表中金额合计
+ if (this.formobj.deductionItems.length > 0) {
+ this.formobj.deductionItems.forEach((e) => {
+ kpje = Math.round((parseFloat(kpje) - parseFloat(e.amount)) * 100) / 100
+ })
+ }
return kpje
}
},
@@ -768,6 +782,10 @@ export default {
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+ margin-left: 120px !important;
+ width: calc(100% - 115px);
+}
.titleOne {
font-weight: bold;
font-size: 16px;
diff --git a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue
index eba344db62..579549d9dd 100644
--- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue
@@ -31,7 +31,7 @@
开票单位
-
+
@@ -337,13 +337,27 @@ export default {
}
},
computed: {
+ // 开票金额 = 开票索赔单列表(工时费 + 材料费 + 厂家补助 + 施救费 + 外出费 + 其它费用) + 调增当月收入项目列表中金额合计 - 调减当月收入项目列表中金额合计
kpjeTtotal() {
- let kpje = '0'
+ let kpje = 0
+ // 开票索赔单列表(工时费 + 材料费 + 厂家补助 + 施救费 + 外出费 + 其它费用)
if (this.formobj.detailList.length > 0) {
this.formobj.detailList.forEach((e) => {
kpje = Math.round((parseFloat(kpje) + parseFloat(e.claimHourAmount) + parseFloat(e.claimGoodsAmount) + parseFloat(e.claimOutAmount) + parseFloat(e.claimSubsidyAmount) + parseFloat(e.claimRescueAmount) + parseFloat(e.claimOtherAmount)) * 100) / 100
})
}
+ // 调增当月收入项目列表中金额合计
+ if (this.formobj.supplementaryItems.length > 0) {
+ this.formobj.supplementaryItems.forEach((e) => {
+ kpje = Math.round((parseFloat(kpje) + parseFloat(e.amount)) * 100) / 100
+ })
+ }
+ // 调减当月收入项目列表中金额合计
+ if (this.formobj.deductionItems.length > 0) {
+ this.formobj.deductionItems.forEach((e) => {
+ kpje = Math.round((parseFloat(kpje) - parseFloat(e.amount)) * 100) / 100
+ })
+ }
return kpje
}
},
@@ -728,6 +742,10 @@ export default {
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+ margin-left: 120px !important;
+ width: calc(100% - 115px);
+}
.titleOne {
font-weight: bold;
font-size: 16px;
From 835515c3f8331b8e5e8b1710ea3ede9f8cdefcc4 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 9 Apr 2025 15:03:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=98=E6=AC=BE?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7--=E9=80=89=E6=8B=A9=E8=9E=8D=E8=B5=84?=
=?UTF-8?q?=E5=B9=B3=E4=BB=93=E4=BB=98=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../anruifinmanagement/fukuanshenqing/paymentAdd.vue | 1 +
.../fukuanshenqing/relation/closingPayment.vue | 12 +++++-------
.../fukuanguanliFlow/fukuanguanli/fukuanEdit.vue | 1 +
.../fukuanguanli/relation/closingPayment.vue | 12 +++++-------
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
index 6d9aef59ea..6a5f8c4234 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
@@ -620,6 +620,7 @@ export default {
this.formobj.eveList.push({
sid: '', // sid
applySid: '', // 付款申请sid
+ eveSid: e.sid, // 平仓款Sid
costTitleValue: e.costTitleValue, // 平仓款名称
openDate: e.openDate, // 融资付款开通日期
period: e.period, // 期(台)数
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue
index b30038a4b4..3b46aaf660 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue
@@ -136,13 +136,11 @@ export default {
this.listQuery.params.useOrgSid = createOrgSid
this.listQuery.params.payCompanySid = payCompanySid
const aa = []
- // if (value.length > 0) {
- // for (var i = 0; i < value.length; i++) {
- // for (var j = 0; j < value[i].vehRebateSids.length; j++) {
- // aa.push(value[i].vehRebateSids[j])
- // }
- // }
- // }
+ if (value.length > 0) {
+ for (var i = 0; i < value.length; i++) {
+ aa.push(value[i].eveSid)
+ }
+ }
this.listQuery.params.sidList = aa
this.listQuery.current = 1
this.getList()
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
index a7e172997c..24d6c49c24 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
@@ -611,6 +611,7 @@ export default {
this.formobj.eveList.push({
sid: '', // sid
applySid: '', // 付款申请sid
+ eveSid: e.sid, // 平仓款sid
costTitleValue: e.costTitleValue, // 平仓款名称
openDate: e.openDate, // 融资付款开通日期
period: e.period, // 期(台)数
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue
index f5d22f42c6..6468b6ff3e 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue
@@ -136,13 +136,11 @@ export default {
this.listQuery.params.useOrgSid = createOrgSid
this.listQuery.params.payCompanySid = payCompanySid
const aa = []
- // if (value.length > 0) {
- // for (var i = 0; i < value.length; i++) {
- // for (var j = 0; j < value[i].vehRebateSids.length; j++) {
- // aa.push(value[i].vehRebateSids[j])
- // }
- // }
- // }
+ if (value.length > 0) {
+ for (var i = 0; i < value.length; i++) {
+ aa.push(value[i].eveSid)
+ }
+ }
this.listQuery.params.sidList = aa
this.listQuery.current = 1
this.getList()