From 85559d16aa172a8a337fbb033e3b814be5ef3e8a Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 27 May 2024 14:25:36 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=82=AC=E6=94=B6?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/collectionmeasures/collectionmeasuresAdd.vue | 8 ++++++++ .../src/views/overduevehicle/overduevehicle.vue | 4 ++-- .../src/views/overduevehicle/overduevehicleByRisk.vue | 10 +++++----- .../views/overduevehicle/vehiclecollectionentry.vue | 1 + .../cuishoucuoshiFlow/collectionmeasuresEdit.vue | 8 ++++++++ 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasuresAdd.vue b/anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasuresAdd.vue index 22852ac93f..52ed4c205b 100644 --- a/anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasuresAdd.vue +++ b/anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasuresAdd.vue @@ -57,6 +57,11 @@ + + + @@ -242,6 +247,9 @@ export default { this.yckzVisible = false } }, + handleDelete(index) { + this.formobj.loanBeCollectionVehDetails.splice(index, 1) + }, cautionerEdit(row) { this.viewState = 8 this.$refs['divCautioner'].showAdd(row.saleVehSid) diff --git a/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue b/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue index 4b3dce1e27..859a8d351e 100644 --- a/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue +++ b/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue @@ -80,7 +80,7 @@ - + @@ -91,7 +91,7 @@ - + diff --git a/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue b/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue index 669f9c27a4..04101815e6 100644 --- a/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue +++ b/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue @@ -80,7 +80,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -437,7 +437,7 @@ export default { this.viewState = 2 this.$refs['divVehicle'].showEdit(this.sids[0]) } else { - this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行催收操作' }) + this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' }) } }, toCollectionMeasures() { @@ -445,7 +445,7 @@ export default { this.viewState = 3 this.$refs['divCollection'].showAdd(this.sids[0]) } else { - this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行催收操作' }) + this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' }) } }, toReturn() { @@ -453,7 +453,7 @@ export default { this.viewState = 5 this.$refs['divReturn'].showAdd(this.sids[0]) } else { - this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行催收操作' }) + this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' }) } }, resetState() { diff --git a/anrui-riskcenter-ui/src/views/overduevehicle/vehiclecollectionentry.vue b/anrui-riskcenter-ui/src/views/overduevehicle/vehiclecollectionentry.vue index 741ae498fc..d85affaa57 100644 --- a/anrui-riskcenter-ui/src/views/overduevehicle/vehiclecollectionentry.vue +++ b/anrui-riskcenter-ui/src/views/overduevehicle/vehiclecollectionentry.vue @@ -447,6 +447,7 @@ export default { useOrgName: '', useOrgSid: '' } + this.submitdisabled = false this.$emit('doback') } } diff --git a/anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresEdit.vue index 73382d3402..b480c139b1 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresEdit.vue @@ -56,6 +56,11 @@ + + + @@ -247,6 +252,9 @@ export default { this.yckzVisible = false } }, + handleDelete(index) { + this.formobj.loanBeCollectionVehDetails.splice(index, 1) + }, cautionerEdit(row) { this.viewState = 8 this.$refs['divCautioner'].showAdd(row.saleVehSid) From 1bec8c323cb89139fc973ac1c722fb28eea0bdb0 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 27 May 2024 14:28:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=87=AD=E8=AF=81?= =?UTF-8?q?=E8=B5=84=E6=96=B9=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loanbepadsincereapply/LoanBePadsincereApplyService.java | 3 ++- .../biz/loanbuckleapply/LoanBuckleApplyService.java | 5 +++-- .../LoanTransferPaymentApplyService.java | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java index 0c67635a52..6ab3b17a84 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java @@ -1161,7 +1161,8 @@ public class LoanBePadsincereApplyService extends MybatisBaseService Date: Mon, 27 May 2024 15:16:23 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=98=E6=AC=BE?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=A1=A8=E6=97=A0=E6=B3=95=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loanrepaymentschedule/LoanSolutionsDetailsssVo.java | 4 ++++ .../loanrepaymentschedule/LoanRepaymentScheduleService.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanSolutionsDetailsssVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanSolutionsDetailsssVo.java index 9a471f07d0..166271182b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanSolutionsDetailsssVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanSolutionsDetailsssVo.java @@ -165,4 +165,8 @@ public class LoanSolutionsDetailsssVo { @ApiModelProperty("实际首付比例") private String downPayAmountsRatio; + @ApiModelProperty("实际贴息") + private String actualDiscount; + @ApiModelProperty("其他融实际贴息") + private String otherActualDiscount; } 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 8d7bada988..295cab1df6 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 @@ -3262,6 +3262,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService (num - 1) * 3) { LoanVoucherPdf a = pdfList.get((num - 1) * 3); From b3f38343536ba5e257bcb076d6e63564ff89f225 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 27 May 2024 15:59:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=A5=97=E9=A4=90?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AE=8C=E5=96=84=E6=9F=A5=E8=AF=A2=E5=95=86?= =?UTF-8?q?=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsServicePackageService.java | 7 ------- .../wms/wmsInventory/WmsInventoryFeign.java | 2 +- .../WmsInventoryPackageQuery.java | 2 +- .../apiadmin/inventroy/WmsInventoryRest.java | 2 +- .../WmsInventoryPackageQuery.java | 2 +- .../wmsinventory/WmsInventoryService.java | 19 +++++++++++++++++-- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java index e0d998d6eb..c3edf482c3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java @@ -339,13 +339,6 @@ public class AsServicePackageService extends MybatisBaseService selGoodsInfo(PagerQuery pq) { PagerQuery query = new PagerQuery<>(); BeanUtil.copyProperties(pq, query); - PackageGoodsQuery params = pq.getParams(); -// ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()); -// if (orgSidByPath.getSuccess()) { -// String useOrgSid = orgSidByPath.getData(); -// WmsGoodsPackageQuery queryParams = query.getParams(); -// queryParams.setUseOrgSid(useOrgSid); -// } ResultBean> voResultBean = wmsInventoryFeign.getPackageGoodsVo(query); PagerVo vo = new PagerVo<>(); if (voResultBean.getSuccess()) { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java index 3498896645..7e32420410 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RequestBody; ) public interface WmsInventoryFeign { - @ApiOperation("查询分公司下所有的商品信息") + @ApiOperation("查询部门下所有的商品信息") @PostMapping("/getPackageGoodsVo") public ResultBean> getPackageGoodsVo(@RequestBody PagerQuery pq); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageQuery.java index 2ea9bcc166..a67db5aa41 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageQuery.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageQuery.java @@ -11,7 +11,7 @@ import lombok.Data; */ @Data public class WmsInventoryPackageQuery implements Query { - private String useOrgSid; + private String orgPath; @ApiModelProperty("商品名称") private String goodsName; // 商品名称 @ApiModelProperty("零件号") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java index 89c55afd40..16b73e03fe 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java @@ -119,7 +119,7 @@ public class WmsInventoryRest { return rb.success().setData(pv); } - @ApiOperation("查询分公司下所有的商品信息") + @ApiOperation("查询部门下所有的商品信息") @PostMapping("/getPackageGoodsVo") public ResultBean> getPackageGoodsVo(@RequestBody PagerQuery pq) { return wmsInventoryService.getPackageGoodsVo(pq); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryPackageQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryPackageQuery.java index e8d724c2cb..03b6863e5a 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryPackageQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryPackageQuery.java @@ -11,7 +11,7 @@ import lombok.Data; */ @Data public class WmsInventoryPackageQuery implements Query { - private String useOrgSid; + private String orgPath; @ApiModelProperty("商品名称") private String goodsName; // 商品名称 @ApiModelProperty("零件号") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java index 0db6edc043..6579b1a6c1 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java @@ -14,6 +14,7 @@ import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBill; import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillService; import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo; import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; import org.springframework.beans.factory.annotation.Autowired; @@ -36,7 +37,8 @@ public class WmsInventoryService extends MybatisBaseService listPage(PagerQuery pq) { WmsInventoryQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -316,7 +318,20 @@ public class WmsInventoryService extends MybatisBaseService split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + qw.eq("v.useOrgSid",useOrgSid); + } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.getPackageGoodsVo(page, qw); List records = pagging.getRecords(); From 855f53f4b18f3e9abbca474bfa97383b5cd0065a Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 27 May 2024 16:00:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../additionitem/additionitem.vue | 44 +++++++++++++------ .../basicinformation/setmeal/setmealAdd.vue | 5 ++- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue b/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue index 2d64043bf0..362e3410d6 100644 --- a/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue +++ b/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue @@ -52,11 +52,11 @@ - + -
项目名称
- +
*项目名称
+
拼音缩写
@@ -69,18 +69,18 @@ -
排序
- +
*排序
+ -
销售价
- +
*销售价
+ -
成本
- +
*成本
+ @@ -121,6 +121,12 @@ export default { createOrgSid: '', useOrgSid: '' }, + rules: { + aitemName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }], + price: [{ required: true, message: '销售价不能为空', trigger: 'blur' }], + sortNo: [{ required: true, message: '排序不能为空', trigger: 'blur' }], + cost: [{ required: true, message: '成本不能为空', trigger: 'blur' }], + }, btndisabled: false, btnList: [ { @@ -252,6 +258,9 @@ export default { }, toAdd() { this.dialogVisible = true + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) }, getNumber(val, limit) { val = val.replace(/[^0-9.]/g, '') // 保留数字 @@ -285,11 +294,15 @@ export default { getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { if (res.success) { this.formobj.createOrgSid = res.data - req.saveOrUpdate(this.formobj).then((resp) => { - if (resp.success) { - this.$message({ showClose: true, type: 'success', message: '保存成功' }) - this.getList() - this.handleClose() + this.$refs['form_obj'].validate((valid) => { + if (valid) { + req.saveOrUpdate(this.formobj).then((resp) => { + if (resp.success) { + this.$message({ showClose: true, type: 'success', message: '保存成功' }) + this.getList() + this.handleClose() + } + }) } }) } @@ -354,6 +367,9 @@ export default { .addinputInfo { margin-left: 75px !important; } +/deep/ .el-form-item__error { + margin-left: 75px !important; +} .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw { margin-left: 75px !important; width: calc(100% - 70px); diff --git a/yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue b/yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue index f7bf12613d..ce21e7f742 100644 --- a/yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue +++ b/yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue @@ -12,7 +12,7 @@ -
*套餐名称
+
*套餐名称
 @@ -211,7 +211,8 @@ export default { size: 2, total: 0, params: { - name: '' + name: '', + orgPath: '' } }, commodityData: [],