diff --git a/anrui-base/anrui-base-api/pom.xml b/anrui-base/anrui-base-api/pom.xml
index 1bc428d5fb..ea4872eb7b 100644
--- a/anrui-base/anrui-base-api/pom.xml
+++ b/anrui-base/anrui-base-api/pom.xml
@@ -29,12 +29,12 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-        <dependency>
+      <!--  <dependency>
             <groupId>com.yxt.anrui</groupId>
             <artifactId>anrui-riskcenter-api</artifactId>
             <version>0.0.1</version>
             <scope>compile</scope>
-        </dependency>
+        </dependency>-->
 
     </dependencies>
 
diff --git a/anrui-base/anrui-base-biz/pom.xml b/anrui-base/anrui-base-biz/pom.xml
index 2ac16174a2..2559db65ed 100644
--- a/anrui-base/anrui-base-biz/pom.xml
+++ b/anrui-base/anrui-base-biz/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.yxt.messagecenter</groupId>
             <artifactId>message-center-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.yxt</groupId>
@@ -29,37 +29,37 @@
         <dependency>
             <artifactId>anrui-base-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-crm-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-portal-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-buscenter-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-scm-api</artifactId>
             <groupId>com.yxt.anrui.scm</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-riskcenter-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-flowable-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <!--mysql-->
         <dependency>
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>com.yxt.anrui.fin</groupId>
             <artifactId>anrui-fin-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/anrui-base/anrui-base-biz/src/main/resources/application-test.yml b/anrui-base/anrui-base-biz/src/main/resources/application-test.yml
index eeffb3dcfd..ae25a3669d 100644
--- a/anrui-base/anrui-base-biz/src/main/resources/application-test.yml
+++ b/anrui-base/anrui-base-biz/src/main/resources/application-test.yml
@@ -1,7 +1,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.18.0.4:3306/anrui_base?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://39.104.100.138:3306/anrui_base?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
     username: root
     password: yxt_mysql_138
   cloud:
@@ -21,7 +21,11 @@ spring:
     port: 6379
     timeout: 0  # 连接超时时间（毫秒）
 
-
+image:
+  upload:
+    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
+  url:
+    prefix: http://anrui.yyundong.com/upload/
 templateUrl:
   uploadUrl: http://anrui.yyundong.com/template
-  prefixUrl: http://120.46.131.15:8111//template/
+  prefixUrl: /home/lzh/webapps/template/
diff --git a/anrui-buscenter/anrui-buscenter-api/pom.xml b/anrui-buscenter/anrui-buscenter-api/pom.xml
index a7624d7e81..8f232e87c0 100644
--- a/anrui-buscenter/anrui-buscenter-api/pom.xml
+++ b/anrui-buscenter/anrui-buscenter-api/pom.xml
@@ -13,7 +13,7 @@
 
     <artifactId>anrui-buscenter-api</artifactId>
     <groupId>com.yxt.anrui</groupId>
-    <version>0.0.1</version>
+    <version>0.0.1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/anrui-buscenter/anrui-buscenter-biz/pom.xml b/anrui-buscenter/anrui-buscenter-biz/pom.xml
index af654e27a5..49e6827af7 100644
--- a/anrui-buscenter/anrui-buscenter-biz/pom.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.yxt.messagecenter</groupId>
             <artifactId>message-center-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.yxt</groupId>
@@ -29,37 +29,37 @@
         <dependency>
             <artifactId>anrui-buscenter-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-riskcenter-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-portal-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-crm-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-base-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-flowable-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.yxt.anrui.fin</groupId>
             <artifactId>anrui-fin-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <!--mysql-->
         <dependency>
@@ -102,7 +102,7 @@
         <dependency>
             <groupId>com.yxt.anrui</groupId>
             <artifactId>anrui-flowable-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml
index af61324a0d..dbfbaf2f58 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml
@@ -1,7 +1,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.18.0.4:3306/anrui_buscenter?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://39.104.100.138:3306/anrui_buscenter?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
     username: root
     password: yxt_mysql_138
   cloud:
@@ -21,3 +21,9 @@ spring:
     port: 6379
     timeout: 0  # 连接超时时间（毫秒）
 
+image:
+  upload:
+    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
+  url:
+    prefix: http://anrui.yyundong.com/upload/
+
diff --git a/anrui-crm/anrui-crm-api/pom.xml b/anrui-crm/anrui-crm-api/pom.xml
index 723097c72d..dc87ff85d2 100644
--- a/anrui-crm/anrui-crm-api/pom.xml
+++ b/anrui-crm/anrui-crm-api/pom.xml
@@ -13,7 +13,7 @@
 
     <artifactId>anrui-crm-api</artifactId>
     <groupId>com.yxt.anrui</groupId>
-    <version>0.0.1</version>
+    <version>0.0.1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/anrui-crm/anrui-crm-biz/pom.xml b/anrui-crm/anrui-crm-biz/pom.xml
index 00e59c0f32..f022d74f08 100644
--- a/anrui-crm/anrui-crm-biz/pom.xml
+++ b/anrui-crm/anrui-crm-biz/pom.xml
@@ -23,32 +23,32 @@
         <dependency>
             <artifactId>anrui-crm-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-portal-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-base-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-buscenter-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-riskcenter-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.yxt.messagecenter</groupId>
             <artifactId>message-center-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <!--mysql-->
         <dependency>
diff --git a/anrui-crm/anrui-crm-biz/src/main/resources/application-test.yml b/anrui-crm/anrui-crm-biz/src/main/resources/application-test.yml
index e0b92f32ad..3cd258899b 100644
--- a/anrui-crm/anrui-crm-biz/src/main/resources/application-test.yml
+++ b/anrui-crm/anrui-crm-biz/src/main/resources/application-test.yml
@@ -1,7 +1,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.18.0.4:3306/anrui_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://39.104.100.138:3306/anrui_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
     username: root
     password: yxt_mysql_138
   cloud:
@@ -21,3 +21,10 @@ spring:
     port: 6379
     timeout: 0  # 连接超时时间（毫秒）
 
+
+image:
+  upload:
+    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
+  url:
+    prefix: http://anrui.yyundong.com/upload/
+
diff --git a/anrui-fin/anrui-fin-api/pom.xml b/anrui-fin/anrui-fin-api/pom.xml
index 9d59c3dc64..3058be3249 100644
--- a/anrui-fin/anrui-fin-api/pom.xml
+++ b/anrui-fin/anrui-fin-api/pom.xml
@@ -12,7 +12,7 @@
 
     <artifactId>anrui-fin-api</artifactId>
     <groupId>com.yxt.anrui.fin</groupId>
-    <version>0.0.1</version>
+    <version>0.0.1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/anrui-fin/anrui-fin-biz/pom.xml b/anrui-fin/anrui-fin-biz/pom.xml
index bc33820c47..2c2fc2d255 100644
--- a/anrui-fin/anrui-fin-biz/pom.xml
+++ b/anrui-fin/anrui-fin-biz/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.yxt.anrui.fin</groupId>
             <artifactId>anrui-fin-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.yxt</groupId>
@@ -80,32 +80,32 @@
         <dependency>
             <groupId>com.yxt.anrui</groupId>
             <artifactId>anrui-crm-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.yxt.anrui</groupId>
             <artifactId>anrui-portal-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.yxt.anrui</groupId>
             <artifactId>anrui-buscenter-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.yxt.anrui</groupId>
             <artifactId>anrui-base-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>com.yxt.messagecenter</groupId>
             <artifactId>message-center-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
diff --git a/anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml b/anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml
index 88c3050bc8..f723ec753b 100644
--- a/anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml
+++ b/anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml
@@ -1,14 +1,14 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.18.0.4:3306/anrui_fin?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://39.104.100.138:3306/anrui_fin?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
     username: root
     password: yxt_mysql_138
   nacos:
     discovery:
       server-addr: 172.18.0.5:8848
   redis:
-    database: 6  # Redis数据库索引（默认为0）
+    database: 3  # Redis数据库索引（默认为0）
     host: 172.18.0.7
     jedis:
       pool:
@@ -21,6 +21,6 @@ spring:
     timeout: 0  # 连接超时时间（毫秒）
 image:
   upload:
-    path: static/upload/
+    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
   url:
-    prefix: http://192.168.1.116:8111/upload/
+    prefix: http://anrui.yyundong.com/upload/
diff --git a/anrui-flowable/anrui-flowable-api/pom.xml b/anrui-flowable/anrui-flowable-api/pom.xml
index d242749134..64f03d070d 100644
--- a/anrui-flowable/anrui-flowable-api/pom.xml
+++ b/anrui-flowable/anrui-flowable-api/pom.xml
@@ -13,7 +13,7 @@
 
     <artifactId>anrui-flowable-api</artifactId>
     <groupId>com.yxt.anrui</groupId>
-    <version>0.0.1</version>
+    <version>0.0.1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/anrui-flowable/anrui-flowable-biz/pom.xml b/anrui-flowable/anrui-flowable-biz/pom.xml
index 09ecaf1d36..efb3505171 100644
--- a/anrui-flowable/anrui-flowable-biz/pom.xml
+++ b/anrui-flowable/anrui-flowable-biz/pom.xml
@@ -18,12 +18,12 @@
         <dependency>
             <artifactId>anrui-flowable-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-portal-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/resources/application-test.yml b/anrui-flowable/anrui-flowable-biz/src/main/resources/application-test.yml
index 5d0e426633..be8fed1907 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/resources/application-test.yml
+++ b/anrui-flowable/anrui-flowable-biz/src/main/resources/application-test.yml
@@ -1,7 +1,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.18.0.4:3306/anrui_flowable?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://39.104.100.138:3306/anrui_flowable?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
     username: root
     password: yxt_mysql_138
   cloud:
@@ -21,3 +21,9 @@ spring:
     port: 6379
     timeout: 0  # 连接超时时间（毫秒）
 
+image:
+  upload:
+    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
+  url:
+    prefix: http://anrui.yyundong.com/upload/
+
diff --git a/anrui-gateway/src/main/resources/application-test.yml b/anrui-gateway/src/main/resources/application-test.yml
index 8515161e26..9fd2a333ac 100644
--- a/anrui-gateway/src/main/resources/application-test.yml
+++ b/anrui-gateway/src/main/resources/application-test.yml
@@ -1,6 +1,6 @@
 spring:
   resources:
-    static-locations: file:D://anrui
+    static-locations: file:/home/lzh/docker_data/nginx/html/anrui-system-ui
   cloud:
     nacos:
       discovery:
diff --git a/anrui-portal/anrui-portal-api/pom.xml b/anrui-portal/anrui-portal-api/pom.xml
index 79caffa5b9..6bdb237440 100644
--- a/anrui-portal/anrui-portal-api/pom.xml
+++ b/anrui-portal/anrui-portal-api/pom.xml
@@ -13,7 +13,7 @@
 
     <artifactId>anrui-portal-api</artifactId>
     <groupId>com.yxt.anrui</groupId>
