Merge remote-tracking branch 'origin/master'

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java

@@ -81,27 +81,27 @@ public class AppIndexService {
                 AppIndexNumVo appIndexNumVo = new AppIndexNumVo();
                 appIndexNumVo.setSid(menu.getSid());
                 //验车
-                if (AppIndexEnum.AppMenu.YC.getCode().equals(menu.getSid())) {
+                if (AppIndexEnum.AppMenu.YC.getRemarks().equals(menu.getTitle())) {
                     String num = scmVehicleExamineFeign.getToDoNum(appToDoNumQuery).getData();
                     appIndexNumVo.setNum(num);
                 }
                 //收车
-                if (AppIndexEnum.AppMenu.SC.getCode().equals(menu.getSid())) {
+                if (AppIndexEnum.AppMenu.SC.getRemarks().equals(menu.getTitle())) {
                     String num = scmVehicleEnterlibraryFeign.getToDoNum(appToDoNumQuery).getData();
                     appIndexNumVo.setNum(num);
                 }
                 //移库
-                if (AppIndexEnum.AppMenu.YK.getCode().equals(menu.getSid())) {
+                if (AppIndexEnum.AppMenu.YK.getRemarks().equals(menu.getTitle())) {
                     String num = scmVehicleGressionFeign.getToDoNum(appToDoNumQuery).getData();
                     appIndexNumVo.setNum(num);
                 }
                 //盘库
-                if (AppIndexEnum.AppMenu.PK.getCode().equals(menu.getSid())) {
+                if (AppIndexEnum.AppMenu.PK.getRemarks().equals(menu.getTitle())) {
                     String num = scmVehicleInventoryFeign.getToDoNum(appToDoNumQuery).getData();
                     appIndexNumVo.setNum(num);
                 }
                 //巡检
-                if (AppIndexEnum.AppMenu.XJ.getCode().equals(menu.getSid())) {
+                if (AppIndexEnum.AppMenu.XJ.getRemarks().equals(menu.getTitle())) {
                     String num = scmVehiclePatrolinspectionFeign.getToDoNum(appToDoNumQuery).getData();
                     appIndexNumVo.setNum(num);
                 }

anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js

@@ -150,15 +150,13 @@ export function vehicleOutLibrary(data) {
 // 出库时判断是否--客户编码
 export function isUpdateOrInsertCrm(data) {
   return request({
-    url: '/base/isUpdateOrInsertCrm/isUpdateOrInsertCrm',
+    url: '/base/v1/basevehicleout/isUpdateOrInsertCrm',
     method: 'post',
     data: data,
     headers: { 'Content-Type': 'application/json' }
   })
 }
 
-
-
 // 买断
 export function vehicleBuyBreak(data) {
   return request({

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue

@@ -383,6 +383,7 @@ export default {
                 this.$message({ showClose: true, type: 'success', message: '保存成功' })
                 this.handleReturn('true')
               } else if (response.success && response.data !== null) {
+                this.dialogVisible = false
                 this.dialogVisible = true
               }
             }).catch(e => {