车型管理 和 品牌管理

anrui-base/anrui-base-ui/src/api/jichuxinxi/brandManagement.js

@@ -66,15 +66,22 @@ export function dictType(data) {
   })
 }
 
-// 查询所有分公司
+// 查询所有分公司 旧的:portal/v1/sysorganization/getListOrg
 export function getListOrg(params) {
   return request({
-    url: 'portal/v1/sysorganization/getListOrg',
+    url: 'portal/v1/sysorganization/selectUseOrgSidBySid',
+    method: 'get',
+    params: params
+  })
+}
+// 当前登陆人分公司
+export function getUseOrgByUserSid(params) {
+  return request({
+    url: 'portal/v1/sysorganization/getUseOrgByUserSid',
     method: 'get',
     params: params
   })
 }
-
 //导出
 export function basefinbankExportExcel(data) {
   return request({
@@ -106,15 +113,6 @@ export function selectListOrg(data) {
     })
 }
 
-// 分公司
-export function getUseOrgByUserSid(params) {
-  return request({
-    url: 'portal/v1/sysorganization/getUseOrgByUserSid',
-    method: 'get',
-    params: params
-  })
-}
-
 // 厂商
 export function namesDown(data) {
     return request({

anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiAdd.vue

@@ -86,6 +86,7 @@ import {
   details,
   dictType,
   getListOrg,
+  getUseOrgByUserSid,
   namesDown,
   SaveList,
   selectListOrg,
@@ -235,25 +236,29 @@ export default {
     },
     // 所有分公司
     getListOrgAll() {
-      getListOrg().then((res) => {
+      const userSid = window.sessionStorage.getItem('userSid')
+      getUseOrgByUserSid({userSid: userSid}).then((res) => {
+        if (res.success) {
+          this.getListOrgAll0(res.data.sid)
+        }
+      })
+    },
+    getListOrgAll0(useOrgSid) {
+      getListOrg({sid: useOrgSid}).then((res) => {
         if (res.success) {
           this.useOrg_list = res.data
         }
       })
     },
     getuseOrg(val) {
-      console.log('选择的使用组织', val,this.useOrg_list)
       var choosetItem = []
       val.forEach((ele) => {
-        console.log('111222333',ele)
         choosetItem.push(this.useOrg_list.filter((item) => ele == item.sid)[0])
       })
-      console.log('使用组织chooseItem', choosetItem)
       const useOrgName = []
       choosetItem.forEach((e) => {
         useOrgName.push(e.name)
       })
-      console.log('所选组织名字数组', useOrgName)
       this.temp.useOrg = val.join()
       this.temp.useOrgName = useOrgName.join()
       console.log('使用组织name：', this.temp.useOrgName, '使用组织sid：', this.temp.useOrg)

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

@@ -42,7 +42,7 @@ export function details(data) {
 // 编辑回显 已改
 export function getAll(data) {
   return request({
-    url: '/base/v1/basevehiclemodel/getAll/' + data,
+    url: '/base/v1/basevehiclemodel/getAll/' + data.sid + '/' + data.userSid,
     method: 'get',
     params: data
   })

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue

@@ -362,7 +362,8 @@
         this.viewTitle = '【修改】车型信息'
         this.dialogStatus = 'update'
         console.log('编辑回显', sid)
-        getAll(sid).then(resp => {
+        const userSid = window.sessionStorage.getItem('userSid')
+        getAll({sid:sid,userSid:userSid}).then(resp => {
           const data = resp.data
           this.temp = data
           this.temp = JSON.parse(JSON.stringify(this.temp).replace(