diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicle.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicle.java
index 871dbf7533..7ffe7bcaad 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicle.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicle.java
@@ -53,7 +53,7 @@ public class BaseOutsourcingApplicationVehicle extends BaseEntity {
     private String outAppSid; // 外采申请单sid
     
 	@ApiModelProperty("车架号")
-    private String VIN; // 车架号
+    private String vinNo; // 车架号
 
 	/**
 	 * @return 外采申请单sid
@@ -71,14 +71,14 @@ public class BaseOutsourcingApplicationVehicle extends BaseEntity {
 	/**
 	 * @return 车架号
 	 */
-	public String getVIN(){
-		return VIN;
+	public String getVinNo(){
+		return vinNo;
 	}
 	
 	/**
-	 * @param VIN 车架号 to set
+	 * @param vinNo 车架号 to set
 	 */
-	public void setVIN(String VIN){
-		this.VIN = VIN;
+	public void setVinNo(String vinNo){
+		this.vinNo = vinNo;
 	}
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleDto.java
index a3b7c4f23b..1b487866e9 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleDto.java
@@ -52,7 +52,7 @@ public class BaseOutsourcingApplicationVehicleDto implements Dto {
     private String outAppSid; // 外采申请单sid
     
 	@ApiModelProperty("车架号")
-    private String VIN; // 车架号
+    private String vinNo; // 车架号
 
 	
 	/**
@@ -72,14 +72,14 @@ public class BaseOutsourcingApplicationVehicleDto implements Dto {
 	/**
 	 * @return 车架号
 	 */
-	public String getVIN(){
-		return VIN;
+	public String getVinNo(){
+		return vinNo;
 	}
 	
 	/**
 	 * @param VIN 车架号 to set
 	 */
-	public void setVIN(String VIN){
-		this.VIN = VIN;
+	public void setVinNo(String vinNo){
+		this.vinNo = vinNo;
 	}
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleVo.java
index 53c1da8a29..bceb2904e4 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleVo.java
@@ -52,7 +52,7 @@ public class BaseOutsourcingApplicationVehicleVo implements Vo {
     private String outAppSid; // 外采申请单sid
     
 	@ApiModelProperty("车架号")
-    private String VIN; // 车架号
+    private String vinNo; // 车架号
 
 	
 	/**
@@ -72,14 +72,14 @@ public class BaseOutsourcingApplicationVehicleVo implements Vo {
 	/**
 	 * @return 车架号
 	 */
-	public String getVIN(){
-		return VIN;
+	public String getVinNo(){
+		return vinNo;
 	}
 	
 	/**
 	 * @param VIN 车架号 to set
 	 */
-	public void setVIN(String VIN){
-		this.VIN = VIN;
+	public void setVinNo(String vinNo){
+		this.vinNo = vinNo;
 	}
 }
diff --git a/anrui-base/anrui-base-ui/src/views/Regist/User.vue b/anrui-base/anrui-base-ui/src/views/Regist/User.vue
index 164af72c8b..125e625b52 100644
--- a/anrui-base/anrui-base-ui/src/views/Regist/User.vue
+++ b/anrui-base/anrui-base-ui/src/views/Regist/User.vue
@@ -55,7 +55,7 @@
 	import {
 		registUser,
 		getVerificationCode
-	} from '@/api/user.js'
+	} from '@/api/user1.js'
 	import qs from 'qs'
 	import UploadImg from '@/components/uploadFile/index.vue'
 	import paddwordinput from '@/components/passwordSafe/index.vue'
@@ -171,7 +171,7 @@
 				this.$refs[formName].validate((valid) => {
 					if (valid) {
 						registUser(qs.stringify(this.userForm)).then((res) => {
-							this.btnDisabled = false 
+							this.btnDisabled = false
 							this.$confirm('注册成功, 是否关闭页面?', '提示', {
 									confirmButtonText: '确定',
 									cancelButtonText: '取消',
@@ -180,7 +180,7 @@
 									window.close();
 								})
 						}).catch(() => {
-							this.btnDisabled = false        
+							this.btnDisabled = false
 						})
 					} else {
 						return false;
diff --git a/anrui-base/anrui-base-ui/src/views/system-admin/check/people.vue b/anrui-base/anrui-base-ui/src/views/system-admin/check/people.vue
index 4980e9ed9f..ab05449eba 100644
--- a/anrui-base/anrui-base-ui/src/views/system-admin/check/people.vue
+++ b/anrui-base/anrui-base-ui/src/views/system-admin/check/people.vue
@@ -82,7 +82,7 @@
 </template>
 <script>
   import remarks from './remarks/index.vue'
-  import user from '@/api/system/user/user.js'
+  import user from '@/api/system/user/user1.js'
   export default {
     components:{remarks},
     data() {
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java
index f6369613bf..006ebd0913 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java
@@ -84,7 +84,6 @@ public class BusMainDeposit extends BaseEntity {
     private String nodeSid;
     @ApiModelProperty("流程实例的sid")
     private String procInstSid;
-
     @ApiModelProperty(value = "节点状态")
     private String nodeState;
 }
diff --git a/anrui-login-ui/src/views/Regist/User - 副本.vue b/anrui-login-ui/src/views/Regist/User - 副本.vue
index aeec62b4c8..33738353fb 100644
--- a/anrui-login-ui/src/views/Regist/User - 副本.vue	
+++ b/anrui-login-ui/src/views/Regist/User - 副本.vue	
@@ -55,7 +55,7 @@
 	import {
 		registUser,
 		getVerificationCode
-	} from '@/api/user.js'
+	} from '@/api/user1.js'
 	import qs from 'qs'
 	import UploadImg from '@/components/uploadFile/index.vue'
 	import paddwordinput from '@/components/passwordSafe/index.vue'
diff --git a/anrui-login-ui/src/views/Regist/User.vue b/anrui-login-ui/src/views/Regist/User.vue
index d69a215ee5..41d44a0db3 100644
--- a/anrui-login-ui/src/views/Regist/User.vue
+++ b/anrui-login-ui/src/views/Regist/User.vue
@@ -57,7 +57,7 @@
 		registUser,
 		getVerificationCode,
     isRepeatByIDCard
-	} from '@/api/user.js'
+	} from '@/api/user1.js'
 	import qs from 'qs'
 	import UploadImg from '@/components/uploadFile/index.vue'
 	import paddwordinput from '@/components/passwordSafe/index.vue'
diff --git a/anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplication.js b/anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplication.js
index ff5100ec06..dcdf51544e 100644
--- a/anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplication.js
+++ b/anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplication.js
@@ -22,20 +22,20 @@ export default {
   delBySids: function(params) {
     return request({
       url: '/base/baseoutsourcingapplication/delBySids',
-      method: 'delete',
+      method: 'post',
       data: params
     })
   },
   // 通过sid查询一条记录
   fetchBySid: function(sid) {
     return request({
-      url: '/base/v1/baseoutsourcingapplication/fetchDetailsBySid/' + sid
+      url: '/base/baseoutsourcingapplication/fetchBySid/' + sid
     })
   },
   // 提交
   doSubmit: function(params) {
     return request({
-      url: '/base/v1/baseoutsourcingapplication/doSubmit',
+      url: '/base/baseoutsourcingapplication/submitBaseOutSourcingApplication',
       method: 'post',
       data: params
     })
diff --git a/anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.js b/anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.js
index 03473f0bdd..cc12f6d5c4 100644
--- a/anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.js
+++ b/anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.js
@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/base/v1/baseoutsourcingapplicationvehicle/listPage',
+      url: '/base/v1/basevehicle/pagerList',
       method: 'post',
       data: params
     })
diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js
index addc5f3ff5..8c94e6c467 100644
--- a/anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js
+++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js
@@ -4,7 +4,8 @@ import qs from 'qs'
 // 车型与常用配置关联表条件查询 已改
 export function pagerList(data) {
   return request({
-    url: '/base/basevehmodelconfig/listPage', data,
+   // url: '/base/basevehmodelconfig/listPage', data,
+    url: '/base/v1/basemodelconfig/pagerList', data,
     method: 'post',
     headers: { 'Content-Type': 'application/json' }
   })
diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
index e63ba9be21..f7b54074bf 100644
--- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
+++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
@@ -336,7 +336,28 @@ const codemenu = [
     path: '/chexingchaxun/modelinquire/modellibrary',
     component: () => import('@/views/chexingchaxun/modelinquire/modellibrary'),
     name: 'modellibrary'
+  },
+  // 流程审批
+  // 外采申请表驳回到发起人办理编辑页面
+  {
+    path: '/baseoutsouapplFlow/edit',
+    component: () =>
+      import('@/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd'),
+    name: 'baseoutsouapplFlowEdit'
+  },
+  // 外采申请表详情页面
+  {
+    path: '/baseoutsouapplFlow/info',
+    component: () =>
+      import('@/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo'),
+    name: 'baseoutsouapplFlowInfo'
+  },
+  // 外采申请表审批环节办理页面
+  {
+    path: '/baseoutsouapplFlow/handle',
+    component: () =>
+      import('@/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication'),
+    name: 'baseoutsouapplFlowInfoHandle'
   }
-
 ]
 export default codemenu
diff --git a/anrui-scm/anrui-scm-ui/src/store/getters.js b/anrui-scm/anrui-scm-ui/src/store/getters.js
index 33a426a94e..eb3a120010 100644
--- a/anrui-scm/anrui-scm-ui/src/store/getters.js
+++ b/anrui-scm/anrui-scm-ui/src/store/getters.js
@@ -1,17 +1,4 @@
 const getters = {
-  sidebar: state => state.app.sidebar,
-  size: state => state.app.size,
-  device: state => state.app.device,
-  visitedViews: state => state.tagsView.visitedViews,
-  cachedViews: state => state.tagsView.cachedViews,
-  token: state => state.user.token,
-  avatar: state => state.user.avatar,
-  name: state => state.user.name,
-  userInfo: state => state.user.userInfo,
-  menus: state => state.user.menus,
-  introduction: state => state.user.introduction,
-  roles: state => state.user.roles,
-  permission_routes: state => state.permission.routes,
-  errorLogs: state => state.errorLog.logs
+  orgSid: state => state.user.orgSid
 }
 export default getters
diff --git a/anrui-scm/anrui-scm-ui/src/store/index.js b/anrui-scm/anrui-scm-ui/src/store/index.js
index 9ec3b7166c..4a2159a164 100644
--- a/anrui-scm/anrui-scm-ui/src/store/index.js
+++ b/anrui-scm/anrui-scm-ui/src/store/index.js
@@ -28,9 +28,6 @@ const store = new Vuex.Store({
     },
     actions: {
 
-    },
-    getters: {
-
     },
   modules,
   getters,
diff --git a/anrui-scm/anrui-scm-ui/src/store/modules/user.js b/anrui-scm/anrui-scm-ui/src/store/modules/user.js
index d49545a3dc..265a757a6a 100644
--- a/anrui-scm/anrui-scm-ui/src/store/modules/user.js
+++ b/anrui-scm/anrui-scm-ui/src/store/modules/user.js
@@ -1,150 +1,17 @@
-import { login, logout, getInfo } from '@/api/user'
-import { getStorage, setStorage, removeStorage } from '@/utils/auth'
-
-import router, { resetRouter } from '@/router'
-
-const state = {
-  token: getStorage(),
-  userInfo: '',
-  menus: '',
-}
-
-const mutations = {
-  SET_TOKEN: (state, token) => {
-    state.token = token
+const user = {
+  state:{
+    orgSid: ''
   },
-  SET_UESRINFO: (state, userInfo) => {
-    state.userInfo = userInfo
+  mutations: {
+    setOrgSid: (state, orgSid) => {
+      state.orgSid = orgSid
+    }
   },
-  SET_MENUS: (state, menus) => {
-    state.menus = menus
+  actions: {
+     commitOrgSid({commit}, orgSid) {
+      commit('setOrgSid', orgSid)
+    }
   }
 }
 
-const actions = {
-  // user login
-  login({ commit }, userInfo) {
-    return new Promise((resolve, reject) => {
-      login(userInfo).then(response => {
-        const { data } = response
-        commit('SET_TOKEN', data.token)
-        setStorage(data.token)        
-        let user = {
-          roleSid: data.roleSid,
-          name: data.name,
-          userName: data.userName,
-          departmentName: data.departmentName,
-          isAdmin: data.isAdmin,
-          staffSid: data.staffSid,
-          userSid: data.sid,
-          orgSid: data.organizationSid,
-          Orgname: data.organizationName,
-          dwjb: data.dwjb
-        }
-        commit('SET_UESRINFO', user)
-        window.sessionStorage.setItem('userSid', user.userSid);
-        window.sessionStorage.setItem('Orgname', user.Orgname);
-        window.sessionStorage.setItem('departmentName', user.departmentName);
-        window.sessionStorage.setItem('name', user.name);
-        resolve(data)
-      }).catch(error => {
-        reject(error)
-      })
-    })
-  },
-
-  // get user info
-  getInfo({ commit, state }) {
-    return new Promise((resolve, reject) => {
-      getInfo().then(response => {
-        const { data } = response
-        if (!data) {
-          removeStorage()
-          reject('Verification failed, please Login again.')
-        }
-        let user = {
-          roleSid: data.roleSid,
-          name: data.name,
-          userName: data.userName,
-          orgRoleName: data.orgRoleName,
-          isAdmin: data.isAdmin,
-          staffSid: data.staffSid,
-          userSid: data.sid,
-          orgSid: data.organizationSid,
-          Orgname: data.organizationName,
-          dwjb: data.dwjb
-        }
-        commit('SET_UESRINFO', user)
-        resolve(data)
-      }).catch(error => {
-        removeStorage()
-        router.push({path: '/'})
-        // reject(error)
-      })
-    })
-  },
-
-  getMenus({ commit, state }) {
-    return new Promise((resolve, reject) => {
-      getInfo().then(response => {
-        const { data } = response
-        commit('SET_UESRINFO', user)
-        resolve(data)
-      }).catch(error => {
-        reject(error)
-      })
-    })
-  },
-
-  // user logout
-  logout({ commit, state, dispatch }) {
-    return new Promise((resolve, reject) => {
-      logout(state.token).then(() => {
-        commit('SET_TOKEN', '')
-        commit('SET_UESRINFO', '')
-        removeStorage()
-        resetRouter()
-        resolve()
-      }).catch(error => {
-        reject(error)
-      })
-    })
-  },
-
-  // remove token
-  // resetToken({ commit }) {
-  //   return new Promise(resolve => {
-  //     commit('SET_TOKEN', '')
-  //     commit('SET_ROLES', [])
-  //     removeToken()
-  //     resolve()
-  //   })
-  // },
-
-  // dynamically modify permissions
-  // async changeRoles({ commit, dispatch }, role) {
-  //   const token = role + '-token'
-
-  //   commit('SET_TOKEN', token)
-  //   setToken(token)
-
-  //   const { roles } = await dispatch('getInfo')
-
-  //   resetRouter()
-
-  //   // generate accessible routes map based on roles
-  //   const accessRoutes = await dispatch('permission/generateRoutes', roles, { root: true })
-  //   // dynamically add accessible routes
-  //   router.addRoutes(accessRoutes)
-
-  //   // reset visited views and cached views
-  //   dispatch('tagsView/delAllViews', null, { root: true })
-  // }
-}
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions
-}
+export default user
diff --git a/anrui-scm/anrui-scm-ui/src/store/modules/user1.js b/anrui-scm/anrui-scm-ui/src/store/modules/user1.js
new file mode 100644
index 0000000000..e00ca0a5b3
--- /dev/null
+++ b/anrui-scm/anrui-scm-ui/src/store/modules/user1.js
@@ -0,0 +1,150 @@
+import { login, logout, getInfo } from '@/api/user'
+import { getStorage, setStorage, removeStorage } from '@/utils/auth'
+
+import router, { resetRouter } from '@/router'
+
+const state = {
+  token: getStorage(),
+  userInfo: '',
+  menus: '',
+}
+
+const mutations = {
+  SET_TOKEN: (state, token) => {
+    state.token = token
+  },
+  SET_UESRINFO: (state, userInfo) => {
+    state.userInfo = userInfo
+  },
+  SET_MENUS: (state, menus) => {
+    state.menus = menus
+  }
+}
+
+const actions = {
+  // user login
+  login({ commit }, userInfo) {
+    return new Promise((resolve, reject) => {
+      login(userInfo).then(response => {
+        const { data } = response
+        commit('SET_TOKEN', data.token)
+        setStorage(data.token)
+        let user = {
+          roleSid: data.roleSid,
+          name: data.name,
+          userName: data.userName,
+          departmentName: data.departmentName,
+          isAdmin: data.isAdmin,
+          staffSid: data.staffSid,
+          userSid: data.sid,
+          orgSid: data.organizationSid,
+          Orgname: data.organizationName,
+          dwjb: data.dwjb
+        }
+        commit('SET_UESRINFO', user)
+        window.sessionStorage.setItem('userSid', user.userSid);
+        window.sessionStorage.setItem('Orgname', user.Orgname);
+        window.sessionStorage.setItem('departmentName', user.departmentName);
+        window.sessionStorage.setItem('name', user.name);
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+
+  // get user info
+  getInfo({ commit, state }) {
+    return new Promise((resolve, reject) => {
+      getInfo().then(response => {
+        const { data } = response
+        if (!data) {
+          removeStorage()
+          reject('Verification failed, please Login again.')
+        }
+        let user = {
+          roleSid: data.roleSid,
+          name: data.name,
+          userName: data.userName,
+          orgRoleName: data.orgRoleName,
+          isAdmin: data.isAdmin,
+          staffSid: data.staffSid,
+          userSid: data.sid,
+          orgSid: data.organizationSid,
+          Orgname: data.organizationName,
+          dwjb: data.dwjb
+        }
+        commit('SET_UESRINFO', user)
+        resolve(data)
+      }).catch(error => {
+        removeStorage()
+        router.push({path: '/'})
+        // reject(error)
+      })
+    })
+  },
+
+  getMenus({ commit, state }) {
+    return new Promise((resolve, reject) => {
+      getInfo().then(response => {
+        const { data } = response
+        commit('SET_UESRINFO', user)
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+
+  // user logout
+  logout({ commit, state, dispatch }) {
+    return new Promise((resolve, reject) => {
+      logout(state.token).then(() => {
+        commit('SET_TOKEN', '')
+        commit('SET_UESRINFO', '')
+        removeStorage()
+        resetRouter()
+        resolve()
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+
+  // remove token
+  // resetToken({ commit }) {
+  //   return new Promise(resolve => {
+  //     commit('SET_TOKEN', '')
+  //     commit('SET_ROLES', [])
+  //     removeToken()
+  //     resolve()
+  //   })
+  // },
+
+  // dynamically modify permissions
+  // async changeRoles({ commit, dispatch }, role) {
+  //   const token = role + '-token'
+
+  //   commit('SET_TOKEN', token)
+  //   setToken(token)
+
+  //   const { roles } = await dispatch('getInfo')
+
+  //   resetRouter()
+
+  //   // generate accessible routes map based on roles
+  //   const accessRoutes = await dispatch('permission/generateRoutes', roles, { root: true })
+  //   // dynamically add accessible routes
+  //   router.addRoutes(accessRoutes)
+
+  //   // reset visited views and cached views
+  //   dispatch('tagsView/delAllViews', null, { root: true })
+  // }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
index 3279eae8e1..a899cc9095 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
@@ -261,7 +261,7 @@ export default {
        alert('必须选择一条数据!');
        return ;
      }
-      this.formobj.modelName = obj.model.vehicleAlias
+      this.formobj.modelName = obj.model.modelName
       this.formobj.modelSid = obj.model.sid
       this.formobj.configName = obj.configs[0].configName
       this.formobj.configSid = obj.configs[0].sid
diff --git a/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue b/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue
index e3aefd4bbe..a9c3a8fbe3 100644
--- a/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue
@@ -1,12 +1,6 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-      <div class="tab-header webtop">
-        <div>车型库</div>
-        <div>
-          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
-        </div>
-      </div>
       <div class="webcon">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
@@ -89,16 +83,12 @@
             </el-form>
           </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"/>
-        </div>
         <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
-            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+          <el-table  :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;font-size: 10px;" >
+            <el-table-column width="60px" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column label="车型" align="center">
               <template slot-scope="scope">
-                <span class="bluezi" @click="handlink(scope.row)">{{ scope.row.vehicleAlias }}</span>
+                <span class="bluezi" @click="handlink(scope.row)">{{ scope.row.modelName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="版本" align="center">
@@ -164,6 +154,8 @@
         </el-table-column>
       </el-table>
     </el-dialog>
+    <!-- 车型配置分页列表 -->
+    <configuration v-show="viewState == 2" ref="divConfiguration" @doback="resetState"/>
   </div>
 </template>
 
@@ -171,14 +163,18 @@
 import { modelPageList, dataDictionary, brandDown, notTheCompanyModelPageList } from '@/api/chexingchaxun/modelinquire.js'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
+import configuration from './vehiclelibraryconfiguration.vue'
 export default {
   name: 'chexingchaxun',
   components: {
     Pagination,
-    pageye
+    pageye,
+    configuration
   },
   data() {
     return {
+      model:{},
+      viewState:1,
       isSearchShow: false,
       dialogVisible: false,
       searchxianshitit: '隐藏查询条件',
@@ -237,6 +233,12 @@ export default {
     // 加载列表
   },
   methods: {
+    getConfigDataList(){
+      return {
+        configs: this.$refs['divConfiguration'].multipleSelection,
+        model: this.model
+      };
+    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow
@@ -365,6 +367,7 @@ export default {
     },
     handlink(row) {
       this.viewState = 2
+      this.model=row;
       this.$refs['divConfiguration'].showData(row)
     },
     resetState() {
@@ -373,7 +376,7 @@ export default {
     },
     showData(sid) {
        alert(sid);
-    },
+    }
   }
 }
 </script>
@@ -385,7 +388,9 @@ export default {
   border: 1px solid #dfe4ed;
   height: 40px;
 }
-
+.tableHeaderClass{
+  font-size: 8px;
+}
 .tit {
   margin-bottom: -10px;
 }
diff --git a/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue
index 8807de75c0..d44a4b3db5 100644
--- a/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue
@@ -2,11 +2,9 @@
   <div class="app-container">
     <div v-show="viewState == 1">
       <div class="tab-header webtop">
-        <div>车型库配置列表</div>
+        <div>【{{ modelName }}】车型常用配置列表</div>
         <div>
-
-          <el-button type="primary" size="small" @click="selectAndBack">确定</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="webcon">
@@ -127,14 +125,10 @@
             </el-form>
           </div>
         </div>
-        <div class="listtop">
-          <div class="tit">【{{ modelName }}】车型常用配置列表</div>
-          <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 :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;font-size: 10px;" @selection-change="handleSelectionChange">
             <el-table-column width="30px" type="selection" align="center" />
-            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column width="60px" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column label="常用配置" align="center">
               <template slot-scope="scope">
                 <span class="bluezi" @click="handlink(scope.row)">{{ scope.row.configName }}</span>
@@ -413,7 +407,7 @@ export default {
     showData(row) {
       this.listQuery.params.modelSid = row.sid
       this.modelSid = row.sid
-      this.modelName = row.vehicleAlias
+      this.modelName = row.modelName
       this.Dictionary()
       this.getList()
     },
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue
index d9dae84667..2d84032d52 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue
@@ -148,7 +148,6 @@
         },
         submitdisabled: false, // 保存按钮
         disabled: false // 提交按钮
-
       }
     },
     created() {
diff --git a/anrui-system-ui/src/views/Regist/User.vue b/anrui-system-ui/src/views/Regist/User.vue
index 164af72c8b..125e625b52 100644
--- a/anrui-system-ui/src/views/Regist/User.vue
+++ b/anrui-system-ui/src/views/Regist/User.vue
@@ -55,7 +55,7 @@
 	import {
 		registUser,
 		getVerificationCode
-	} from '@/api/user.js'
+	} from '@/api/user1.js'
 	import qs from 'qs'
 	import UploadImg from '@/components/uploadFile/index.vue'
 	import paddwordinput from '@/components/passwordSafe/index.vue'
@@ -171,7 +171,7 @@
 				this.$refs[formName].validate((valid) => {
 					if (valid) {
 						registUser(qs.stringify(this.userForm)).then((res) => {
-							this.btnDisabled = false 
+							this.btnDisabled = false
 							this.$confirm('注册成功, 是否关闭页面?', '提示', {
 									confirmButtonText: '确定',
 									cancelButtonText: '取消',
@@ -180,7 +180,7 @@
 									window.close();
 								})
 						}).catch(() => {
-							this.btnDisabled = false        
+							this.btnDisabled = false
 						})
 					} else {
 						return false;
diff --git a/anrui-system-ui/src/views/flow/todoList.vue b/anrui-system-ui/src/views/flow/todoList.vue
index 951888d7b6..717df059cb 100644
--- a/anrui-system-ui/src/views/flow/todoList.vue
+++ b/anrui-system-ui/src/views/flow/todoList.vue
@@ -308,13 +308,11 @@
       // 点击办理
       handleCheck(row) {
         this.centerDialogVisible = true
-        console.log('row', row)
         // this.taskName_now = row.taskName
         // 同意
         this.agreeList.businessSid = row.processVariables.businessSid
         this.agreeList.instanceId = row.procInsId
         this.agreeList.taskId = row.taskId
-        console.log('同意', this.agreeList)
         // 驳回
         this.regectList.businessSid = row.processVariables.businessSid
         this.regectList.instanceId = row.procInsId
@@ -333,12 +331,10 @@
           taskName: row.taskName,
           transactState: '00' // 待办任务状态
         }
-        console.log('123123123', JSON.stringify(parameter_list))
         selectUrl(this.selectUrl_list).then((response) => {
           if (response.code === '200') {
             // this.url = 'http://120.46.131.15' + response.data.url + '?row=' + row.processVariables.businessSid + '#data=' + JSON.stringify(parameter_list) + '?token=' + getStorage()
             this.url = 'http://localhost:9531' + response.data.url + '?row=' + row.processVariables.businessSid + '#data=' + JSON.stringify(parameter_list) + '?token=123456abc'
-            console.log('页面url', this.url)
           } else {
             this.$notify({
               title: '提示',
@@ -350,7 +346,6 @@
         })
         // 审批记录
         this.getFlowRecordList(row.procInsId, row.deployId);
-        // this.$router.push({path: '/todo' + '?token=' + getStorage()})
       },
       closeIt() {
         this.url = ''
diff --git a/anrui-system-ui/src/views/system-admin/check/people.vue b/anrui-system-ui/src/views/system-admin/check/people.vue
index 4980e9ed9f..ab05449eba 100644
--- a/anrui-system-ui/src/views/system-admin/check/people.vue
+++ b/anrui-system-ui/src/views/system-admin/check/people.vue
@@ -82,7 +82,7 @@
 </template>
 <script>
   import remarks from './remarks/index.vue'
-  import user from '@/api/system/user/user.js'
+  import user from '@/api/system/user/user1.js'
   export default {
     components:{remarks},
     data() {