-    <version>0.0.1</version>
+    <version>0.0.1-SNAPSHOT</version>
 
 
 
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java
index df03f08fe6..dda423b6ad 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java
@@ -85,4 +85,7 @@ public class SysUserVo implements Vo {
     private List<OrgList> orgList = new ArrayList<>();
     private String defaultOrgPath;
     private String defaultOrgPathName;
+
+    @ApiModelProperty("是否需要更换密码")
+    private Boolean needResetPsd;
 }
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java
index d59e04ee4e..882b9dac89 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java
@@ -44,7 +44,7 @@ public interface AppSysUserFeign {
     @ApiOperation(value = "手机更改密码")
     @ResponseBody
     @PostMapping("/updatePassword")
-    public ResultBean updatePassword(@RequestParam(value = "userSid", required = true) String userSid,
+    public ResultBean<SysUserVo> updatePassword(@RequestParam(value = "userSid", required = true) String userSid,
                                      @RequestParam(value = "appId", required = true) String appId,
                                      @RequestParam(value = "oldPassword", required = true) String oldPassword,
                                      @RequestParam(value = "newPassword", required = true) String newPassword,
diff --git a/anrui-portal/anrui-portal-biz/pom.xml b/anrui-portal/anrui-portal-biz/pom.xml
index 43f5afdc20..a26fbdf5a1 100644
--- a/anrui-portal/anrui-portal-biz/pom.xml
+++ b/anrui-portal/anrui-portal-biz/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <artifactId>anrui-terminal-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.yxt</groupId>
@@ -28,23 +28,17 @@
         <dependency>
             <artifactId>anrui-portal-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-crm-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
-        </dependency>
-
-        <dependency>
-            <artifactId>anrui-flowable-api</artifactId>
-            <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.yxt.messagecenter</groupId>
             <artifactId>message-center-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -81,7 +75,7 @@
         <dependency>
             <groupId>com.yxt.anrui</groupId>
             <artifactId>anrui-flowable-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
index 1d9577a27b..71429a7db0 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
@@ -234,20 +234,37 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         return baseMapper.updatePassword(sid, password);
     }
 
-    public ResultBean updatePasswordApp(SysUser user, String oldPassword, String newPassword, String token) {
+    public ResultBean<SysUserVo> updatePasswordApp(SysUser user, String oldPassword, String newPassword, String token) {
+        ResultBean<SysUserVo> rb = ResultBean.fireFail();
         String oldPasswordMd5 = Encodes.md5(oldPassword);
         if (!oldPasswordMd5.equals(user.getPassword())) {
-            return ResultBean.fireFail().setMsg("原始密码输入错误");
+            return rb.setMsg("原始密码输入错误");
         }
         if (!newPassword.matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,10}$")) {
-            return ResultBean.fireFail().setMsg("密码格式错误，必须为8至10位大小写字母和数字的组合");
+            return rb.setMsg("密码格式错误，必须为8至10位大小写字母和数字的组合");
         }
         int i = baseMapper.updatePasswordApp(user.getSid(), Encodes.md5(newPassword));
+        SysUserVo sysUserVo = selectUserOne(user);
+        if (sysUserVo == null) {
+            sysUserVo = new SysUserVo();
+        } else {
+            //查询是否需要更换密码
+            boolean isTrue = false;
+            String mobile = user.getMobile();
+            if (StringUtils.isNotBlank(mobile)) {
+                String password = mobile.substring(5, 11);
+                String md5 = Encodes.md5(password);
+                if (user.getPassword().equals(md5)) {
+                    isTrue = true;
+                }
+            }
+            sysUserVo.setNeedResetPsd(isTrue);
+        }
         if (i == 1) {
             redisUtil.remove(token);
-            return ResultBean.fireSuccess().setMsg("修改成功");
+            return rb.success().setData(sysUserVo);
         } else {
-            return ResultBean.fireSuccess().setMsg("修改失败");
+            return rb.setMsg("修改失败");
         }
     }
 
@@ -338,7 +355,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                     userInfoOneVo.setDepartmentName(sysStaffOrgVo.getOrgName());
                     userInfoOneVo.setDepartmentSid(sysStaffOrgVo.getOrgSid());
                     SysOrganization sysOrganizationOne = sysOrganizationService.fetchBySid(sysStaffOrgVo.getOrgSid());
-                    if(sysOrganizationOne != null){
+                    if (sysOrganizationOne != null) {
                         String psid = sysOrganizationOne.getPsid();
                         String name = sysOrganizationService.fetchBySid(psid).getName();
                         userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName());
@@ -407,6 +424,17 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
             sysUserVo.setToken(newToken);
             // 更新用户中的token
             updateToken(user.getSid(), newToken);
+            //查询是否需要更换密码
+            boolean isTrue = false;
+            String mobile = user.getMobile();
+            if (StringUtils.isNotBlank(mobile)) {
+                String password = mobile.substring(5, 11);
+                String md5 = Encodes.md5(password);
+                if (user.getPassword().equals(md5)) {
+                    isTrue = true;
+                }
+            }
+            sysUserVo.setNeedResetPsd(isTrue);
             return sysUserVo;
         }
 
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java
index aae5293c86..72d8ffadeb 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java
@@ -278,14 +278,15 @@ public class AppSysUserRest implements AppSysUserFeign {
     }
 
     @Override
-    public ResultBean updatePassword(String userSid, String appId, String oldPassword, String newPassword, HttpServletRequest httpServletRequest) {
+    public ResultBean<SysUserVo> updatePassword(String userSid, String appId, String oldPassword, String newPassword, HttpServletRequest httpServletRequest) {
+        ResultBean<SysUserVo> rb = ResultBean.fireFail();
         String token = httpServletRequest.getHeader("token");
         SysUser user = sysUserService.fetchBySid(userSid);
         if (user == null) {
-            return ResultBean.fireFail().setMsg("抱歉，用户不存在");
+            return rb.setMsg("抱歉，用户不存在");
         }
         if (!appId.equals(user.getAppId())) {
-            return new ResultBean().fail().setMsg("当前设备与账号不匹配，请解绑后再试");
+            return rb.setMsg("当前设备与账号不匹配，请解绑后再试");
         }
         return sysUserService.updatePasswordApp(user, oldPassword, newPassword, token);
     }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/pom.xml b/anrui-riskcenter/anrui-riskcenter-api/pom.xml
index 77db3a9e5d..037411265f 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/pom.xml
+++ b/anrui-riskcenter/anrui-riskcenter-api/pom.xml
@@ -13,7 +13,7 @@
 
     <artifactId>anrui-riskcenter-api</artifactId>
     <groupId>com.yxt.anrui</groupId>
-    <version>0.0.1</version>
+    <version>0.0.1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/pom.xml b/anrui-riskcenter/anrui-riskcenter-biz/pom.xml
index e3f9840e31..ad0ad0ad91 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/pom.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/pom.xml
@@ -23,27 +23,27 @@
         <dependency>
             <artifactId>anrui-riskcenter-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-portal-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-buscenter-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-crm-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-base-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <!--mysql-->
         <dependency>
diff --git a/anrui-scm/anrui-scm-api/pom.xml b/anrui-scm/anrui-scm-api/pom.xml
index b5d623076b..acdbbb1541 100644
--- a/anrui-scm/anrui-scm-api/pom.xml
+++ b/anrui-scm/anrui-scm-api/pom.xml
@@ -12,7 +12,7 @@
 
     <artifactId>anrui-scm-api</artifactId>
     <groupId>com.yxt.anrui.scm</groupId>
-    <version>0.0.1</version>
+    <version>0.0.1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/anrui-scm/anrui-scm-biz/pom.xml b/anrui-scm/anrui-scm-biz/pom.xml
index d920e9702c..9aad1f3ece 100644
--- a/anrui-scm/anrui-scm-biz/pom.xml
+++ b/anrui-scm/anrui-scm-biz/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.yxt.anrui.scm</groupId>
             <artifactId>anrui-scm-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.yxt</groupId>
@@ -52,36 +52,36 @@
         <dependency>
             <groupId>com.yxt.anrui</groupId>
             <artifactId>anrui-buscenter-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.yxt.anrui</groupId>
             <artifactId>anrui-portal-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <artifactId>anrui-flowable-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.yxt.anrui</groupId>
             <artifactId>anrui-base-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.yxt.anrui.fin</groupId>
             <artifactId>anrui-fin-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.yxt.messagecenter</groupId>
             <artifactId>message-center-api</artifactId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
 
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java
index 9d3219bcf9..46c86c3d08 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java
@@ -29,13 +29,17 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.portal.api.appversion.AppVersionDto;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.AppScmVehInventorymonthInfoVo;
 import com.yxt.anrui.scm.api.scmvehinventoryreport.*;
 import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService;
+import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.JPushServer;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import com.yxt.messagecenter.api.message.AppMessageDto;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MsgTargetUriEnum;
@@ -44,13 +48,6 @@ import com.yxt.messagecenter.api.messagelist.MessageListFeign;
 import com.yxt.messagecenter.api.messagetype.MessageTypeFeign;
 import com.yxt.messagecenter.api.messagetype.MessageTypeVo;
 import org.apache.commons.lang3.StringUtils;
-import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
-
-import org.omg.CORBA.BAD_CONTEXT;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml b/anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml
index f19a345ec3..72c8563d4d 100644
--- a/anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml
+++ b/anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml
@@ -1,14 +1,14 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.18.0.4:3306/anrui_scm?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://39.104.100.138:3306/anrui_scm?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
     username: root
     password: yxt_mysql_138
   nacos:
     discovery:
       server-addr: 172.18.0.5:8848
   redis:
-    database: 6  # Redis数据库索引（默认为0）
+    database: 3  # Redis数据库索引（默认为0）
     host: 172.18.0.7
     jedis:
       pool:
@@ -21,6 +21,6 @@ spring:
     timeout: 0  # 连接超时时间（毫秒）
 image:
   upload:
-    path: static/upload/
+    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
   url:
-    prefix: http://127.0.0.1:8080/upload/
\ No newline at end of file
+    prefix: http://anrui.yyundong.com/upload/
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
index 1e0cb99abe..6676f2fbf9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
@@ -436,6 +436,8 @@ export default {
       this.temp.insideCode = row.insideCode
     },
     showAdd() {
+      this.getType()
+      this.getPathSid()
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -451,10 +453,10 @@ export default {
       this.temp.isProblemVeh = '0'
       this.temp.purchaseSystemName = window.sessionStorage.getItem('departmentName')
       this.temp.purchaseSystemSid = window.sessionStorage.getItem('departmentSid')
-      this.getType()
-      this.getPathSid()
     },
     showEdit(sid) {
+      this.getType()
+      this.getPathSid()
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
@@ -471,8 +473,6 @@ export default {
           })
         }
       })
-      this.getType()
-      this.getPathSid()
     },
     getPathSid() {
       getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
@@ -494,6 +494,10 @@ export default {
           brandDown({ useOrg: res.data }).then((resp) => {
             if (resp.success) {
               this.carBrand_list = resp.data
+              if (this.carBrand_list.length > 0) {
+                this.temp.carBrandName = this.carBrand_list[0].barndName
+                this.temp.carBrandSid = this.carBrand_list[0].sid
+              }
             }
           })
         }
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue
index 855c5da391..5c0a5da7fd 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingpeizhijiageweihuAdd.vue
@@ -2,76 +2,72 @@
   <div class="app-container">
     <div class="tab-header webtop">
       <div>价格维护</div>
+      <div>
+        <el-button type="primary" size="small" @click="handleCreate()">确认</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
     </div>
     <div class="listconadd">
       <el-form ref="weihuForm" :model="temp" label-position="right" class="formadd" :rules="rules">
         <el-row class="tleftb_one">
-          <el-col :span="6" class="tleftb">
+          <el-col :span="3" class="tleftb">
             <span>车型名称</span>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="9">
             <el-form-item>
               <span>{{ temp.vehicleAlias }}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="6" class="tleftb">
+          <el-col :span="3" class="tleftb">
             <span>内部编码</span>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="9">
             <el-form-item>
-              <el-input v-model="temp.insideCode" maxlength="125" placeholder="请输入内部编码"
-                        class="addinputw" clearable/>
-<!--              <span>{{ temp.insideCode }}</span>-->
+              <el-input v-model="temp.insideCode" maxlength="125" placeholder="请输入内部编码" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="6" class="tleftb">
+          <el-col :span="3" class="tleftb">
             <span>常用配置</span>
           </el-col>
-          <el-col :span="18" class="tleftb_chang">
+          <el-col :span="21" class="tleftb_chang">
             <el-form-item>
               <span>{{ temp.configName }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="6" class="tleftb">
+          <el-col :span="3" class="tleftb">
             <span>更多配置</span>
           </el-col>
-          <el-col :span="18" class="break_word">
+          <el-col :span="21" class="break_word">
             <el-form-item>
               <span>{{ temp.otherConfig }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="6" class="tleftb">
+          <el-col :span="3" class="tleftb">
             <span><span class="icon">*</span>销售指导价(贷款)</span>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="9">
             <el-form-item prop="manufactorSettlementPrice">
-              <el-input v-model="temp.manufactorSettlementPrice" maxlength="125" placeholder="请输入销售指导价(贷款)"
-                        class="addinputw addinputw_jia" clearable/>
+              <el-input v-model="temp.manufactorSettlementPrice" maxlength="125" placeholder="请输入销售指导价(贷款)" class="addinputw addinputw_jia" clearable/>
               <span style="font-size: 16px">元</span>
             </el-form-item>
           </el-col>
-          <el-col :span="6" class="tleftb">
+          <el-col :span="3" class="tleftb">
             <span><span class="icon">*</span>销售指导价(全款)</span>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="9">
             <el-form-item prop="guidedPrice">
-              <el-input v-model="temp.guidedPrice" maxlength="125" placeholder="请输入销售指导价(全款)" class="addinputw addinputw_jia"
-                        clearable/>
+              <el-input v-model="temp.guidedPrice" maxlength="125" placeholder="请输入销售指导价(全款)" class="addinputw addinputw_jia" clearable/>
               <span style="font-size: 16px">元</span>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div class="form_btn">
-        <el-button type="primary" size="small" @click="handleCreate()">确认</el-button>
-        <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
-      </div>
     </div>
   </div>
 </template>
@@ -88,7 +84,7 @@ export default {
         vehicleAlias: '', // 车型名称(产品名称 陕汽必须1)
         manufactorSettlementPrice: '', // 厂家结算价
         guidedPrice: '', // 销售指导价
-        insideCode:''
+        insideCode: ''
       },
       rules: {
         manufactorSettlementPrice: [{ required: true, message: '销售指导价(贷款)不能为空', trigger: 'blur' }],
@@ -153,11 +149,6 @@ export default {
   border-top: 1px solid #e0e3eb;
 }
 
-.form_btn {
-  display: flex;
-  justify-content: center;
-}
-
 .break_word {
   word-wrap: break-word;
 }
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
index 8e3fcd6d92..6e63dbb7e8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
@@ -10,140 +10,128 @@
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
               <el-form-item label="颜色">
                 <el-select v-model="listQuery.params.carColorKey" placeholder="请选择" filterable clearable class="addinputw">
-                  <el-option v-for="item in carColor_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
+                  <el-option v-for="item in carColor_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="缓速器">
                 <el-select v-model="listQuery.params.slowMachineKey" placeholder="请选择" filterable clearable class="addinputw">
-                  <el-option v-for="item in slowMachine_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
+                  <el-option v-for="item in slowMachine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="后视镜">
                 <el-select v-model="listQuery.params.rearViewMirrorKey" placeholder="请选择" filterable clearable class="addinputw">
-                  <el-option v-for="item in rearViewMirror_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
+                  <el-option v-for="item in rearViewMirror_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="轮胎">
                 <el-select v-model="listQuery.params.tireSizeKey" placeholder="请选择" filterable clearable class="addinputw">
-                <el-option v-for="item in tireSize_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="驾驶室">
-              <el-select v-model="listQuery.params.specificationKey" placeholder="请选择" filterable clearable class="addinputw">
-                <el-option v-for="item in specification_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="后桥速比">
-              <el-select v-model="listQuery.params.rearAxleRatioKey" placeholder="请选择" filterable clearable class="addinputw">
-                <el-option v-for="item in rearAxleRatio_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="空调">
-              <el-select v-model="listQuery.params.airConditionerKey" placeholder="请选择" filterable clearable class="addinputw">
-                <el-option v-for="item in airConditioner_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="轮毂材质">
-              <el-select v-model="listQuery.params.hubMaterialKey" placeholder="请选择" filterable clearable class="addinputw">
-                <el-option v-for="item in hubMaterial_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="导流罩">
-              <el-select v-model="listQuery.params.baffleModelKey" placeholder="请选择" filterable clearable class="addinputw">
-                <el-option v-for="item in baffleModel_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="悬架">
-              <el-select v-model="listQuery.params.suspensionKey" placeholder="请选择" filterable clearable class="addinputw">
-                <el-option v-for="item in suspension_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="座椅">
-              <el-select v-model="listQuery.params.seatKey" placeholder="请选择" filterable clearable class="addinputw">
-                <el-option v-for="item in seat_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="护轮罩">
-              <el-select v-model="listQuery.params.tireCoverKey" placeholder="请选择" filterable clearable class="addinputw">
-                <el-option v-for="item in tireCover_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="鞍座">
-              <el-select v-model="listQuery.params.saddleKey" placeholder="请选择" filterable clearable class="addinputw">
-                <el-option v-for="item in saddle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="轴距">
-              <el-select v-model="listQuery.params.wheelbaseKey" placeholder="请选择" filterable clearable class="addinputw">
-                <el-option v-for="item in wheelbase_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="保险杠">
-              <el-select v-model="listQuery.params.bumperKey" placeholder="请选择" filterable clearable class="addinputw">
-                <el-option v-for="item in bumper_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="配置包">
-              <el-select v-model="listQuery.params.configuringBaoKey" placeholder="请选择" filterable clearable class="addinputw">
-                <el-option v-for="item in configuringBao_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-              </el-select>
-            </el-form-item>
+                  <el-option v-for="item in tireSize_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="驾驶室">
+                <el-select v-model="listQuery.params.specificationKey" placeholder="请选择" filterable clearable class="addinputw">
+                  <el-option v-for="item in specification_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="后桥速比">
+                <el-select v-model="listQuery.params.rearAxleRatioKey" placeholder="请选择" filterable clearable class="addinputw">
+                  <el-option v-for="item in rearAxleRatio_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="空调">
+                <el-select v-model="listQuery.params.airConditionerKey" placeholder="请选择" filterable clearable class="addinputw">
+                  <el-option v-for="item in airConditioner_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="轮毂材质">
+                <el-select v-model="listQuery.params.hubMaterialKey" placeholder="请选择" filterable clearable class="addinputw">
+                  <el-option v-for="item in hubMaterial_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="导流罩">
+                <el-select v-model="listQuery.params.baffleModelKey" placeholder="请选择" filterable clearable class="addinputw">
+                  <el-option v-for="item in baffleModel_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="悬架">
+                <el-select v-model="listQuery.params.suspensionKey" placeholder="请选择" filterable clearable class="addinputw">
+                  <el-option v-for="item in suspension_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="座椅">
+                <el-select v-model="listQuery.params.seatKey" placeholder="请选择" filterable clearable class="addinputw">
+                  <el-option v-for="item in seat_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="护轮罩">
+                <el-select v-model="listQuery.params.tireCoverKey" placeholder="请选择" filterable clearable class="addinputw">
+                  <el-option v-for="item in tireCover_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="鞍座">
+                <el-select v-model="listQuery.params.saddleKey" placeholder="请选择" filterable clearable class="addinputw">
+                  <el-option v-for="item in saddle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="轴距">
+                <el-select v-model="listQuery.params.wheelbaseKey" placeholder="请选择" filterable clearable class="addinputw">
+                  <el-option v-for="item in wheelbase_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="保险杠">
+                <el-select v-model="listQuery.params.bumperKey" placeholder="请选择" filterable clearable class="addinputw">
+                  <el-option v-for="item in bumper_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="配置包">
+                <el-select v-model="listQuery.params.configuringBaoKey" placeholder="请选择" filterable clearable class="addinputw">
+                  <el-option v-for="item in configuringBao_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
               <el-form-item label="独立热源">
-                <el-select v-model="listQuery.params.independentSourcesKey" placeholder="请选择" filterable clearable
-                           class="addinputw">
-                  <el-option v-for="item in independentSources_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
+                <el-select v-model="listQuery.params.independentSourcesKey" placeholder="请选择" filterable clearable class="addinputw">
+                  <el-option v-for="item in independentSources_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="燃料箱">
                 <el-select v-model="listQuery.params.fuelTankKey" placeholder="请选择" filterable clearable class="addinputw">
-                  <el-option v-for="item in fuelTank_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
+                  <el-option v-for="item in fuelTank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="多媒体">
                 <el-select v-model="listQuery.params.multimediaKey" placeholder="请选择" filterable clearable class="addinputw">
-                  <el-option v-for="item in multimedia_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"/>
+                  <el-option v-for="item in multimedia_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="常用配置名称">
-                <el-input v-model="listQuery.params.configName" maxlength="125" placeholder="请输入常用配置名称"
-                          class="addinputw" clearable/>
+                <el-input v-model="listQuery.params.configName" maxlength="125" placeholder="请输入常用配置名称" class="addinputw" clearable/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
-              <el-button type="primary" icon="el-icon-search" size="small"  @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
               <el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
             </div>
           </div>
         </div>
         <div class="listtop">
           <div class="tit">常用配置列表</div>
-          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
-                  :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
         <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
-                    @selection-change="handleSelectionChange">
-            <el-table-column width="50px" type="selection" align="center"/>
-            <el-table-column fixed width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column fixed label="操作" align="center" width="80px" class-name="small-padding fixed-width">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column width="50p" type="selection" align="center"/>
+            <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column fixed label="操作" align="center" width="80" class-name="small-padding fixed-width">
               <template slot-scope="{row}">
                 <el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column width="110px" label="关联状态" align="center">
+            <el-table-column width="110" label="关联状态" align="center">
               <template slot-scope="scope">
-                <span class="bluezi" @click="handleOpen(scope.row)">{{
-                    scope.row.isRelationState === 1 ? '已关联' : '未关联'
-                  }}</span>
+                <span class="bluezi" @click="handleOpen(scope.row)">{{ scope.row.isRelationState === 1 ? '已关联' : '未关联' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="常用配置编码" width="190px" align="center">
+            <el-table-column label="常用配置编码" width="190" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.configCode }}</span>
               </template>
@@ -153,122 +141,116 @@
                 <span>{{ scope.row.createOrg }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="使用状态" width="110px" align="center">
+            <el-table-column label="使用状态" width="110" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.isUseState === 1 ? '已使用' : '未使用' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="颜色" width="110px" align="center">
+            <el-table-column label="后桥" width="130" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rearAxleValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="速比" width="130" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rearAxleRatio }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="轴距" width="110" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.wheelbase }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="悬架/板簧片数" width="150" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.suspension }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="鞍座" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.saddle }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="颜色" width="110" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.carColor }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="驾驶室" width="110" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.specification }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="保险杠" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.bumper }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="燃料箱" width="110" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.fuelTank }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="导流罩" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.baffleModel }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="独立热源" width="110" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.independentSources }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="缓速器" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.slowMachine }}</span>
               </template>
             </el-table-column>
