From cbe967b600250f7da066682232fd2fe50d40037e Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 27 Jul 2023 15:27:33 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=AC=BE=E9=A1=B9?=
=?UTF-8?q?=E7=BB=93=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/moneycarriedforward/moneycarriedforward.vue | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforward.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforward.vue
index 75f4b3e6ba..574691bf98 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforward.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforward.vue
@@ -12,6 +12,9 @@
+
+
+
@@ -49,7 +52,7 @@
查看
-
+
待提交
{{ scope.row.nodeState }}
@@ -192,6 +195,7 @@ export default {
total: 0,
params: {
userSid: '',
+ billNo: '',
createByName: '',
applyDeptName: '',
applyStartDate: '',
@@ -317,6 +321,7 @@ export default {
total: 0,
params: {
userSid: '',
+ billNo: '',
createByName: '',
applyDeptName: '',
applyStartDate: '',
From 4bfad61fe42ee438a40a560c078423cdd72ae629 Mon Sep 17 00:00:00 2001
From: dimengzhe
Date: Thu, 27 Jul 2023 16:14:01 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=80=E6=98=93?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AE=A2=E9=87=91=E7=BB=93=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BusDepositFictitiousMapper.xml | 41 +++++++++++++++-
.../BusDepositFictitiousRest.java | 11 +++--
.../busmaindeposit/BusMainDepositMapper.java | 2 +
.../busmaindeposit/BusMainDepositMapper.xml | 41 +++++++++-------
.../busmaindeposit/BusMainDepositService.java | 11 +++--
.../bussalesorder/BusSalesOrderService.java | 16 +++----
.../BusSalesOrderDepositMapper.xml | 47 +++++++++++++++----
.../BusSalesOrderDepositService.java | 14 ++++--
...FinSelectedReceivablesDetailedService.java | 3 ++
9 files changed, 138 insertions(+), 48 deletions(-)
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml
index 2e860fd8e1..c2d5cae06e 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml
@@ -25,7 +25,7 @@
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
index a603918cc3..33f51e2a1c 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
@@ -41,6 +41,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
import com.yxt.anrui.buscenter.api.common.BusSalesOrderConstantUtils;
import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
+import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService;
import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
@@ -93,6 +94,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid());
+ /* List listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid());
listVos.removeAll(Collections.singleton(null));
if (!listVos.isEmpty()) {
for (AppBusSalesOrderDepositListVo listVo : listVos) {
@@ -316,7 +319,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService list = busDepositFictitiousService.getList(depositSid);
list.removeAll(Collections.singleton(null));
@@ -344,10 +347,10 @@ public class BusSalesOrderDepositService extends MybatisBaseService 0) {
@@ -367,7 +370,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService pagging = baseMapper.selectPageLists(page, qw, params.getName());
return pagging;
}
From 7a3a49609a93305c251eea59cf887bf2f28c12fa Mon Sep 17 00:00:00 2001
From: dimengzhe
Date: Thu, 27 Jul 2023 16:31:06 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=80=E6=98=93?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AE=A2=E9=87=91=E7=BB=93=E8=BD=AC=E5=90=8E?=
=?UTF-8?q?=E7=AE=80=E6=98=93=E8=AE=A2=E5=8D=95=E5=8F=AF=E7=94=A8=E8=AE=A2?=
=?UTF-8?q?=E9=87=91=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../buscenter/biz/busmaindeposit/BusMainDepositService.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
index 4073d54863..150eeab540 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
@@ -230,6 +230,10 @@ public class BusMainDepositService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw);
List list = pagging.getRecords();
for (BusMainDepositListVo vo : list) {
+ if (vo.getDepositBillTypeKey().equals("01")) {
+ String useDepositMoney = getUseFin(vo.getSid());
+ vo.setUsedDeposit(useDepositMoney);
+ }
if (vo.getDepositBillTypeKey().equals("02")) {
BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(vo.getSid());
if (busDepositVehicleCustomer != null) {
From 2e38af1c0d9b790889d30f277d1442625fdd7a2d Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 27 Jul 2023 16:49:44 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9C=AA=E5=94=AE?=
=?UTF-8?q?=E4=B9=B0=E6=96=AD--=E4=BA=8C=E6=AC=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../cheliangtaizhang/cheliangtaizhang.vue | 51 ++++++++++++++++++-
1 file changed, 49 insertions(+), 2 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
index dabed21c2c..1691c0249d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
@@ -173,6 +173,13 @@
+
+
+
+
+
+
+
@@ -212,6 +219,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
至
@@ -612,7 +634,18 @@ export default {
salesEndDate: '',
solidStartDate: '',
solidEndDate: '',
- manPurOrderTypeKey: ''
+ manPurOrderTypeKey: '',
+ libraryAge: '',
+ orgLibraryAge: '',
+ settlementLibraryAge: '',
+ menuUrl: '',
+ userSid: '',
+ orgName: '',
+ purchaseSystemName: '',
+ orgSidPath: '',
+ otherConfigOne: '',
+ otherConfigTwo: '',
+ otherConfigThree: ''
},
current: 1,
size: 5,
@@ -1013,6 +1046,9 @@ export default {
// 查询列表信息
getList() {
this.listLoading = true
+ this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+ this.listQuery.params.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
+ this.listQuery.params.menuUrl = this.$route.path
pagerList(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
@@ -1081,7 +1117,18 @@ export default {
salesEndDate: '',
solidStartDate: '',
solidEndDate: '',
- manPurOrderTypeKey: ''
+ manPurOrderTypeKey: '',
+ libraryAge: '',
+ orgLibraryAge: '',
+ settlementLibraryAge: '',
+ menuUrl: '',
+ userSid: '',
+ orgName: '',
+ purchaseSystemName: '',
+ orgSidPath: '',
+ otherConfigOne: '',
+ otherConfigTwo: '',
+ otherConfigThree: ''
},
current: 1,
size: 5,
From ef3d9c6d67bbdd867f2e7166a68d3a8b34bcee4a Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 27 Jul 2023 17:03:31 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue | 2 +-
.../paymentConfirmation/acknowledgementReceiptAdd.vue | 2 +-
.../src/views/moneycarriedforward/moneycarriedforwardAdd.vue | 2 +-
.../workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardEdit.vue | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue
index 7b84fe30d2..4cb0096769 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue
@@ -263,7 +263,7 @@
-
已选应收款项明细
+
已选款项明细
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue
index 7ccea9ab57..8aa8b411fc 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue
@@ -242,7 +242,7 @@
-
已选应收款项明细
+
已选款项明细
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardAdd.vue
index ce625a3b44..0cc69e702d 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardAdd.vue
@@ -204,7 +204,7 @@
-
已选应收款项明细
+
已选款项明细
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardEdit.vue
index d73940fe3a..f9d5a99141 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardEdit.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardEdit.vue
@@ -203,7 +203,7 @@
-
已选应收款项明细
+
已选款项明细
From 377f26de8bfae88fee69d695c4961a73c32de257 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 27 Jul 2023 17:05:35 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9C=AA=E5=94=AE?=
=?UTF-8?q?=E4=B9=B0=E6=96=AD--=E4=BA=8C=E6=AC=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../weushoumaiduanEdit.vue | 40 +++++++++----------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue
index 2f96d7d3f4..6822475075 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue
@@ -279,26 +279,6 @@ export default {
this.payment_list = res.data
}
})
- getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
- if (resp.success) {
- this.formobj.useOrgSid = resp.data
- fetchBySid(resp.data).then((res) => {
- if (res.success) {
- this.formobj.useOrgName = res.data.name
- }
- })
- fetchDetailsByUseOrgSid(resp.data).then((res) => {
- if (res.success) {
- this.orgDept_list = res.data
- }
- })
- brandDown({ useOrg: resp.data }).then((res) => {
- if (res.success) {
- this.carBrand_list = res.data
- }
- })
- }
- })
},
UpNumber(e, row) {
e.target.value = e.target.value.replace(/[^\d]/g, '') // 清除“数字”和“.”"-"以外的字符
@@ -362,6 +342,26 @@ export default {
req.fetchBySid(sid).then((resp) => {
this.formobj = resp.data
this.formobj.instanceId = resp.data.procInstId
+ getOrgSidByPath({ orgPath: this.formobj.orgPath }).then((respsone) => {
+ if (respsone.success) {
+ this.formobj.useOrgSid = respsone.data
+ fetchBySid(respsone.data).then((res) => {
+ if (res.success) {
+ this.formobj.useOrgName = res.data.name
+ }
+ })
+ fetchDetailsByUseOrgSid(respsone.data).then((res) => {
+ if (res.success) {
+ this.orgDept_list = res.data
+ }
+ })
+ brandDown({ useOrg: respsone.data }).then((res) => {
+ if (res.success) {
+ this.carBrand_list = res.data
+ }
+ })
+ }
+ })
}).catch((e) => {
this.formobj = {}
})