feat(front):车辆管理问题修复;

jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/VehicleController.java

@@ -13,24 +13,31 @@ import jnpf.entity.*;
 import jnpf.util.*;
 import jnpf.model.vehicle.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.*;
+
 import jnpf.annotation.JnpfField;
 import jnpf.base.vo.PageListVO;
 import jnpf.base.vo.PaginationVO;
 import jnpf.base.vo.DownloadVO;
 import jnpf.config.ConfigValueUtil;
 import jnpf.base.entity.ProvinceEntity;
+
 import java.io.IOException;
 import java.util.stream.Collectors;
+
 import jnpf.engine.entity.FlowTaskEntity;
 import jnpf.exception.WorkFlowException;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Vehicle
+ *
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
@@ -51,6 +58,8 @@ public class VehicleController {
     @Autowired
     private VehicleService vehicleService;
 
+    @Resource
+    private EnterpriseMerchantsService enterpriseMerchantsService;
 
 
     /**
@@ -81,6 +90,7 @@ public class VehicleController {
         vo.setPagination(page);
         return ActionResult.success(vo);
     }
+
     /**
      * 创建
      *
@@ -101,8 +111,10 @@ public class VehicleController {
         }
         return ActionResult.success("创建成功");
     }
+
     /**
      * 编辑
+     *
      * @param id
      * @param vehicleForm
      * @return
@@ -130,8 +142,10 @@ public class VehicleController {
             return ActionResult.fail("更新失败，数据不存在");
         }
     }
+
     /**
      * 删除
+     *
      * @param id
      * @return
      */
@@ -147,9 +161,11 @@ public class VehicleController {
         }
         return ActionResult.success("删除成功");
     }
+
     /**
      * 表单信息(详情页)
      * 详情页面使用-转换数据
+     *
      * @param id
      * @return
      */
@@ -165,11 +181,17 @@ public class VehicleController {
         //副表数据
         //子表数据
         vehicleMap = generaterSwapUtil.swapDataDetail(vehicleMap, VehicleConstant.getFormData(), "582912646513169797", false);
+        if ("null".equals(vehicleMap.get("ascriptionId")) && "商户".equals(vehicleMap.get("vehicleAscription"))) {
+            //手动查询商户赋值
+            vehicleMap.put("ascriptionId", enterpriseMerchantsService.findNameById(entity.getAscriptionId()));
+        }
         return ActionResult.success(vehicleMap);
     }
+
     /**
      * 获取详情(编辑页)
      * 编辑页面使用-不转换数据
+     *
      * @param id
      * @return
      */

jnpf-java-boot/jnpf-web/src/views/scm/person/form.vue

@@ -45,8 +45,8 @@
           <el-col :span="12">
             <jnpf-form-tip-item label="开始时间" prop="effectiveStartTime">
               <JnpfDatePicker v-model="dataForm.effectiveStartTime" @change="changeData('effectiveStartTime', -1)"
-                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" clearable
-                :style='{ "width": "100%" }' type="datetime" format="yyyy-MM-dd">
+                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                clearable :style='{ "width": "100%" }' type="datetime" format="yyyy-MM-dd">
               </JnpfDatePicker>
             </jnpf-form-tip-item>
           </el-col>
@@ -54,15 +54,15 @@
           <el-col :span="12">
             <jnpf-form-tip-item label="结束时间" prop="effectiveEndTime">
               <JnpfDatePicker v-model="dataForm.effectiveEndTime" @change="changeData('effectiveEndTime', -1)"
-                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" clearable
-                :style='{ "width": "100%" }' type="datetime" format="yyyy-MM-dd">
+                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                clearable :style='{ "width": "100%" }' type="datetime" format="yyyy-MM-dd">
               </JnpfDatePicker>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="12">
             <jnpf-form-tip-item label="出入码" prop="entryCodes">
-              <JnpfInput v-model="dataForm.entryCodes" @change="changeData('entryCodes', -1)" placeholder="请输入" clearable
-                :style='{ "width": "100%" }'>
+              <JnpfInput v-model="dataForm.entryCodes" @change="changeData('entryCodes', -1)" placeholder="请输入"
+                clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -81,7 +81,6 @@
                 :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
-            
           </el-col>
           <el-col :span="8">
             <el-form label-width="100px">

jnpf-java-boot/jnpf-web/src/views/scm/vehicle/form.vue

@@ -92,9 +92,6 @@
                 :style='{"width":"100%"}'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
-          </el-col>
-          <el-col :span="8">
-
           </el-col>
           <!-- 表单结束 -->
         </template>
@@ -316,8 +313,8 @@ export default {
   mounted() { },
   methods: {
     selectChangeData(var1, var2) {
-      this.dataForm.ascriptionId = var1.id;
-      this.dataForm.ascriptionName = var1.cmp_nm;
+      this.dataForm.ascriptionId = var2.id;
+      this.dataForm.ascriptionName = var2.cmp_nm;
     },
     depSelectChangeData(var1, var2) {
       this.dataForm.ascriptionId = var2.id;