-          <el-table-column label="后视镜" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.rearViewMirror }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="轮胎" width="130px" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.tireSize }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="驾驶室" width="110px" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.specification }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="后桥" width="130px" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.rearAxleValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="速比" width="130px" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.rearAxleRatio }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="空调" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.airConditioner }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="轮毂材质" width="130px" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.hubMaterial }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="导流罩" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.baffleModel }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="悬架" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.suspension }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="座椅" width="130px" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.seat }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="护轮罩" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.tireCover }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="鞍座" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.saddle }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="轴距" width="110px" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.wheelbase }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="保险杠" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.bumper }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="配置包" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.configuringBao }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="独立热源" width="110px" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.independentSources }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="燃料箱" width="110px" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.fuelTank }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="多媒体" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.multimedia }}</span>
-            </template>
-          </el-table-column>
-<!--            <el-table-column label="货箱" align="center">-->
-<!--              <template slot-scope="scope">-->
-<!--                <span>{{ scope.row.packingCase }}</span>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
+            <el-table-column label="护轮罩" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.tireCover }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="后视镜" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rearViewMirror }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="轮胎" width="130" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.tireSize }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="轮毂材质" width="130" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.hubMaterial }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="空调" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.airConditioner }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="座椅" width="130" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.seat }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="多媒体" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.multimedia }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="配置包" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configuringBao }}</span>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
         <div class="pages">
           <!-- 翻页 -->
