完善盘库、巡检、车辆台账查询--与切换机构功能相关修改

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

@@ -97,8 +97,9 @@ export function getUserByOrgSid(data) {
 // 根据当前登录用户分公司sid获取所有用户
 export function getGressionUserList(data) {
   return request({
-    url: 'portal/v1/sysstaffinfo/getGressionUserList/' + data,
-    method: 'get'
+    url: 'portal/v1/sysstaffinfo/getGressionUserList',
+    method: 'get',
+    params: data
   })
 }
 
@@ -225,3 +226,11 @@ export function selectHaveMessage(data) {
   })
 }
 
+// 获取下拉列表（车型名称）
+export function selectModelName(data) {
+  return request({
+    url: '/base/v1/basevehiclemodel/selectDownPlusByModelName',
+    method: 'get',
+    params: data
+  })
+}

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhangchaxun/chaliangtaizhangselect.vue

@@ -412,12 +412,11 @@
 </template>
 
 <script>
-import { fetchByUseOrgSid, getUseOrgByUserSid, selectCarTransferListAll, pagerListByOrgSidPath } from '@/api/cheliang/basevehicle'
-import { typeValues, brandDown, selectOrgByLevel } from '@/api/cheliang/dictcommons'
+import { selectCarTransferListAll, pagerListByOrgSidPath } from '@/api/cheliang/basevehicle'
+import { typeValues, brandDown, selectOrgByLevel, fetchByUseOrgSid, getOrgSidByPath } from '@/api/cheliang/dictcommons'
 import Pagination from '@/components/pagination'
 import ButtonBar from '@/components/ButtonBar'
 import pageye from '@/components/pagination/pageye'
-import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
 import cheliangtaizhangInfo from '@/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo'
 import vehicleconfiguration from '@/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration'
 import cheliangtaizhangMaiInfo from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMaiInfo'
@@ -576,7 +575,6 @@ export default {
     this.init()
     // 加载列表
     this.getPathSid()
-    this.getUseOrg()
   },
   mounted() {
     this.$refs['btnbar'].setButtonList(this.btnList)
@@ -615,7 +613,7 @@ export default {
     },
     setDater() {
       // 所属分公司
-      selectOrgByLevel({ orgSidPath: window.sessionStorage.getItem('orgSidPath') }).then((resp) => {
+      selectOrgByLevel({ orgSidPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.org_list = resp.data
         }
@@ -905,32 +903,9 @@ export default {
         }
       })
     },
-    getUseOrg() {
-      const userSid = window.sessionStorage.getItem('userSid')
-      getUseOrgByUserSid({ userSid: userSid }).then((res) => {
-        if (res.success) {
-          this.useOrgName = res.data.name
-          this.useOrg = res.data.sid
-          this.getLocation(res.data.sid)
-        }
-      })
-    },
-    // 根据组织获得存放地点
-    getLocation(useOrg) {
-      // 存放地点
-      fetchByUseOrgSid({
-        sid: useOrg
-      }).then((res) => {
-        if (res.code === '200') {
-          this.location_list = res.data
-          console.log('存放地点', this.location_list)
-        }
-      })
-    },
     getPathSid() {
-      const userSid = window.sessionStorage.getItem('userSid')
-      getPathSidByUserSid({ userSid: userSid }).then((res) => {
-        if (res.code === '200') {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+        if (res.success) {
           this.listQuery.params.createOrgSid = res.data
           this.queryParams.params.useOrgSid = res.data
           // 下拉框-品牌
@@ -940,6 +915,13 @@ export default {
               console.log('下拉框请求品牌', res.data)
             }
           })
+          // 存放地点
+          fetchByUseOrgSid({ sid: res.data }).then((res) => {
+            if (res.success) {
+              this.location_list = res.data
+              console.log('存放地点', this.location_list)
+            }
+          })
           this.getList()
         }
       })
@@ -947,14 +929,10 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
-      this.listQuery.params.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+      this.listQuery.params.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
       pagerListByOrgSidPath(this.listQuery).then((response) => {
         this.listLoading = false
-        if (
-          response.code === '200' &&
-          response.data &&
-          response.data.total > 0
-        ) {
+        if (response.success) {
           this.list = response.data.records
           this.listQuery.total = response.data.total // 0：未买断，1预买断，2买断
         } else {

anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/relation/xunjianbaogaoAdd.vue

@@ -67,7 +67,7 @@ export default {
   },
   methods: {
     init() {
-      getGressionUserList(window.sessionStorage.getItem('userSid')).then((resp) => {
+      getGressionUserList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.user_list = resp.data
         }

anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankubaogao/pankubaogaoAdd.vue

@@ -121,7 +121,7 @@ export default {
   },
   methods: {
     init() {
-      getGressionUserList(window.sessionStorage.getItem('userSid')).then((resp) => {
+      getGressionUserList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.user_list = resp.data
         }