完善合格证盘点--切换机构功能

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

@@ -77,24 +77,6 @@ export function selectVehModelByConfigSid(data) {
   })
 }
 
-// 根据登陆人sid查询分公司 （孟哲写的接口）
-export function getPathSidByUserSid(data) {
-  return request({
-    url: '/portal/v1/sysstafforg/getPathSidByUserSid',
-    method: 'get',
-    params: data
-  })
-}
-
-// 获取组织（单选组织架构） 暂时没有用
-export function getOrg(data) {
-  return request({
-    url: '/portal/v1/sysorganization/getListOrg',
-    method: 'get',
-    params: data
-  })
-}
-
 // 删除厂家退款见证材料
 export function deleteFilesOss(data) {
   return request({

anrui-scm/anrui-scm-ui/src/views/supplychain/hegezhengpandianjilu/hegezhengpandianjilu.vue

@@ -136,18 +136,12 @@
 </template>
 
 <script>
-import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
+import { getOrgSidByPath, fetchByUseOrgSid } from '@/api/cheliang/dictcommons'
-import { fetchByUseOrgSid } from '@/api/cheliang/dictcommons'
 import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import hegezhengpandianjiluAdd from '@/views/supplychain/hegezhengpandianjilu/hegezhengpandianjiluAdd'
-import {
+import { certInventoryHandle, generateInventoryRecords, getInventoryRecords, listPage } from '@/api/supplychain/hegezhengpandian'
-  certInventoryHandle,
-  generateInventoryRecords,
-  getInventoryRecords,
-  listPage
-} from '@/api/supplychain/hegezhengpandian'
 
 export default {
   name: 'hegezhengpandianjilu',
@@ -192,7 +186,7 @@ export default {
           inventoryEndDate: '', // 最新盘库结束日期
           inventoryState: '', // 盘库状态 1通过/2未通过
           createOrgSid: '', // 创建组织sid
-          userSid: window.sessionStorage.getItem('userSid')
+          userSid: ''
         }
       },
       btnList: [
@@ -232,12 +226,11 @@ export default {
       this.viewState = 1
     },
     getPathSid() {
-      const userSid = window.sessionStorage.getItem('userSid')
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
-      getPathSidByUserSid({ userSid: userSid }).then((res) => {
+        if (res.success) {
-        if (res.code === '200') {
           this.listQuery.params.createOrgSid = res.data
           this.useOrg = res.data
-          this.getList()
+          this.loadList()
           this.getLocation(res.data)
         }
       })
@@ -248,7 +241,7 @@ export default {
       fetchByUseOrgSid({
         sid: useOrg
       }).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.location_list = res.data
           console.log('存放地点', this.location_list)
         }
@@ -306,18 +299,24 @@ export default {
           inventoryEndDate: '', // 最新盘库结束日期
           inventoryState: '', // 盘库状态 1通过/2未通过
           createOrgSid: '', // 创建组织sid
-          userSid: window.sessionStorage.getItem('userSid')
+          userSid: ''
         }
       }
       this.getPathSid()
     },
     loadList() {
       this.tableLoading = true
-      listPage(this.listQuery).then(resp => {
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      listPage(this.listQuery).then((resp) => {
         this.tableLoading = false
+        if (resp.success) {
           const data = resp.data
           this.listQuery.total = data.total
           this.dataList = data.records
+        } else {
+          this.listQuery.total = 0
+          this.dataList = []
+        }
       }).catch(() => {
         this.tableLoading = false
       })

anrui-scm/anrui-scm-ui/src/views/supplychain/hegezhengpandianjilu/hegezhengpandianjiluAdd.vue

@@ -93,8 +93,7 @@
 </template>
 
 <script>
-import { getUserByOrgSid } from '@/api/cheliang/dictcommons'
+import { getUserByOrgSid, getOrgSidByPath } from '@/api/cheliang/dictcommons'
-import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
 import { certInventoryConfirm, listPages } from '@/api/supplychain/hegezhengpandian'
 
 export default {
@@ -158,9 +157,8 @@ export default {
       this.getPathSid()
     },
     getPathSid() {
-      const userSid = window.sessionStorage.getItem('userSid')
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
-      getPathSidByUserSid({ userSid: userSid }).then((res) => {
+        if (res.success) {
-        if (res.code === '200') {
           this.listQuery.params.createOrgSid = res.data
           this.temp.createOrgSid = res.data
           this.temp.useOrgSid = res.data