-          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
-                      :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
       </div>
     </div>
@@ -276,7 +258,6 @@
     <changyongpeizhi-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="getList"></changyongpeizhi-add>
     <changyongpeizhi-info v-show="viewState == 4" ref="divinfo" @doback="resetState"></changyongpeizhi-info>
     <changyongpeizhi-rel v-show="viewState == 5" ref="relation" @doback="resetState" @reloadlist="getList"></changyongpeizhi-rel>
-
   </div>
 </template>
 
@@ -297,7 +278,7 @@ export default {
     pageye,
     ButtonBar,
     changyongpeizhiAdd,
-    changyongpeizhiInfo,
+    changyongpeizhiInfo
   },
   // directives: {
   //   drag: {
@@ -450,7 +431,7 @@ export default {
     }
   },
   mounted() {
-    this.$refs["btnbar"].setButtonList(this.btnList)
+    this.$refs['btnbar'].setButtonList(this.btnList)
   },
   created() {
     this.getList() // 加载列表
@@ -673,7 +654,7 @@ export default {
     },
     // 返回
     doClose() {
-      this.$store.dispatch('tagsView/delView', this.$route);
+      this.$store.dispatch('tagsView/delView', this.$route)
       this.$router.go(-1)
     },
     // 序号
@@ -829,20 +810,18 @@ export default {
             var sids = bb.join(',')
             console.log('删除的数据', sids)
             const params = {
-              sids:sids,
-              userSid:window.sessionStorage.getItem('userSid')
+              sids: sids,
+              userSid: window.sessionStorage.getItem('userSid')
             }
             deleteBySids(params).then(resp => {
-              if (resp.success && resp.code == '200'){
+              if (resp.success) {
                 loading.close()
                 _this.$message({ type: 'success', message: resp.msg, showClose: true })
                 _this.getList()
-              }else {
+              } else {
                 loading.close()
-                // _this.$message({ type: 'error', message: resp.msg, showClose: true })
               }
-            })
-              .catch(e => {
+            }).catch(e => {
                 loading.close()
               })
           })
@@ -869,51 +848,13 @@ export default {
 }
 </script>
 <style scoped>
-/deep/ .el-collapse {
-  border-top: 0px solid #e6ebf5;
-  border-bottom: 0px solid #e6ebf5;
-}
-
-/deep/ .el-collapse-item__content {
-  margin: 0;
-  padding: 0;
-}
-
-/deep/ .el-collapse-item__wrap {
-  border-bottom: 0px solid #ebeef5;
-}
+/*.tab-header {*/
+/*  background-color: #edf1f7;*/
+/*  padding: 8px 20px;*/
+/*  margin-bottom: 0 !important;*/
+/*}*/
 
-/deep/ .el-collapse-item__header {
-  border-bottom: 0px solid #e6ebf5;
-}
-.listtop {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border: 1px solid #dfe4ed;
-  height: 40px;
-}
-
-.tit {
-  margin-bottom: -10px;
-}
-
-.pagination {
-  margin-bottom: -10px;
-}
-
-.btn {
-  padding: 15px 0 15px 0;
-  border: 1px solid #e0e3eb;
-}
-
-.tab-header {
-  background-color: #edf1f7;
-  padding: 8px 20px;
-  margin-bottom: 0 !important;
-}
-
-.tab-header /deep/ .el-form-item {
-  margin-bottom: 10px;
-}
+/*.tab-header /deep/ .el-form-item {*/
+/*  margin-bottom: 10px;*/
+/*}*/
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue
index cfa9e696a1..f979c4b39b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue
@@ -15,51 +15,51 @@
         <el-row>
           <el-col :span="5">
             <div class="span-sty">
-              <span>颜色</span>
+              <span>后桥</span>
             </div>
-            <el-form-item prop="carColor">
-              <el-select v-model="temp.carColor" placeholder="请选择" filterable clearable @change="changeCarColor" class="addinputw">
-                <el-option v-for="item in carColor_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="rearAxleValue">
+              <el-select v-model="temp.rearAxleValue" placeholder="请选择" filterable clearable class="addinputw" @change="changeRearAxleValue">
+                <el-option v-for="item in rearAxleValue_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>缓速器</span>
+              <span>速比</span> <!-- 原后桥速比 -->
             </div>
-            <el-form-item prop="slowMachine">
-              <el-select v-model="temp.slowMachine" placeholder="请选择" filterable clearable class="addinputw" @change="changeSlowMachine">
-                <el-option v-for="item in slowMachine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="rearAxleRatio">
+              <el-select v-model="temp.rearAxleRatio" placeholder="请选择" filterable clearable class="addinputw" @change="changeRearAxleRatio">
+                <el-option v-for="item in rearAxleRatio_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>后视镜</span>
+              <span>轴距</span>
             </div>
-            <el-form-item prop="rearViewMirror">
-              <el-select v-model="temp.rearViewMirror" placeholder="请选择" filterable clearable class="addinputw" @change="changeRearViewMirror">
-                <el-option v-for="item in rearViewMirror_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="wheelbase">
+              <el-select v-model="temp.wheelbase" placeholder="请选择" filterable clearable class="addinputw" @change="changeWheelbase">
+                <el-option v-for="item in wheelbase_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>轮胎</span>
+              <span>悬架</span>
             </div>
-            <el-form-item prop="tireSize">
-              <el-select v-model="temp.tireSize" placeholder="请选择" filterable clearable class="addinputw" @change="changeTireSize">
-                <el-option v-for="item in tireSize_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="suspension">
+              <el-select v-model="temp.suspension" placeholder="请选择" filterable clearable class="addinputw addinputw02" @change="changeSuspension">
+                <el-option v-for="item in suspension_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <div class="span-sty">
-              <span>驾驶室</span>
+              <span>鞍座</span>
             </div>
-            <el-form-item prop="specification">
-              <el-select v-model="temp.specification" placeholder="请选择" filterable clearable class="addinputw addinputw02" @change="changeSpecification">
-                <el-option v-for="item in specification_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="saddle">
+              <el-select v-model="temp.saddle" placeholder="请选择" filterable clearable class="addinputw" @change="changeSaddle">
+                <el-option v-for="item in saddle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -67,41 +67,41 @@
         <el-row>
           <el-col :span="5">
             <div class="span-sty">
-              <span>后桥</span>
+              <span>颜色</span>
             </div>
-            <el-form-item prop="rearAxleValue">
-              <el-select v-model="temp.rearAxleValue" placeholder="请选择" filterable clearable class="addinputw" @change="changeRearAxleValue">
-                <el-option v-for="item in rearAxleValue_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="carColor">
+              <el-select v-model="temp.carColor" placeholder="请选择" filterable clearable @change="changeCarColor" class="addinputw">
+                <el-option v-for="item in carColor_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>速比</span> <!-- 原后桥速比 -->
+              <span>驾驶室</span>
             </div>
-            <el-form-item prop="rearAxleRatio">
-              <el-select v-model="temp.rearAxleRatio" placeholder="请选择" filterable clearable class="addinputw" @change="changeRearAxleRatio">
-                <el-option v-for="item in rearAxleRatio_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="specification">
+              <el-select v-model="temp.specification" placeholder="请选择" filterable clearable class="addinputw addinputw02" @change="changeSpecification">
+                <el-option v-for="item in specification_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>空调</span>
+              <span>保险杠</span>
             </div>
-            <el-form-item prop="airConditioner">
-              <el-select v-model="temp.airConditioner" placeholder="请选择" filterable clearable class="addinputw" @change="changeAirConditioner">
-                <el-option v-for="item in airConditioner_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="bumper">
+              <el-select v-model="temp.bumper" placeholder="请选择" filterable clearable class="addinputw addinputw02" @change="changeBumper">
+                <el-option v-for="item in bumper_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>轮毂材质</span>
+              <span>燃料箱</span>
             </div>
-            <el-form-item prop="hubMaterial">
-              <el-select v-model="temp.hubMaterial" placeholder="请选择" filterable clearable class="addinputw" @change="changeHubMaterial">
-                <el-option v-for="item in hubMaterial_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="fuelTank">
+              <el-select v-model="temp.fuelTank" placeholder="请选择" filterable clearable class="addinputw" @change="changefuelTank">
+                <el-option v-for="item in fuelTank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -119,21 +119,21 @@
         <el-row>
           <el-col :span="5">
             <div class="span-sty">
-              <span>悬架</span>
+              <span>独立热源</span>
             </div>
-            <el-form-item prop="suspension">
-              <el-select v-model="temp.suspension" placeholder="请选择" filterable clearable class="addinputw addinputw02" @change="changeSuspension">
-                <el-option v-for="item in suspension_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="independentSources">
+              <el-select v-model="temp.independentSources" placeholder="请选择" filterable clearable class="addinputw" @change="changeIndependentSources">
+                <el-option v-for="item in independentSources_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>座椅</span>
+              <span>缓速器</span>
             </div>
-            <el-form-item prop="seat">
-              <el-select v-model="temp.seat" placeholder="请选择" filterable clearable class="addinputw" @change="changeSeat">
-                <el-option v-for="item in seat_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="slowMachine">
+              <el-select v-model="temp.slowMachine" placeholder="请选择" filterable clearable class="addinputw" @change="changeSlowMachine">
+                <el-option v-for="item in slowMachine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -149,21 +149,21 @@
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>鞍座</span>
+              <span>后视镜</span>
             </div>
-            <el-form-item prop="saddle">
-              <el-select v-model="temp.saddle" placeholder="请选择" filterable clearable class="addinputw" @change="changeSaddle">
-                <el-option v-for="item in saddle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="rearViewMirror">
+              <el-select v-model="temp.rearViewMirror" placeholder="请选择" filterable clearable class="addinputw" @change="changeRearViewMirror">
+                <el-option v-for="item in rearViewMirror_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <div class="span-sty">
-              <span>轴距</span>
+              <span>轮胎</span>
             </div>
-            <el-form-item prop="wheelbase">
-              <el-select v-model="temp.wheelbase" placeholder="请选择" filterable clearable class="addinputw" @change="changeWheelbase">
-                <el-option v-for="item in wheelbase_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="tireSize">
+              <el-select v-model="temp.tireSize" placeholder="请选择" filterable clearable class="addinputw" @change="changeTireSize">
+                <el-option v-for="item in tireSize_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -171,66 +171,54 @@
         <el-row>
           <el-col :span="5">
             <div class="span-sty">
-              <span>保险杠</span>
+              <span>轮毂材质</span>
             </div>
-            <el-form-item prop="bumper">
-              <el-select v-model="temp.bumper" placeholder="请选择" filterable clearable class="addinputw addinputw02" @change="changeBumper">
-                <el-option v-for="item in bumper_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="hubMaterial">
+              <el-select v-model="temp.hubMaterial" placeholder="请选择" filterable clearable class="addinputw" @change="changeHubMaterial">
+                <el-option v-for="item in hubMaterial_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>配置包</span>
+              <span>空调</span>
             </div>
-            <el-form-item prop="configuringBao">
-              <el-select v-model="temp.configuringBao" placeholder="请选择" filterable clearable class="addinputw" @change="changeConfiguringBao">
-                <el-option v-for="item in configuringBao_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="airConditioner">
+              <el-select v-model="temp.airConditioner" placeholder="请选择" filterable clearable class="addinputw" @change="changeAirConditioner">
+                <el-option v-for="item in airConditioner_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>独立热源</span>
+              <span>座椅</span>
             </div>
-            <el-form-item prop="independentSources">
-              <el-select v-model="temp.independentSources" placeholder="请选择" filterable clearable class="addinputw" @change="changeIndependentSources">
-                <el-option v-for="item in independentSources_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="seat">
+              <el-select v-model="temp.seat" placeholder="请选择" filterable clearable class="addinputw" @change="changeSeat">
+                <el-option v-for="item in seat_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>燃料箱</span>
+              <span>多媒体</span>
             </div>
-            <el-form-item prop="fuelTank">
-              <el-select v-model="temp.fuelTank" placeholder="请选择" filterable clearable class="addinputw" @change="changefuelTank">
-                <el-option v-for="item in fuelTank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="multimedia">
+              <el-select v-model="temp.multimedia" placeholder="请选择" filterable clearable class="addinputw" @change="changeMultimedia">
+                <el-option v-for="item in multimedia_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <div class="span-sty">
-              <span>多媒体</span>
+              <span>配置包</span>
             </div>
-            <el-form-item prop="multimedia">
-              <el-select v-model="temp.multimedia" placeholder="请选择" filterable clearable class="addinputw" @change="changeMultimedia">
-                <el-option v-for="item in multimedia_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+            <el-form-item prop="configuringBao">
+              <el-select v-model="temp.configuringBao" placeholder="请选择" filterable clearable class="addinputw" @change="changeConfiguringBao">
+                <el-option v-for="item in configuringBao_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
-          <!--          <el-col :span="4">-->
-          <!--            <div class="span-sty">-->
-          <!--            <span>货箱</span>-->
-          <!--            </div>-->
-          <!--          </el-col>-->
-          <!--          <el-col :span="2">-->
-          <!--            <el-form-item prop="packingCase">-->
-          <!--            <el-select v-model="temp.packingCase" placeholder="请选择" filterable clearable class="addinputw addinputw02" @change="changePackingCase">-->
-          <!--              <el-option v-for="item in packingCase_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>-->
-          <!--            </el-select>-->
-          <!--              </el-form-item>-->
-          <!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -1052,20 +1040,6 @@ export default {
 }
 </script>
 <style scoped>
-.listconadd {
-  width: 100%;
-  padding: 32px 14px;
-}
-
-/deep/ .el-col-2 {
-  text-align: right;
-  float: left;
-  font-size: 14px;
-  color: #606266;
-  line-height: 40px !important;
-  font-weight: 600;
-}
-
 .formaddcopy02 .el-row /deep/ .el-col {
   padding: 0 8px;
 }
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiInfo.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiInfo.vue
index 6b8d39d7bf..7cb9972516 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiInfo.vue
@@ -12,102 +12,82 @@
         <el-row>
           <el-col :span="5">
             <div class="span-sty">
-              <span>颜色</span>
+              <span>后桥</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
-            <el-form-item prop="carColor">
-              <span class="">{{ temp.carColor }}</span>
+            <el-form-item prop="rearAxleValue">
+              <span class="">{{ temp.rearAxleValue }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>缓速器</span>
+              <span>速比</span> <!-- 原后桥速比 -->
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
-            <el-form-item prop="slowMachine">
-              <span class="">{{ temp.slowMachine }}</span>
+            <el-form-item prop="rearAxleRatio">
+              <span class="">{{ temp.rearAxleRatio }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>后视镜</span>
+              <span>轴距</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
-            <el-form-item prop="rearViewMirror">
-              <span class="">{{ temp.rearViewMirror }}</span>
+            <el-form-item prop="wheelbase">
+              <span class="">{{ temp.wheelbase }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>轮胎</span>
+              <span>悬架</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
-            <el-form-item prop="tireSize">
-              <span class="">{{ temp.tireSize }}</span>
+            <el-form-item prop="suspension">
+              <span class="">{{ temp.suspension }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <div class="span-sty">
-              <span>驾驶室</span>
+              <span>鞍座</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="2" class="tleftb">-->
-            <el-form-item prop="specification">
-              <span class="">{{ temp.specification }}</span>
+            <el-form-item prop="saddle">
+              <span class="">{{ temp.saddle }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="5">
             <div class="span-sty">
-              <span>后桥</span>
+              <span>颜色</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
-            <el-form-item prop="rearAxleValue">
-              <span class="">{{ temp.rearAxleValue }}</span>
+            <el-form-item prop="carColor">
+              <span class="">{{ temp.carColor }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>速比</span> <!-- 原后桥速比 -->
+              <span>驾驶室</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
-            <el-form-item prop="rearAxleRatio">
-              <span class="">{{ temp.rearAxleRatio }}</span>
+            <el-form-item prop="specification">
+              <span class="">{{ temp.specification }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>空调</span> <!-- 0 1-->
+              <span>保险杠</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
-            <el-form-item prop="airConditioner">
-              <span class="">{{ temp.airConditioner }}</span>
+            <el-form-item prop="bumper">
+              <span class="">{{ temp.bumper }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>轮毂材质</span>
+              <span>燃料箱</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
-            <el-form-item prop="hubMaterial">
-              <span class="">{{ temp.hubMaterial }}</span>
+            <el-form-item prop="fuelTank">
+              <span class="">{{ temp.fuelTank }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <div class="span-sty">
-              <span>导流罩</span> <!-- 0 1 -->
+              <span>导流罩</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
             <el-form-item prop="baffleModel">
               <span class="">{{ temp.baffleModel }}</span>
             </el-form-item>
@@ -116,125 +96,92 @@
         <el-row>
           <el-col :span="5">
             <div class="span-sty">
-              <span>悬架</span>
+              <span>独立热源</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="2" class="tleftb">-->
-            <el-form-item prop="suspension">
-              <span class="">{{ temp.suspension }}</span>
+            <el-form-item prop="independentSources">
+              <span class="">{{ temp.independentSources }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>座椅</span>
+              <span>缓速器</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
-            <el-form-item prop="seat">
-              <span class="">{{ temp.seat }}</span>
+            <el-form-item prop="slowMachine">
+              <span class="">{{ temp.slowMachine }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>护轮罩</span> <!-- 0 1 -->
+              <span>护轮罩</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
             <el-form-item prop="tireCover">
               <span class="">{{ temp.tireCover }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>鞍座</span>
+              <span>后视镜</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
-            <el-form-item prop="saddle">
-              <span class="">{{ temp.saddle }}</span>
+            <el-form-item prop="rearViewMirror">
+              <span class="">{{ temp.rearViewMirror }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <div class="span-sty">
-              <span>轴距</span>
+              <span>轮胎</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
-            <el-form-item prop="wheelbase">
-              <span class="">{{ temp.wheelbase }}</span>
+            <el-form-item prop="tireSize">
+              <span class="">{{ temp.tireSize }}</span>
             </el-form-item>
           </el-col>
-
         </el-row>
         <el-row>
           <el-col :span="5">
             <div class="span-sty">
-              <span>保险杠</span>
+              <span>轮毂材质</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="2" class="tleftb">-->
-            <el-form-item prop="bumper">
-              <span class="">{{ temp.bumper }}</span>
+            <el-form-item prop="hubMaterial">
+              <span class="">{{ temp.hubMaterial }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>配置包</span>
+              <span>空调</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
-            <el-form-item prop="configuringBao">
-              <span class="">{{ temp.configuringBao }}</span>
+            <el-form-item prop="airConditioner">
+              <span class="">{{ temp.airConditioner }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>独立热源</span> <!-- 0 1 -->
+              <span>座椅</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
-            <el-form-item prop="independentSources">
-              <span class="">{{ temp.independentSources }}</span>
+            <el-form-item prop="seat">
+              <span class="">{{ temp.seat }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty">
-              <span>燃料箱</span>
+              <span>多媒体</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
-            <el-form-item prop="fuelTank">
-              <span class="">{{ temp.fuelTank }}</span>
+            <el-form-item prop="multimedia" class="multimedia_sty">
+              <span>{{ temp.multimedia }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <div class="span-sty">
-              <span>多媒体</span>
+              <span>配置包</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="3">-->
-            <el-form-item prop="multimedia" class="multimedia_sty">
-              <span>{{ temp.multimedia }}</span>
+            <el-form-item prop="configuringBao">
+              <span class="">{{ temp.configuringBao }}</span>
             </el-form-item>
           </el-col>
-          <!--          <el-col :span="4">-->
-          <!--            <div class="span-sty">-->
-          <!--              <span>货箱</span>-->
-          <!--            </div>-->
-          <!--          </el-col>-->
-          <!--          <el-col :span="2" class="tleftb">-->
-          <!--            <el-form-item prop="packingCase">-->
-          <!--              <span class="">{{ temp.packingCase }}</span>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="24">
             <div class="span-sty">
               <span>更多配置</span>
             </div>
-            <!--          </el-col>-->
-            <!--          <el-col :span="22">-->
             <el-form-item prop="otherConfig">
               <span class="">{{ temp.otherConfig }}</span>
             </el-form-item>
@@ -267,7 +214,7 @@ export default {
       this.FormLoading = true
       details(sid).then((response) => {
         this.FormLoading = false
-        if (response.code === '200') {
+        if (response.success) {
           this.temp = response.data
         } else {
           this.$notify({
@@ -282,23 +229,11 @@ export default {
 }
 </script>
 <style scoped>
-/deep/ .el-col-2, .el-col-1 {
-  text-align: right;
-  float: left;
-  font-size: 14px;
-  color: #606266;
-  line-height: 40px !important;
-  font-weight: 600;
-}
-
-.tleftb {
-  text-align: left;
-}
-
 .formaddcopy02 .el-row .el-col /deep/ .el-form-item {
   margin-left: 65px;
 }
-.formaddcopy02 .el-row .el-col .multimedia_sty /deep/ .el-form-item__content{
-  line-height: 20px;
-}
+
+/*.formaddcopy02 .el-row .el-col .multimedia_sty /deep/ .el-form-item__content {*/
+/*  line-height: 20px;*/
+/*}*/
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue
index 3c7089fabb..0d36fc5b76 100644
--- a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue
@@ -42,22 +42,22 @@
                 <el-button size="mini" type="primary" :disabled="!row.isShow" @click="handleEdit(row)">编辑</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="jc" label="厂商名称" width="220" header-align="center" align="left">
+            <el-table-column prop="jc" label="供应商名称" width="220" header-align="center" align="left">
               <template slot-scope="scope">
                 <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.manufacturerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="厂商分类" width="110" align="center">
+            <el-table-column label="供应商分类" width="110" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.supplierTypeValue }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="厂商通讯地址" width="" header-align="center" align="left">
+            <el-table-column label="供应商通讯地址" width="" header-align="center" align="left">
               <template slot-scope="scope">
                 <span>{{ scope.row.manufacturerAddress }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="厂商办公电话" width="180" align="center">
+            <el-table-column label="供应商办公电话" width="180" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.manufacturerTelePhone }}</span>
               </template>
diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuAdd.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuAdd.vue
index 5261bee71d..c7c13b4898 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/changjiatuiku/changjiatuikuguanli/changjiatuikuAdd.vue
@@ -165,7 +165,7 @@ export default {
         console.log(e.target.value)
         e.target.value = parseFloat(e.target.value)
       }
-      row.disabledRefundMoney = e.target.value
+      row.refundMoney = e.target.value
     },
     showEdit(row) {
       this.$nextTick(() => {
@@ -249,7 +249,7 @@ export default {
       })
     },
     confirm(row) {
-      if (row.disabledRefundMoney !== row.costPrice && row.manDeduRemarks === '') {
+      if (row.refundMoney !== row.costPrice && row.manDeduRemarks === '') {
         this.$message({ showClose: true, type: 'error', message: '因厂家结算价与退款金额不一致,请填写厂家扣款说明' })
         return
       }
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
index 3e6c84cc4d..81550a229d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
@@ -266,6 +266,10 @@ export default {
           brandDown({ useOrg: resp.data }).then((res) => {
             if (res.success) {
               this.carBrand_list = res.data
+              if (this.carBrand_list.length > 0) {
+                this.formobj.carBrandName = this.carBrand_list[0].brandName
+                this.formobj.carBrandSid = this.carBrand_list[0].sid
+              }
             }
           })
         }
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
index 449afe0fe4..cd772694c8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
@@ -6,7 +6,7 @@
         <div>
           <el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
           <el-button type="success" size="small" @click="handlePass()">通过</el-button>
-          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
       <div class="listconadd">
@@ -15,84 +15,50 @@
           <div class="yancheAdd" style="margin-top: 5px;">
             <el-row class="yancheAdd-bor">
               <el-col :span="12" class="yancheAdd-bor">
-                <el-form-item prop="vin" label="车架号：">
-                  <el-input
-                    v-model="temp.vin"
-                    placeholder="请输入车架号"
-                    class="addinputw"
-                    :readonly="temp.purchaseKey !== '002'"
-                  />
+                <el-form-item prop="vin" label="车架号:">
+                  <el-input v-model="temp.vin" placeholder="请输入车架号" class="addinputw" :readonly="temp.purchaseKey !== '002'"/>
                 </el-form-item>
               </el-col>
               <el-col :span="12" class="yancheAdd-bor">
-                <el-form-item prop="model" label="车型：">
-                  <el-input
-                    v-model="temp.model"
-                    placeholder="请输入车型"
-                    class="addinputw"
-                    readonly
-                  />
+                <el-form-item prop="vin" label="发动机号:">
+                  <el-input v-model="temp.engineNo" placeholder="请输入车架号" class="addinputw" :readonly="temp.purchaseKey !== '002'"/>
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-col :span="12" class="yancheAdd-bor">
+              <el-form-item prop="model" label="车型:">
+                <el-input v-model="temp.model" placeholder="请输入车型" class="addinputw" readonly/>
+              </el-form-item>
+            </el-col>
             <el-row class="yancheAdd-bor">
-              <el-col :span="24" class="yancheAdd-bor">
-                <el-form-item prop="config" label="配置：">
-                  <el-input
-                    v-model="temp.config"
-                    type="textarea"
-                    autosize
-                    placeholder="请输入配置"
-                    class="addinputw addinputw_copy"
-                    readonly/>
+              <el-col :span="12" class="yancheAdd-bor">
+                <el-form-item prop="config" label="配置:">
+                  <el-input v-model="temp.config" type="textarea" autosize placeholder="请输入配置" class="addinputw addinputw_copy" readonly/>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row class="yancheAdd-bor">
               <el-col :span="12" class="yancheAdd-bor">
-                <el-form-item prop="modelDifferenceExplain" label="车型配置差异说明：">
-                  <el-input
-                    v-model="temp.modelDifferenceExplain"
-                    type="textarea"
-                    autosize
-                    placeholder="请输入车型配置差异说明"
-                    class="addinputw addinputw_copy"/>
+                <el-form-item prop="modelDifferenceExplain" label="车型配置差异说明:">
+                  <el-input v-model="temp.modelDifferenceExplain" type="textarea" autosize placeholder="请输入车型配置差异说明" class="addinputw addinputw_copy"/>
                 </el-form-item>
               </el-col>
               <el-col :span="12" class="yancheAdd-bor">
-                <el-form-item prop="priceDate" label="厂家入库日期：">
-                  <el-date-picker
-                    :readonly="temp.purchaseKey !== '002'"
-                    v-model="temp.inboundDate"
-                    type="date"
-                    placeholder="选择日期"
-                    value-format="yyyy-MM-dd"
-                    class="addinputw">
+                <el-form-item prop="priceDate" label="厂家入库日期:">
+                  <el-date-picker :readonly="temp.purchaseKey !== '002'" v-model="temp.inboundDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" class="addinputw">
                   </el-date-picker>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item prop="guaranteeCardNo" label="保修卡号：">
-                  <el-input
-                    v-model="temp.guaranteeCardNo"
-                    placeholder="请输入保修卡号"
-                    class="addinputw"
-                    clearable
-                    @keyup.native="temp.guaranteeCardNo = oninput(temp.guaranteeCardNo,2)"
-                  />
+                <el-form-item prop="guaranteeCardNo" label="保修卡号:">
+                  <el-input v-model="temp.guaranteeCardNo" placeholder="请输入保修卡号" class="addinputw" clearable @keyup.native="temp.guaranteeCardNo = oninput(temp.guaranteeCardNo,2)"/>
                 </el-form-item>
               </el-col>
               <el-col :span="10">
-                <el-form-item prop="price" label="洗车费：">
-                  <el-input
-                    v-model="temp.price"
-                    placeholder="请输入洗车费"
-                    class="addinputw"
-                    clearable
-                    @keyup.native="temp.price = oninput(temp.price,2)"
-                  />
+                <el-form-item prop="price" label="洗车费:">
+                  <el-input v-model="temp.price" placeholder="请输入洗车费" class="addinputw" clearable @keyup.native="temp.price = oninput(temp.price,2)"/>
                 </el-form-item>
               </el-col>
               <el-col :span="2">
@@ -119,17 +85,9 @@
               <span>验车情况说明</span>
             </el-col>
             <el-col :span="21">
-              <el-input
-                type="textarea"
-                autosize
-                placeholder="请输入说明"
-                v-model="temp.remarks">
-              </el-input>
+              <el-input type="textarea" autosize placeholder="请输入说明" v-model="temp.remarks"></el-input>
             </el-col>
           </el-row>
-<!--          <el-row class="last_btn">-->
-<!--            <el-button type="primary" size="small" @click="handleChecklist()">车辆检查表</el-button>-->
-<!--          </el-row>-->
         </el-form>
       </div>
     </div>
@@ -153,7 +111,7 @@ export default {
   data() {
     return {
       viewTitle: '',
-      isCheck:true,
+      isCheck: true,
       // --按钮菜单-------
       sid: '',
       datas: null,
@@ -170,8 +128,9 @@ export default {
         config: '',
         model: '',
         inspectedSid: '',
-        modelDifferenceExplain:'',
-        guaranteeCardNo:''
+        modelDifferenceExplain: '',
+        guaranteeCardNo: '',
+        engineNo: ''
       }, // 添加和修改
       dialogFormVisible: false, // 添加修改对话框状态
       dialogFormShowVisible: false, // 查看对话框默认关闭状态
@@ -187,12 +146,12 @@ export default {
   methods: {
     // 输入数字正则
     oninput(val, limit = 0) {
-      val = val.replace(/[^\d.]/g, '') //保留数字
-      val = val.replace(/^00/, '0.') //开头不能有两个0
-      val = val.replace(/^\./g, '0.') //开头为小数点转换为0.
-      val = val.replace(/\.{2,}/g, '.') //两个以上的小数点转换成一个
-      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //只保留一个小数点
-      /^0\d+/.test(val) ? val = val.slice(1) : '' //两位以上数字开头不能为0
+      val = val.replace(/[^\d.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
       const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
       const reg = new RegExp(str)
       if (limit === 0) {
@@ -208,7 +167,7 @@ export default {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
-      console.log('点击验车跳转页面',row)
+      console.log('点击验车跳转页面', row)
       this.dialogStatus = 'add'
       this.viewTitle = '验车单'
       const data = {
@@ -270,11 +229,11 @@ export default {
     //   this.getZuZhi()
     //   this.getUseOrg()
     // },
-    handleChecklist(){
+    handleChecklist() {
       this.isCheck = false
       this.$refs['divchecklist'].showCheck(this.temp.inspectedSid)
     },
-    resetState(){
+    resetState() {
       this.isCheck = true
     },
     // 获得使用组织
@@ -333,8 +292,9 @@ export default {
         config: '',
         model: '',
         inspectedSid: '',
-        modelDifferenceExplain:'',
-        guaranteeCardNo:''
+        modelDifferenceExplain: '',
+        guaranteeCardNo: '',
+        engineNo: ''
       }
       this.imgList01 = []
       this.imgList02 = []
@@ -346,20 +306,20 @@ export default {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           this.FormLoading = true
-          if (this.temp.carInspectedImage.length == 0) {
+          if (this.temp.carInspectedImage.length === 0) {
             this.$message({
               showClose: true,
               message: '请上传验车相关照片！',
               type: 'error'
-            });
+            })
             return
           }
-          if (this.temp.factoryImage.length == 0) {
+          if (this.temp.factoryImage.length === 0) {
             this.$message({
               showClose: true,
               message: '请上传厂家验车单照片！',
               type: 'error'
-            });
+            })
             return
           }
           // 只需添加和修改
@@ -368,12 +328,6 @@ export default {
             if (response.code === '200') {
               this.dialogFormVisible = false
               this.handleReturn('true')
-            } else {
-              // this.$message({
-              //   showClose: true,
-              //   message: '添加失败！',
-              //   type: 'error'
-              // });
             }
           })
         }
@@ -385,23 +339,23 @@ export default {
         if (valid) {
           submitCarInspectedInfo(this.temp).then((response) => {
             this.FormLoading = false
-            if (this.temp.carInspectedImage.length == 0) {
-            this.$message({
-              showClose: true,
-              message: '请上传验车相关照片！',
-              type: 'error'
-            });
-            return
-          }
-          console.log('照片02',this.temp.factoryImage)
-          if (this.temp.factoryImage.length == 0) {
-            this.$message({
-              showClose: true,
-              message: '请上传厂家验车单照片！',
-              type: 'error'
-            });
-            return
-          }
+            if (this.temp.carInspectedImage.length === 0) {
+              this.$message({
+                showClose: true,
+                message: '请上传验车相关照片！',
+                type: 'error'
+              })
+              return
+            }
+            console.log('照片02', this.temp.factoryImage)
+            if (this.temp.factoryImage.length === 0) {
+              this.$message({
+                showClose: true,
+                message: '请上传厂家验车单照片！',
+                type: 'error'
+              })
+              return
+            }
             if (response.code === '200') {
               this.dialogFormVisible = false
               this.handleReturn('true')
@@ -451,10 +405,12 @@ export default {
   line-height: 40px !important;
   font-weight: 600;
 }
-.addinputw_copy{
+
+.addinputw_copy {
   width: 92% !important;
 }
-.formadd .last_btn{
+
+.formadd .last_btn {
   float: right;
   top: 30px;
 }
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue
index a7ac24f5be..5830ccc332 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue
@@ -13,43 +13,48 @@
           <div class="yancheAdd" style="margin-top: 5px;">
             <el-row class="yancheAdd-bor">
               <el-col :span="12" class="yancheAdd-bor">
-                <el-form-item prop="vin" label="车架号：">
+                <el-form-item prop="vin" label="车架号:">
                   <span>{{ temp.vin }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="12" class="yancheAdd-bor">
-                <el-form-item prop="model" label="车型：">
-                  <span>{{ temp.model }}</span>
+                <el-form-item prop="model" label="发动机号:">
+                  <span>{{ temp.engineNo }}</span>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row class="yancheAdd-bor">
-              <el-col :span="24" class="yancheAdd-bor">
-                <el-form-item prop="config" label="配置：">
+              <el-col :span="12" class="yancheAdd-bor">
+                <el-form-item prop="model" label="车型:">
+                  <span>{{ temp.model }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" class="yancheAdd-bor">
+                <el-form-item prop="config" label="配置:">
                   {{ temp.config }}
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row class="yancheAdd-bor">
               <el-col :span="12" class="yancheAdd-bor">
-                <el-form-item prop="modelDifferenceExplain" label="请输入车型配置差异说明：">
+                <el-form-item prop="modelDifferenceExplain" label="请输入车型配置差异说明:">
                   {{ temp.modelDifferenceExplain }}
                 </el-form-item>
               </el-col>
               <el-col :span="12" class="yancheAdd-bor">
-                <el-form-item prop="priceDate" label="厂家入库日期：">
+                <el-form-item prop="priceDate" label="厂家入库日期:">
                   <span>{{temp.inboundDate}}</span>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item prop="guaranteeCardNo" label="保修卡号：">
+                <el-form-item prop="guaranteeCardNo" label="保修卡号:">
                   <span>{{ temp.guaranteeCardNo }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="10">
-                <el-form-item prop="price" label="洗车费：">
+                <el-form-item prop="price" label="洗车费:">
                   <span>{{ temp.price }}</span>
                 </el-form-item>
               </el-col>
@@ -63,16 +68,7 @@
           <div class="title">验车相关照片</div>
           <el-row>
             <el-col :span="24">
-              <el-image
-                style="width: 178px;height: 178px;"
-                v-for="(item,index) in temp.carInspectedImage"
-                :key="index"
-                :src="item"
-                :preview-src-list="temp.carInspectedImage">
-              </el-image>
-              <!--  <img v-show="temp.carInspectedImage ? true : false" v-for="(item,index) in temp.carInspectedImage"-->
-              <!--       style="cursor:pointer;width: 178px;height: 178px;"-->
-              <!--       :src="item" @click="open(temp.carInspectedImage,index)">-->
+              <el-image style="width: 178px;height: 178px;" v-for="(item,index) in temp.carInspectedImage" :key="index" :src="item" :preview-src-list="temp.carInspectedImage"></el-image>
             </el-col>
           </el-row>
           <el-row>
@@ -80,16 +76,7 @@
               <span>厂家验车单照片</span>
             </el-col>
             <el-col :span="21">
-              <el-image
-                style="width: 178px;height: 178px;"
-                v-for="(item,index) in temp.factoryImage"
-                :key="index"
-                :src="item"
-                :preview-src-list="temp.factoryImage">
-              </el-image>
-              <!--  <img v-show="temp.factoryImage ? true : false" v-for="(item,index) in temp.factoryImage"-->
-              <!--       style="cursor:pointer;width: 178px;height: 178px;"-->
-              <!--       :src="item" @click="open(temp.factoryImage,index)">-->
+              <el-image style="width: 178px;height: 178px;" v-for="(item,index) in temp.factoryImage" :key="index" :preview-src-list="temp.factoryImage"></el-image>
             </el-col>
           </el-row>
           <el-row>
@@ -102,9 +89,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-<!--          <el-row class="last_btn">-->
-<!--            <el-button type="primary" size="small" @click="handleChecklist()">车辆检查表</el-button>-->
-<!--          </el-row>-->
         </el-form>
       </div>
     </div>
@@ -129,18 +113,17 @@
 
 <script>
 import { getCarInspected } from '@/api/supplychain/yancheguanli'
-// import vehiclechecklist from '@/views/supplychain/yancheguanli/vehiclechecklist'
 import vehiclechecklistInfo from '@/views/supplychain/yancheguanli/vehiclechecklistInfo'
 
 export default {
   name: 'yancheguanliInfo',
-  components:{
+  components: {
     vehiclechecklistInfo
   },
   data() {
     return {
       viewTitle: '',
-      isCheck:true,
+      isCheck: true,
       // --按钮菜单-------
       sid: '',
       dialogVisible: false,
@@ -179,11 +162,11 @@ export default {
         }
       })
     },
-    handleChecklist(){
+    handleChecklist() {
       this.isCheck = false
       this.$refs['divchecklist'].showCheck(this.temp.inspectedSid)
     },
-    resetState(){
+    resetState() {
       this.isCheck = true
     },
     open(val, index) {
diff --git a/anrui-system-ui/src/views/Home/Home.vue b/anrui-system-ui/src/views/Home/Home.vue
index e0d44bfd0a..084c425506 100644
--- a/anrui-system-ui/src/views/Home/Home.vue
+++ b/anrui-system-ui/src/views/Home/Home.vue
@@ -261,7 +261,7 @@ export default {
 
   },
   created() {
-    this.getsPasswordByUserSid()
+    // this.getsPasswordByUserSid()
   },
   mounted() {
     this.Orgname = window.sessionStorage.getItem('Orgname')
@@ -365,17 +365,17 @@ export default {
         // this.$router.push({path: '/index'})
         let myPopup = window.open('/#/index', '_blank')
       } else if (index == '7') {
-        let myPopup = window.open('http://120.46.172.184/base/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/base/#/' + '?token=' + getStorage(), '_blank')
       } else if (index == '8') {
-        let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/message/#/' + '?token=' + getStorage(), '_blank')
       } else if (index == '1') {
         let myPopup = window.open('http://anrui.yyundong.com/scm/#/' + '?token=' + getStorage(), '_blank')
       } else if (index == '4') {
-        let myPopup = window.open('http://120.46.172.184/fin/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/fin/#/' + '?token=' + getStorage(), '_blank')
       } else if (index == '5') {
-        let myPopup = window.open('http://120.46.172.184/manage/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/manage/#/' + '?token=' + getStorage(), '_blank')
       } else if (index == '0') {
-        let myPopup = window.open('http://120.46.172.184/buscenter/#/' + '?token=' + getStorage(), '_blank')
+        let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage(), '_blank')
       }
 //				const page = this.$router.resolve({name: name})
 //				window.open(page.href,'_blank')
diff --git a/anrui-system-ui/src/views/organizationManage/organizationManage.vue b/anrui-system-ui/src/views/organizationManage/organizationManage.vue
index 440b37c113..7f5f08576a 100644
--- a/anrui-system-ui/src/views/organizationManage/organizationManage.vue
+++ b/anrui-system-ui/src/views/organizationManage/organizationManage.vue
@@ -1,4 +1,4 @@
-<template xmlns="" xmlns="" xmlns="">
+<template>
   <div class="container" style="display: flex;">
     <div class="org-tree">
       <el-tree :data="treedata" node-key="sid" :props="props" :default-expanded-keys="['fd6435f2-0005-11ec-a033-48452053aa33']" @node-click="handleNodeClick">
@@ -34,48 +34,39 @@
           </td>
         </tr>
         <tr>
-          <td>组织地址</td>
+          <td>组织简称</td>
           <td>
-            <el-input v-model="form.addrs" style="width:300px"></el-input>
+            <el-input v-model="form.orgAbbre" style="width: 30%"></el-input>
           </td>
-          <td>组织属性</td>
+          <td>分管人员</td>
           <td>
-            <el-select v-model="form.orgAttributeValue" placeholder="请选择" filterable @change="changeOrgAttribute">
-              <el-option v-for="item in orgAttribute_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+            <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
+              <el-option v-for="item in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
             </el-select>
           </td>
         </tr>
         <tr>
-<!--          <td>主管人员</td>-->
-<!--          <td>-->
-<!--            <el-select v-model="form.zgStaffSid" style="width:300px" clearable>-->
-<!--              <el-option v-for="(item, i) in staffdata" :key="i" :label="item.name" :value="item.sid">-->
-<!--              </el-option>-->
-<!--            </el-select>-->
-<!--          </td>-->
-          <td>组织简称</td>
+          <td>管理层级</td>
           <td>
-            <el-input v-model="form.orgAbbre" style="width: 30%"></el-input>
+            <el-select v-model="form.orgLevelValue" style="width:300px" placeholder="请选择" filterable @change="changeOrgLevel">
+              <el-option v-for="item in orgLevel_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+            </el-select>
           </td>
-          <td>分管人员</td>
+          <td>其他编码</td>
           <td>
-            <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
-              <el-option v-for="(item,index) in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
+            <el-input v-model="form.otherCode" style="width:300px" placeholder="与财务中客户编码相同"></el-input>
+          </td>
+        </tr>
+        <tr>
+          <td>组织地址</td>
+          <td>
+            <el-input v-model="form.addrs" style="width:300px"></el-input>
+          </td>
+          <td>组织属性</td>
+          <td>
+            <el-select v-model="form.orgAttributeValue" placeholder="请选择" filterable @change="changeOrgAttribute">
+              <el-option v-for="item in orgAttribute_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
             </el-select>
-            <!--            <el-autocomplete v-model="form.fgStaffName" :fetch-suggestions="querySearchAsync" class="addinputw"-->
-            <!--                             placeholder="请选择" @select="handleSelect">-->
-            <!--              <i slot="suffix" class="el-icon-edit el-input__icon" @click="inputclear"/>-->
-            <!--              <template slot-scope="{ item }">-->
-            <!--                <div style="paddingg:5px;background-color:Azure;">-->
-            <!--                  <span>分管人员：</span>-->
-            <!--                  <span style="color:red">{{ item.name }}</span><br>-->
-            <!--                </div>-->
-            <!--              </template>-->
-            <!--            </el-autocomplete>-->
-            <!--            <el-select v-model="form.fgStaffSid" style="width:300px">-->
-            <!--              <el-option v-for="(item, i) in staffdata2" :key="i" :label="item.name" :value="item.sid">-->
-            <!--              </el-option>-->
-            <!--            </el-select>-->
           </td>
         </tr>
         <tr>
@@ -122,10 +113,8 @@
           </el-row>
         </el-form>
       </div>
-
       <!-- table -->
       <el-table :data="tableData" default-expand-all border style="width: 100%;">
-        <!--<el-table-column label="序号" type="index" width="40px" align="center"></el-table-column>-->
         <el-table-column label="操作" align="center" width="160px">
           <template slot-scope="scope">
             <el-button type="primary" size="mini" @click="editRow(scope.row)">
@@ -136,7 +125,6 @@
             </el-button>
           </template>
         </el-table-column>
-
         <el-table-column prop="name" label="组织名称" align="center"></el-table-column>
         <el-table-column prop="orgCode" label="组织编码" align="center"></el-table-column>
 <!--        <el-table-column prop="zgNames" label="主管" align="center"></el-table-column>-->
@@ -150,9 +138,7 @@
         </el-table-column>
         <el-table-column prop="qrText" label="二维码" align="center" width="80px">
           <template slot-scope="scope">
-            <el-button @click.native.prevent="lookRow(scope.row)" type="text" size="small">
-              查看
-            </el-button>
+            <el-button @click.native.prevent="lookRow(scope.row)" type="text" size="small">查看</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -214,33 +200,38 @@
             </td>
           </tr>
           <tr>
-            <td>组织地址</td>
+            <td>组织简称</td>
             <td>
-              <el-input v-model="form.addrs" style="width:300px"></el-input>
+              <el-input v-model="form.orgAbbre" style="width: 300px"></el-input>
             </td>
-            <td>组织属性</td>
+            <td>分管人员</td>
             <td>
-              <el-select v-model="form.orgAttributeValue" placeholder="请选择" filterable @change="changeOrgAttribute">
-                <el-option v-for="item in orgAttribute_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+              <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
+                <el-option v-for="item in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
               </el-select>
             </td>
           </tr>
           <tr>
-<!--            <td>主管人员</td>-->
-<!--            <td>-->
-<!--              <el-select v-model="form.zgStaffSid" clearable style="width:300px" @change="zgStaffSidChange">-->
-<!--                <el-option v-for="(item, i) in staffdata" :key="i" :label="item.name" :value="item.sid">-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </td>-->
-            <td>组织简称</td>
+            <td>管理层级</td>
             <td>
-              <el-input v-model="form.orgAbbre" style="width: 300px"></el-input>
+              <el-select v-model="form.orgLevelValue" style="width:300px" placeholder="请选择" filterable @change="changeOrgLevel">
+                <el-option v-for="item in orgLevel_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+              </el-select>
             </td>
-            <td>分管人员</td>
+            <td>其他编码</td>
             <td>
-              <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
-                <el-option v-for="(item,index) in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
+              <el-input v-model="form.otherCode" style="width:300px" placeholder="与财务中客户编码相同"></el-input>
+            </td>
+          </tr>
+          <tr>
+            <td>组织地址</td>
+            <td>
+              <el-input v-model="form.addrs" style="width:300px"></el-input>
+            </td>
+            <td>组织属性</td>
+            <td>
+              <el-select v-model="form.orgAttributeValue" placeholder="请选择" filterable @change="changeOrgAttribute">
+                <el-option v-for="item in orgAttribute_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
               </el-select>
             </td>
           </tr>
@@ -249,7 +240,6 @@
             <td>
               <el-input v-model="form.linkPerson" style="width:300px"></el-input>
             </td>
-
             <td>联系电话</td>
             <td>
               <el-input v-model="form.linkPhone" style="width:300px"></el-input>
@@ -279,7 +269,6 @@ import {
   addOrgTree,
   delOrgtree,
   getQrCode,
-  getStaff,
   getStaffName,
   orgList,
   pageList,
@@ -313,6 +302,7 @@ export default {
         address: ''
       },
       orgAttribute_list: [],
+      orgLevel_list: [],
       form: {
         sid: '',
         name: '',
@@ -329,7 +319,10 @@ export default {
         isDept: '',
         orgAbbre: '',
         orgAttributeValue: '',
-        orgAttributeKey: ''
+        orgAttributeKey: '',
+        orgLevelValue: '',
+        orgLevelKey: '',
+        otherCode: ''
       },
       fgStaffSid: [],
       formBackup: Object.assign({}, this.form),
@@ -346,29 +339,13 @@ export default {
       },
       tableData: [],
       treedata: [],
-      staffdata: [],
       staffdata2: [],
-      rules: {
-        name: [{ required: true, message: '请输入', trigger: 'blur' }],
-        orgCode: [{ required: true, message: '请输入', trigger: 'blur' }],
-        /* jwd: [
-           {required: true, message: '请输入', trigger: 'blur'}
-         ],*/
-        addrs: [{ required: true, message: '请输入', trigger: 'blur' }],
-        zgStaffSid: [{ required: true, message: '请输入', trigger: 'blur' }],
-        fgStaffSid: [{ required: true, message: '请输入', trigger: 'blur' }],
-        linkPerson: [{ required: true, message: '请输入', trigger: 'blur' }],
-        linkPhone: [{ required: true, message: '请输入', trigger: 'blur' }],
-        sort: [{ required: true, message: '请输入', trigger: 'blur' }]
-      }
+      rules: {}
     }
   },
   mounted() {
     this.getOrgTree()
     this.init()
-    // this.getStaff()
-    // this.getStaff2()
-//    this.getPageList()
   },
   methods: {
     init() {
@@ -377,6 +354,24 @@ export default {
           this.orgAttribute_list = res.data
         }
       })
+      typeValues({ type: 'orgLevel' }).then((res) => {
+        if (res.success) {
+          this.orgLevel_list = res.data
+        }
+      })
+    },
+    changeOrgLevel(value) {
+      let bb = null
+      this.orgLevel_list.forEach((e) => {
+        if (e.dictValue === value) {
+          bb = {
+            value: e.dictValue,
+            key: e.dictKey
+          }
+        }
+      })
+      this.form.orgLevelValue = bb.value
+      this.form.orgLevelKey = bb.key
     },
     changeOrgAttribute(value) {
       let bb = null
@@ -426,23 +421,27 @@ export default {
       if (this.form.sid) {
 //      	console.log(this.form)
         putOrgtree(this.form).then(res => {
-          this.isshow = 'table'
-          this.getOrgTree()
-          this.handleNodeClick({sid: this.form.psid})
-          this.$message({
-            message: res.msg,
-            type: 'success'
-          })
+          if (res.success) {
+            this.isshow = 'table'
+            this.getOrgTree()
+            this.handleNodeClick({ sid: this.form.psid })
+            this.$message({
+              message: res.msg,
+              type: 'success'
+            })
+          }
         })
       } else {
         addOrgTree(this.form).then(res => {
-          this.isshow = 'table'
-          this.getOrgTree()
-          this.handleNodeClick({ sid: this.form.psid })
-          this.$message({
-            message: res.msg,
-            type: 'success'
-          })
+          if (res.success) {
+            this.isshow = 'table'
+            this.getOrgTree()
+            this.handleNodeClick({ sid: this.form.psid })
+            this.$message({
+              message: res.msg,
+              type: 'success'
+            })
+          }
         })
       }
     },
@@ -450,19 +449,19 @@ export default {
       console.log(123456789, data)
       this.dialogTitle = '新增'
       this.isshow = 'edit'
+      this.fgStaffSid = []
       this.form = Object.assign({}, this.formBackup)
       this.form.psid = data.sid || 0
       this.form.organizationSid = this.$store.getters.userInfo.orgSid
       this.form.address = data.orgAddress || data.address
       this.form.dlxx = data.gisInfo || data.dlxx
-      this.getStaff(data.sid)
       this.getStaff2(data.sid)
     },
     editRow(row) {
-      this.getStaff(row.sid)
       this.getStaff2(row.sid)
       this.dialogTitle = '编辑'
       this.isshow = 'edit'
+      this.fgStaffSid = []
       selectBySid(row.sid).then((response) => {
         if (response.success) {
           this.form = response.data
@@ -476,29 +475,11 @@ export default {
           console.log('编辑回显的数据', this.form)
         }
       })
-//       console.log('点击编辑', row)
-//       this.dialogTitle = '编辑'
-//       this.isshow = 'edit'
-// //      this.form = Object.assign({}, row)
-// //      console.log(row)
-//       this.form.psid = row.psid
-//       this.form.sid = row.sid
-//       this.form.name = row.name
-//       this.form.orgCode = row.orgCode
-//       /* this.form.jwd = row.jwd*/
-//       this.form.addrs = row.addrs
-//       this.form.linkPerson = row.linkPerson
-//       this.form.linkPhone = row.linkPhone
-//       this.form.sort = row.sort
-//       this.form.zgStaffSid = row.zgSids
-//       this.form.fgStaffSid = row.fgSids
     },
     deit(data) { // 节点编辑保存
-      this.getStaff(data.sid)
       this.getStaff2(data.sid)
       console.log(data, 8888)
       this.dialogVisible = true
-//      this.form = Object.assign({}, data)
       this.form.sid = data.sid
       // this.form.psid = null
       this.form.name = data.name
@@ -561,64 +542,13 @@ export default {
       this.page.params.name = ''
       this.getPageList(this.page)
     },
-    // 主管人员
-    getStaff(orgSid) {
-      let params = {
-        deptSid: orgSid
-      }
-      console.log('这里是主管人员请求参数', params)
-      getStaff(params).then(res => {
-        console.log('这里是主管人员请求参数', params)
-        this.staffdata = res.data
-        console.log('这里是主管人员下拉框', res.data)
-      })
-    },
-    // 选择主管人员
-    zgStaffSidChange(val) {
-      // const choosetItem = this.payType_list.filter((item) => item.dictKey == val)
-      // this.temp.payType = choosetItem[0].dictValue
-      // console.log('name:', this.temp.payType, 'key:', this.temp.payTypeKey)
-    },
     // 分管人员
     getStaff2(orgSid) {
       getStaffName({ deptSid: orgSid }).then(res => {
         this.staffdata2 = res.data
         console.log('分管人员', this.staffdata2)
       })
-    },
-
-    querySearchAsync(queryString, cb) {
-      console.log('查询条件：', queryString)
-      if (
-        queryString !== null &&
-        queryString !== undefined &&
-        queryString !== ''
-      ) {
-        // this.searchData({ name: queryString })
-        getStaffName({staffName: queryString}).then(res => {
-          if (res.code === '200') {
-            this.staffdata2 = res.data
-            console.log('分管人员', this.staffdata2)
-            cb(res.data)
-          }
-        })
-      } else {
-        console.log('无请求参数', this.staffdata2)
-        this.getStaff2()
-        cb(this.staffdata2)
-      }
-    },
-    handleSelect(e) {
-      console.log('分管选择',e)
-      this.form.fgStaffSid = e.sid
-      this.form.fgStaffName = e.name
-    },
-    // 清空信息
-    inputclear() {
-      this.form.fgStaffName = ''
-      this.form.fgStaffSid = ''
     }
-
   }
 }
 </script>
diff --git a/anrui-terminal/anrui-terminal-api/pom.xml b/anrui-terminal/anrui-terminal-api/pom.xml
index 894e139aaa..1eee55234e 100644
--- a/anrui-terminal/anrui-terminal-api/pom.xml
+++ b/anrui-terminal/anrui-terminal-api/pom.xml
@@ -13,7 +13,7 @@
 
     <artifactId>anrui-terminal-api</artifactId>
     <groupId>com.yxt.anrui</groupId>
-    <version>0.0.1</version>
+    <version>0.0.1-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
diff --git a/anrui-terminal/anrui-terminal-biz/pom.xml b/anrui-terminal/anrui-terminal-biz/pom.xml
index 78e62cbc94..6ad996201a 100644
--- a/anrui-terminal/anrui-terminal-biz/pom.xml
+++ b/anrui-terminal/anrui-terminal-biz/pom.xml
@@ -18,47 +18,42 @@
         <dependency>
             <artifactId>anrui-terminal-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-base-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
-        </dependency>
-        <dependency>
-            <artifactId>anrui-crm-api</artifactId>
-            <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-portal-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-buscenter-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-scm-api</artifactId>
             <groupId>com.yxt.anrui.scm</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-fin-api</artifactId>
             <groupId>com.yxt.anrui.fin</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-crm-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>anrui-riskcenter-api</artifactId>
             <groupId>com.yxt.anrui</groupId>
-            <version>0.0.1</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/resources/application-test.yml b/anrui-terminal/anrui-terminal-biz/src/main/resources/application-test.yml
index 1dadfdd2d7..43aad4f87c 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/resources/application-test.yml
+++ b/anrui-terminal/anrui-terminal-biz/src/main/resources/application-test.yml
@@ -19,7 +19,7 @@ spring:
 
 image:
   upload:
-    path: D:\anrui\upload\
+    path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
   url:
-    prefix: http://26077a35f5.wicp.vip/upload/
+    prefix: http://anrui.yyundong.com/upload/