From 36c82f723a68971af8f7faa7e25c1b7bfd32eed5 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 2 Sep 2024 11:17:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=93=E9=A1=B9?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E5=88=86=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../specialrebatedistributionAdd.vue | 67 +++++++++--------- .../specialrebatedistributionInfo.vue | 4 +- .../specialrebatetobeallocatedAdd.vue | 10 +-- .../zhuanxiangfanlifenpeiDaiBanInfo.vue | 4 +- .../zhuanxiangfanlifenpeiEdit.vue | 69 +++++++++---------- .../zhuanxiangfanlifenpeiYiBanInfo.vue | 4 +- 6 files changed, 75 insertions(+), 83 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue index d229426304..4a3d2e6aa7 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue @@ -173,8 +173,10 @@ export default { this.viewTitle = '【编辑】专项返利分配申请' console.log('编辑回显', row.sid) req.fetchDetailsBySid(row.sid).then((resp) => { - this.formobj = resp.data - this.formobj.instanceId = resp.data.procInstId + if (resp.success) { + this.formobj = resp.data + this.formobj.instanceId = resp.data.procInstId + } }).catch((e) => { this.formobj = row }) @@ -233,36 +235,31 @@ export default { estimateRebate: e.estimateRebate, uploadMoney: e.uploadMoney, disNum: e.disNum, - unitSetAllocationMoney: (parseInt(e.uploadMoney)) / (parseInt(e.disNum)) + unitSetAllocationMoney: Math.round((parseFloat(e.uploadMoney) / parseFloat(e.disNum)) * 100) / 100 }) }) } }, changeBrand(value) { - let bb = null - this.brand_list.forEach((e) => { - if (e.brandName === value) { - bb = { - name: e.brandName, - sid: e.sid - } - } - }) - this.formobj.brandSid = bb.sid + const choose = this.brand_list.filter((item) => item.brandName === value) + if (choose !== null && choose.length > 0) { + this.formobj.brandSid = choose[0].sid + } else { + this.formobj.brandSid = '' + } }, saveOrUpdate() { - console.log(this.formobj) this.$refs['form_obj'].validate((valid) => { if (valid) { + if (this.formobj.scmSpecialrebatedistributedetails.length === 0) { + this.$message({ showClose: true, type: 'error', message: '专项返利分配申请列表不能为空' }) + return + } this.submitdisabled = true req.saveOrUpdate(this.formobj).then((resp) => { this.submitdisabled = false if (resp.success) { - this.$message({ - showClose: true, - type: 'success', - message: resp.msg - }) + this.$message({ showClose: true, type: 'success', message: resp.msg }) this.handleReturn('true') } }).catch(() => { @@ -274,24 +271,24 @@ export default { }) }, submitVehicleApply() { - if (this.formobj.scmSpecialrebatedistributedetails.length === 0) { - this.$message({ showClose: true, type: 'error', message: '专项返利分配申请列表不能为空' }) - return - } - req.submitVehicleApply(this.formobj).then((res) => { - if (res.success) { - this.$message({ - showClose: true, - type: 'success', - message: '提交成功' + this.$refs['form_obj'].validate((valid) => { + if (valid) { + if (this.formobj.scmSpecialrebatedistributedetails.length === 0) { + this.$message({ showClose: true, type: 'error', message: '专项返利分配申请列表不能为空' }) + return + } + this.submitdisabled = true + req.submitVehicleApply(this.formobj).then((resp) => { + this.submitdisabled = false + if (resp.success) { + this.$message({ showClose: true, type: 'success', message: resp.msg }) + this.handleReturn('true') + } + }).catch(() => { + this.submitdisabled = false }) - this.handleReturn('true') } else { - this.$message({ - showClose: true, - type: 'error', - message: '提交失败' - }) + return false } }) }, diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionInfo.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionInfo.vue index f66bbb074f..db85498ed3 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionInfo.vue @@ -100,7 +100,9 @@ export default { this.viewTitle = '专项返利分配申请详情' console.log('编辑回显', row.sid) req.fetchDetailsBySid(row.sid).then((resp) => { - this.formobj = resp.data + if (resp.success) { + this.formobj = resp.data + } }).catch((e) => { this.formobj = row }) diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue index 0cf5e4d88e..9093af4c5e 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue @@ -104,7 +104,7 @@ import req from '@/api/specialrebate/specialrebatedistribution' import selectvehicle from './relation/selectvehicle.vue' export default { - name: 'specialrebatetobeallocatedAdd', + name: 'SpecialrebatetobeallocatedAdd', components: { selectvehicle }, @@ -162,7 +162,7 @@ export default { this.viewState = 1 if (value.length > 0) { this.formobj.setNumber = value.length - this.formobj.unitSetAllocationMoney = (parseInt(this.formobj.allocationMoney)) / (parseInt(this.formobj.setNumber)) + this.formobj.unitSetAllocationMoney = Math.round((parseFloat(this.formobj.allocationMoney) / parseFloat(this.formobj.setNumber)) * 100) / 100 value.forEach((e) => { this.formobj.scmSpecialrebateVehsVehSidAndVinNos.push({ modelName: e.modelName, @@ -184,11 +184,7 @@ export default { req.save(this.formobj).then((resp) => { this.submitdisabled = false if (resp.success) { - this.$message({ - showClose: true, - type: 'success', - message: resp.msg - }) + this.$message({ showClose: true, type: 'success', message: resp.msg }) this.handleReturn('true') } }).catch(() => { diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo.vue index 5d8b9449d2..3d1466c49b 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo.vue @@ -173,7 +173,9 @@ export default { this.viewTitle = '专项返利分配申请详情' console.log('编辑回显', sid) req.fetchDetailsBySid(sid).then((resp) => { - this.formobj = resp.data + if (resp.success) { + this.formobj = resp.data + } }).catch((e) => { this.formobj = {} }) diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue index 3e5538ed96..081584e1da 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue @@ -153,8 +153,10 @@ export default { this.viewTitle = '【编辑】专项返利分配申请' console.log('编辑回显', sid) req.fetchDetailsBySid(sid).then((resp) => { - this.formobj = resp.data - this.formobj.instanceId = resp.data.procInstId + if (resp.success) { + this.formobj = resp.data + this.formobj.instanceId = resp.data.procInstId + } }).catch((e) => { this.formobj = {} }) @@ -213,36 +215,27 @@ export default { estimateRebate: e.estimateRebate, uploadMoney: e.uploadMoney, disNum: e.disNum, - unitSetAllocationMoney: (parseInt(e.uploadMoney)) / (parseInt(e.disNum)) + unitSetAllocationMoney: Math.round((parseInt(e.uploadMoney) / parseInt(e.disNum)) * 100) / 100 }) }) } }, changeBrand(value) { - let bb = null - this.brand_list.forEach((e) => { - if (e.brandName === value) { - bb = { - name: e.brandName, - sid: e.sid - } - } - }) - this.formobj.brandSid = bb.sid + const choose = this.brand_list.filter((item) => item.brandName === value) + if (choose !== null && choose.length > 0) { + this.formobj.brandSid = choose[0].sid + } else { + this.formobj.brandSid = '' + } }, saveOrUpdate() { - console.log(this.formobj) this.$refs['form_obj'].validate((valid) => { if (valid) { this.submitdisabled = true req.saveOrUpdate(this.formobj).then((resp) => { this.submitdisabled = false if (resp.success) { - this.$message({ - showClose: true, - type: 'success', - message: resp.msg - }) + this.$message({ showClose: true, type: 'success', message: resp.msg }) // 子页面向父级页面传递值(关闭弹框) window.parent.postMessage({ cmd: 'returnHeight', @@ -261,27 +254,27 @@ export default { }) }, submitVehicleApply() { - req.submitVehicleApply(this.formobj).then((res) => { - if (res.success) { - this.$message({ - showClose: true, - type: 'success', - message: '提交成功' - }) - // 子页面向父级页面传递值(关闭弹框) - window.parent.postMessage({ - cmd: 'returnHeight', - params: { - // 操作成功，告诉父级页面关闭弹框 - code: 1 + this.$refs['form_obj'].validate((valid) => { + if (valid) { + this.submitdisabled = true + req.submitVehicleApply(this.formobj).then((resp) => { + this.submitdisabled = false + if (resp.success) { + this.$message({ showClose: true, type: 'success', message: resp.msg }) + // 子页面向父级页面传递值(关闭弹框) + window.parent.postMessage({ + cmd: 'returnHeight', + params: { + // 操作成功，告诉父级页面关闭弹框 + code: 1 + } + }, '*') } - }, '*') - } else { - this.$message({ - showClose: true, - type: 'error', - message: '提交失败' + }).catch(() => { + this.submitdisabled = false }) + } else { + return false } }) }, diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo.vue index 102d930a20..d1fefaae00 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo.vue @@ -136,7 +136,9 @@ export default { this.viewTitle = '专项返利分配申请详情' console.log('编辑回显', sid) req.fetchDetailsBySid(sid).then((resp) => { - this.formobj = resp.data + if (resp.success) { + this.formobj = resp.data + } }).catch((e) => { this.formobj = {} }) From 9ec5369cddf422409812cd8fd623f3ee9fb6f994 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Mon, 2 Sep 2024 11:18:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A7=E4=BB=B6?= =?UTF-8?q?=E7=9B=98=E7=9B=88=E5=85=A5=E5=BA=93=E3=80=81=E7=9B=98=E5=BA=93?= =?UTF-8?q?=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storage/oldpPartStocktakingLoss/index.vue | 24 +++++++++++-------- .../oldpPartStocktakingLossAdd.vue | 12 ++++++++-- .../oldpPartStocktakingSurplus/index.vue | 6 +++-- .../oldpPartStocktakingSurplusAdd.vue | 10 +++++++- .../views/storage/stocktakingLoss/index.vue | 24 +++++++++++-------- .../stocktakingLoss/stocktakingLossAdd.vue | 9 ++++++- .../storage/stocktakingSurplus/index.vue | 6 +++-- .../stocktakingSurplusAdd.vue | 10 +++++++- 8 files changed, 72 insertions(+), 29 deletions(-) diff --git a/yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/index.vue b/yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/index.vue index a66b357168..f7be9960e3 100644 --- a/yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/index.vue +++ b/yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/index.vue @@ -148,7 +148,8 @@ "sourceBillNo": "", "userSid": "", "orgPath": "", - "menuUrl": "" + "menuUrl": "", + 'warehouseTypeKey': "02" } }, sids: [], @@ -286,15 +287,18 @@ size: 10, total: 0, params: { - name: '', - billNo: "", - sourceBillNo: "", - createTimestart: '', - createTimeEnd: '', - billstate: '', - menuUrl: '', - orgPath: '', - usersid: "" + "deptNmae": "", + "createByName": "", + "billNo": "", + "createStartTime": "", + "createEndTime": "", + "finishStartTime": "", + "finishEndTime": "", + "sourceBillNo": "", + "userSid": "", + "orgPath": "", + "menuUrl": "", + 'warehouseTypeKey': "02" } } this.loadList() diff --git a/yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/oldpPartStocktakingLossAdd.vue b/yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/oldpPartStocktakingLossAdd.vue index 471d1960a6..7a9a3402d5 100644 --- a/yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/oldpPartStocktakingLossAdd.vue +++ b/yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/oldpPartStocktakingLossAdd.vue @@ -130,7 +130,9 @@ "businessKey": "14", "businessValue": "盘亏出库", "remarks": "", - "goodsList": [] + "warehouseTypeKey": "02", + "warehouseTypeValue": "旧件库", + "goodsList": [], }, hideUploadBtn: false, sourceBillNoList: [], @@ -170,7 +172,8 @@ }) req.getSourceBillNoBySid({ deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem( - 'defaultOrgPath').lastIndexOf('/') + 1) + 'defaultOrgPath').lastIndexOf('/') + 1), + warehouseTypeKey: "02" }).then((resp) => { if (resp.success) { this.sourceBillNoList = resp.data @@ -269,6 +272,8 @@ "businessKey": "14", "businessValue": "盘亏出库", "remarks": "", + "warehouseTypeKey": "02", + "warehouseTypeValue": "旧件库", "goodsList": [] } this.submitdisabled = false @@ -298,6 +303,9 @@ .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1) this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage .getItem('defaultOrgPath').lastIndexOf('/') + 1) + this.formobj.warehouseTypeKey = "02" + this.formobj.warehouswarehouseTypeValueeTypeKey = "旧件库" + } }) diff --git a/yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/index.vue b/yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/index.vue index 4ce4a2fdfb..36d6eb727f 100644 --- a/yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/index.vue +++ b/yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/index.vue @@ -149,7 +149,8 @@ "sourceBillNo": "", "userSid": "", "orgPath": "", - "menuUrl": "" + "menuUrl": "", + 'warehouseTypeKey': "02" } }, sids: [], @@ -293,7 +294,8 @@ "sourceBillNo": "", "userSid": "", "orgPath": "", - "menuUrl": "" + "menuUrl": "", + 'warehouseTypeKey': "02" } } this.loadList() diff --git a/yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/oldpPartStocktakingSurplusAdd.vue b/yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/oldpPartStocktakingSurplusAdd.vue index 38cd122427..67f75e2232 100644 --- a/yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/oldpPartStocktakingSurplusAdd.vue +++ b/yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/oldpPartStocktakingSurplusAdd.vue @@ -144,6 +144,8 @@ "businessKey": "04", "businessValue": "盘盈入库", "remarks": "", + "warehouseTypeKey": "02", + "warehouseTypeValue": "旧件库", "goodsList": [] }, hideUploadBtn: false, @@ -195,7 +197,8 @@ req.getSourceBillNoBySid({ deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem( - 'defaultOrgPath').lastIndexOf('/') + 1) + 'defaultOrgPath').lastIndexOf('/') + 1), + warehouseTypeKey: "02" }).then((resp) => { if (resp.success) { this.sourceBillNoList = resp.data @@ -313,6 +316,8 @@ "businessKey": "04", "businessValue": "盘盈入库", "remarks": "", + "warehouseTypeKey": "02", + "warehouseTypeValue": "旧件库", "goodsList": [] } this.submitdisabled = false @@ -343,6 +348,9 @@ this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage .getItem('defaultOrgPath').lastIndexOf('/') + 1) + this.formobj.warehouseTypeKey = "02" + this.formobj.warehouswarehouseTypeValueeTypeKey = "旧件库" + } }) .catch(e => { diff --git a/yxt-as-ui/src/views/storage/stocktakingLoss/index.vue b/yxt-as-ui/src/views/storage/stocktakingLoss/index.vue index ce30eff61b..63abf7cf8b 100644 --- a/yxt-as-ui/src/views/storage/stocktakingLoss/index.vue +++ b/yxt-as-ui/src/views/storage/stocktakingLoss/index.vue @@ -148,7 +148,8 @@ "sourceBillNo": "", "userSid": "", "orgPath": "", - "menuUrl": "" + "menuUrl": "", + "warehouseTypeKey": "01" } }, sids: [], @@ -286,15 +287,18 @@ size: 10, total: 0, params: { - name: '', - billNo: "", - sourceBillNo: "", - createTimestart: '', - createTimeEnd: '', - billstate: '', - menuUrl: '', - orgPath: '', - usersid: "" + "deptNmae": "", + "createByName": "", + "billNo": "", + "createStartTime": "", + "createEndTime": "", + "finishStartTime": "", + "finishEndTime": "", + "sourceBillNo": "", + "userSid": "", + "orgPath": "", + "menuUrl": "", + "warehouseTypeKey": "01" } } this.loadList() diff --git a/yxt-as-ui/src/views/storage/stocktakingLoss/stocktakingLossAdd.vue b/yxt-as-ui/src/views/storage/stocktakingLoss/stocktakingLossAdd.vue index a5ebba7715..49bc72eb85 100644 --- a/yxt-as-ui/src/views/storage/stocktakingLoss/stocktakingLossAdd.vue +++ b/yxt-as-ui/src/views/storage/stocktakingLoss/stocktakingLossAdd.vue @@ -130,6 +130,8 @@ "businessKey": "14", "businessValue": "盘亏出库", "remarks": "", + "warehouseTypeKey": "01", + "warehouseTypeValue": "配件库", "goodsList": [] }, hideUploadBtn: false, @@ -170,7 +172,8 @@ }) req.getSourceBillNoBySid({ deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem( - 'defaultOrgPath').lastIndexOf('/') + 1) + 'defaultOrgPath').lastIndexOf('/') + 1), + warehouseTypeKey: "01" }).then((resp) => { if (resp.success) { this.sourceBillNoList = resp.data @@ -269,6 +272,8 @@ "businessKey": "14", "businessValue": "盘亏出库", "remarks": "", + "warehouseTypeKey": "01", + "warehouseTypeValue": "配件库", "goodsList": [] } this.submitdisabled = false @@ -299,6 +304,8 @@ this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage .getItem('defaultOrgPath').lastIndexOf('/') + 1) + this.formobj.warehouseTypeKey = "01" + this.formobj.warehouswarehouseTypeValueeTypeKey = "配件库" } }) .catch(e => { diff --git a/yxt-as-ui/src/views/storage/stocktakingSurplus/index.vue b/yxt-as-ui/src/views/storage/stocktakingSurplus/index.vue index 97427995ee..4d8725d559 100644 --- a/yxt-as-ui/src/views/storage/stocktakingSurplus/index.vue +++ b/yxt-as-ui/src/views/storage/stocktakingSurplus/index.vue @@ -149,7 +149,8 @@ "sourceBillNo": "", "userSid": "", "orgPath": "", - "menuUrl": "" + "menuUrl": "", + "warehouseTypeKey": "01" } }, sids: [], @@ -293,7 +294,8 @@ "sourceBillNo": "", "userSid": "", "orgPath": "", - "menuUrl": "" + "menuUrl": "", + "warehouseTypeKey": "01" } } this.loadList() diff --git a/yxt-as-ui/src/views/storage/stocktakingSurplus/stocktakingSurplusAdd.vue b/yxt-as-ui/src/views/storage/stocktakingSurplus/stocktakingSurplusAdd.vue index 28d2cf1ec0..e6ff8adb5f 100644 --- a/yxt-as-ui/src/views/storage/stocktakingSurplus/stocktakingSurplusAdd.vue +++ b/yxt-as-ui/src/views/storage/stocktakingSurplus/stocktakingSurplusAdd.vue @@ -144,6 +144,8 @@ "businessKey": "04", "businessValue": "盘盈入库", "remarks": "", + "warehouseTypeKey": "01", + "warehouseTypeValue": "配件库", "goodsList": [] }, hideUploadBtn: false, @@ -195,7 +197,8 @@ req.getSourceBillNoBySid({ deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem( - 'defaultOrgPath').lastIndexOf('/') + 1) + 'defaultOrgPath').lastIndexOf('/') + 1), + warehouseTypeKey: "01" }).then((resp) => { if (resp.success) { this.sourceBillNoList = resp.data @@ -313,6 +316,8 @@ "businessKey": "04", "businessValue": "盘盈入库", "remarks": "", + "warehouseTypeKey": "01", + "warehouseTypeValue": "配件库", "goodsList": [] } this.submitdisabled = false @@ -343,6 +348,9 @@ this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage .getItem('defaultOrgPath').lastIndexOf('/') + 1) + this.formobj.warehouseTypeKey = "01" + this.formobj.warehouswarehouseTypeValueeTypeKey = "配件库" + } }) .catch(e => { From e28543f46d5c66c2b8dc219a6acb1ba1407fc4cb Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 2 Sep 2024 11:54:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=94=9F=E6=88=90=E8=AE=A1=E6=8F=90=E8=B5=84?= =?UTF-8?q?=E9=87=91=E5=8D=A0=E7=94=A8=E8=B4=B9=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanPushFundHistoryMapper.java | 1 + .../LoanPushFundHistoryMapper.xml | 9 ++- .../LoanPushFundHistoryService.java | 3 + .../LoanRepaymentHistoryMapper.xml | 5 ++ .../LoanRepaymentScheduleService.java | 63 ++++++++++++++++++- 5 files changed, 79 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryMapper.java index b2aefc38a4..780f593f18 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryMapper.java @@ -20,6 +20,7 @@ public interface LoanPushFundHistoryMapper extends BaseMapper list); + int saveList(@Param("list") List list); String getLastDateByBusVinSid(@Param("busVinSid") String busVinSid); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryMapper.xml index 8c2c2490a6..0cab1ba850 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryMapper.xml @@ -10,6 +10,13 @@ (#{item.sid},#{item.busVinSid},#{item.useOrgSid},#{item.useOrgName},#{item.fund},#{item.lastAccrualDate}) + + insert into loan_push_fund_history(sid,isEnable,busVinSid,useOrgSid,useOrgName,fund,lastAccrualDate) + values + + (#{item.sid},#{item.isEnable},#{item.busVinSid},#{item.useOrgSid},#{item.useOrgName},#{item.fund},#{item.lastAccrualDate}) + + - \ No newline at end of file + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryService.java index 1556459511..8022faeb39 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpushfundhistory/LoanPushFundHistoryService.java @@ -52,6 +52,9 @@ public class LoanPushFundHistoryService extends MybatisBaseService list) { return baseMapper.saveLists(list); } + public int saveList(List list) { + return baseMapper.saveList(list); + } public PagerVo listPage(PagerQuery pq) { LoanPushFundHistoryQuery pagerQuery = pq.getParams(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml index d0b261934d..9234421879 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml @@ -806,6 +806,11 @@ WHERE s.receivablesName = '资金占用费' OR s.receivablesName = '资方逾期利息' + OR s.receivablesName = '资方退还垫款' + OR s.receivablesName = '其他费用' + OR s.receivablesName = '合同违约金' + OR s.receivablesName = '名义价' + OR s.receivablesName = '结清时资方逾期利息' AND s.auditState = 3 ) AS a,( SELECT diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index e17b5498a4..019d631b95 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -37,6 +37,7 @@ import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank; import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDay; +import com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistory; import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto; @@ -53,6 +54,7 @@ import com.yxt.anrui.riskcenter.biz.loanfinbank.LoanFinBankService; import com.yxt.anrui.riskcenter.biz.loanfinotherPolicy.LoanFinOtherPolicyService; import com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyService; import com.yxt.anrui.riskcenter.biz.loanfundday.LoanFundDayService; +import com.yxt.anrui.riskcenter.biz.loanpushfundhistory.LoanPushFundHistoryService; import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService; import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService; import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService; @@ -155,7 +157,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService histories = new ArrayList<>();//还款记录 List jrList = new ArrayList<>();//金融应收 List loanFundDays = new ArrayList<>();//资金占用费生成记录 + List pushFundHistories = new ArrayList<>();//资金占用费计提记录 for (LoanRepaymentSchedule schedule : data) { BigDecimal Q = BigDecimal.ZERO; //累欠金额 BigDecimal T = BigDecimal.ZERO; //其中公司垫还资方金额 @@ -6069,6 +6073,15 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 0 && !loanFundDays.isEmpty()) { loanFundDayService.saveList(loanFundDays); } + if (pushFundHistories.size() > 0 && !pushFundHistories.isEmpty()) { + loanPushFundHistoryService.saveList(pushFundHistories); + } if (jrList.size() > 0 && !jrList.isEmpty()) { finUncollectedReceivablesDetailedJRFeign.saveList(jrList); }