diff --git a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue index 5d7245b260..5d0db76d11 100644 --- a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue +++ b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue @@ -83,9 +83,8 @@ - + @@ -171,6 +170,13 @@ export default { btnKey: 'toAdd', btnLabel: '新增' }, + { + type: 'primary', + size: 'small', + icon: 'edit', + btnKey: 'toEdit', + btnLabel: '编辑' + }, { type: 'danger', size: 'small', @@ -330,6 +336,9 @@ export default { case 'toAdd': this.toAdd() break + case 'toEdit': + this.toEdit() + break case 'doDel': this.doDel() break @@ -448,9 +457,17 @@ export default { this.viewState = 2 this.$refs['divAdd'].showAdd() }, - toEdit(row) { - this.viewState = 3 - this.$refs['divAdd'].showEdit(row) + toEdit() { + if (this.multipleSelection.length === 1) { + if (!this.multipleSelection[0].updateBtn) { + this.viewState = 3 + this.$refs['divAdd'].showEdit(this.multipleSelection) + } else { + this.$message({ showClose: true, type: 'error', message: '该记录已报备且仍在有效期内,无法再次编辑' }) + } + } else { + this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' }) + } }, toInfo(row) { this.viewState = 4 diff --git a/yxt-as-ui/src/api/client/customermanagement.js b/yxt-as-ui/src/api/client/customermanagement.js index 3c1b2e0697..ffdddf62f3 100644 --- a/yxt-as-ui/src/api/client/customermanagement.js +++ b/yxt-as-ui/src/api/client/customermanagement.js @@ -104,7 +104,7 @@ export default { disableStateByCar: function(data) { return request({ url: '/as/v1/ascustomervehicle/disableState', - method: 'DELETE', + method: 'post', data: data, headers: { 'Content-Type': 'application/json' } }) @@ -113,7 +113,7 @@ export default { enableByCar: function(data) { return request({ url: '/as/v1/ascustomervehicle/enable', - method: 'DELETE', + method: 'post', data: data, headers: { 'Content-Type': 'application/json' } }) diff --git a/yxt-as-ui/src/views/client/customermanagement/relation/vehicle.vue b/yxt-as-ui/src/views/client/customermanagement/relation/vehicle.vue index a85d3f6164..d1d4b80415 100644 --- a/yxt-as-ui/src/views/client/customermanagement/relation/vehicle.vue +++ b/yxt-as-ui/src/views/client/customermanagement/relation/vehicle.vue @@ -22,6 +22,11 @@ 查看 + + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleVo.java index bf497c92d6..895d8c5881 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleVo.java @@ -52,6 +52,7 @@ import lombok.Data; public class AsCustomerVehicleVo implements Vo { private String customerVehSid; // 客户车辆信息sid + private String isEnable; // 客户车辆信息sid @ApiModelProperty("车牌号") private String vehMark; // 车牌号 @ApiModelProperty("车架号") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml index d235fa1a97..18228210bc 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml @@ -16,6 +16,7 @@ sid customerVehSid, vehMark, vinNo, + isEnable, lastMileage, DATE_FORMAT( buyDate, '%Y-%m-%d' ) buyDate, DATE_FORMAT( nextMaintainDate, '%Y-%m-%d' ) nextMaintainDate diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java index 07f20bc089..f91f3e7a84 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java @@ -236,6 +236,7 @@ public class AsCustomerVehicleService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.customerList(page, qw);