Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue

@@ -83,9 +83,8 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-            <el-table-column label="操作" width="180px" align="center">
+            <el-table-column label="操作" width="100" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" :disabled="!scope.row.updateBtn" @click="toEdit(scope.row)">编辑</el-button>
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
@@ -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

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' }
     })

yxt-as-ui/src/views/client/customermanagement/relation/vehicle.vue

@@ -22,6 +22,11 @@
                 <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
+            <el-table-column label="使用状态" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.isEnable == '1' ? '已启用' : scope.row.isEnable == '0' ? '禁用' : '' }}</span>
+              </template>
+            </el-table-column>
             <el-table-column prop="vehMark" label="车牌号" align="center" min-width="140" />
             <el-table-column prop="vinNo" label="车架号" align="center" min-width="150" />
             <el-table-column prop="buyDate" label="购车日期" align="center" width="120" />

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("车架号")

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

yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java

@@ -236,6 +236,7 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
         if (StringUtils.isNotBlank(query.getVehMark())) {
             qw.like("v.vehMark", query.getVehMark());
         }
+        qw.eq("v.isEnable",1);
         qw.orderByDesc("c.sid");
         IPage<AsCustomerVehicle> page = PagerUtil.queryToPage(pq);
         IPage<AsCustomerCrmVehVo> pagging = baseMapper.customerList(page, qw);