完善存放地点变更--与切换机构功能相关修改

anrui-scm/anrui-scm-ui/src/api/supplychain/cunfangdidianbiangeng.js

@@ -78,8 +78,9 @@ export function saveCarTransferSiteImage(data) {
 // 获取仓库接口
 export function selectWarehouseByUserSid(data) {
   return request({
-    url: '/scm/v1/scmwarehouse/selectWarehouseByUserSid/' + data,
-    method: 'get'
+    url: '/scm/v1/scmwarehouse/selectWarehouseByUserSid',
+    method: 'get',
+    params: data
   })
 }
 

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

@@ -270,15 +270,7 @@
 </template>
 
 <script>
-import {
-  deleteCarTransfer,
-  selectCarTransferList,
-  temporaryExitPermitInfo,
-  getErtraState,
-  saveCarTransferSiteImage,
-  selectWarehouseByUserSid
-} from '@/api/supplychain/cunfangdidianbiangeng'
-import { getUseOrgByUserSid, selectModelName } from '@/api/cheliang/basevehicle'
+import { deleteCarTransfer, selectCarTransferList, temporaryExitPermitInfo, getErtraState, saveCarTransferSiteImage, selectWarehouseByUserSid } from '@/api/supplychain/cunfangdidianbiangeng'
 import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
@@ -286,6 +278,7 @@ import cunfangdidianbiangengAdd from '@/views/supplychain/cunfangdidianbiangeng/
 import cunfangdidianbiangengInfo from '@/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengInfo'
 import upload from '../../../components/uploadFile/upload_cunfang'
 import { getStorage } from '@/utils/auth'
+import { selectHaveMessage } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'cunfangdidianbiangeng',
@@ -324,9 +317,6 @@ export default {
       multipleSelection: [],
       sids: [],
       dataList: [],
-      modelName_list: [],
-      useOrg: '', // 使用组织
-      useOrgSid: '', // 使用组织sid
       formList: {},
       listQuery: {
         current: 1,
@@ -340,7 +330,8 @@ export default {
           targetLocationSid: '',
           locationSid: '',
           operator: '',
-          userSid: window.sessionStorage.getItem('userSid')
+          userSid: '',
+          orgPath: ''
         }
       },
       btnList: [
@@ -370,7 +361,6 @@ export default {
   },
   created() {
     this.getList()
-    // this.getUseOrg()
     this.getModelName()
   },
   mounted() {
@@ -431,8 +421,12 @@ export default {
       }
     },
     toAdd() {
-      this.viewState = 2
-      this.$refs['divadd'].showAdd()
+      selectHaveMessage({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
+        if (resp.success) {
+          this.viewState = 2
+          this.$refs['divadd'].showAdd()
+        }
+      })
     },
     toEdit() {
       if (this.multipleSelection.length === 0) {
@@ -572,24 +566,27 @@ export default {
           targetLocationSid: '',
           locationSid: '',
           operator: '',
-          userSid: window.sessionStorage.getItem('userSid')
+          userSid: '',
+          orgPath: ''
         }
       }
       this.getList()
     },
     loadList() {
-      const _this = this
       this.tableLoading = true
-      selectCarTransferList(this.listQuery)
-        .then(resp => {
-          _this.tableLoading = false
+      selectCarTransferList(this.listQuery).then((resp) => {
+        this.tableLoading = false
+        if (resp.success) {
           const data = resp.data
-          _this.listQuery.total = data.total
-          _this.dataList = data.records
-        })
-        .catch(() => {
-          _this.tableLoading = false
-        })
+          this.listQuery.total = data.total
+          this.dataList = data.records
+        } else {
+          this.listQuery.total = 0
+          this.dataList = []
+        }
+      }).catch(() => {
+        this.tableLoading = false
+      })
     },
     handleSelectionChange(row) {
       this.multipleSelection = row
@@ -644,29 +641,12 @@ export default {
     },
     // 车型名称下拉框
     getModelName() {
-      selectModelName({ name: '' }).then((response) => {
-        if (response.code === '200') {
-          this.modelName_list = response.data
-        }
-      })
-      selectWarehouseByUserSid(window.sessionStorage.getItem('userSid')).then((res) => {
+      selectWarehouseByUserSid({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.warehouwarehouse_list = res.data
         }
       })
     },
-    // 根据个人sid查询个人分公司
-    getUseOrg() {
-      const userSid = window.sessionStorage.getItem('userSid')
-      getUseOrgByUserSid({ userSid: userSid }).then((res) => {
-        if (res.success) {
-          this.useOrg = res.data.name // 使用组织
-          this.useOrgSid = res.data.sid // 使用组织sid
-          this.listQuery.params.useOrgSid = res.data.sid
-          this.loadList()
-        }
-      })
-    },
     // 序号
     indexMethod(index) {
       var pagestart = (this.listQuery.current - 1) * this.listQuery.size

anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue

@@ -175,13 +175,7 @@
 </template>
 
 <script>
-import {
-  getCarTransferInfo,
-  getVinByWarehouseSid,
-  saveCarTransferInfo,
-  selectWarehouseByUserSid,
-  submitCarTransfer
-} from '@/api/supplychain/cunfangdidianbiangeng'
+import { getCarTransferInfo, getVinByWarehouseSid, saveCarTransferInfo, selectWarehouseByUserSid, submitCarTransfer } from '@/api/supplychain/cunfangdidianbiangeng'
 import { getGressionUserList } from '@/api/cheliang/dictcommons'
 import Pagination from '@/components/pagination'
 
@@ -219,6 +213,7 @@ export default {
         proCardState: '',
         proCardStateKey: '',
         temporaryCard: '',
+        orgPath: '',
         policyImage: [],
         scmVehicleGressionVehs: []
       }, // 添加和修改
@@ -239,6 +234,7 @@ export default {
           vin: '',
           warehouseSid: '',
           userSid: window.sessionStorage.getItem('userSid'),
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
           vins: []
         },
         total: 0
@@ -274,16 +270,15 @@ export default {
     },
     getType() {
       // 存放地点
-      const userSid = window.sessionStorage.getItem('userSid')
-      selectWarehouseByUserSid(userSid).then((res) => {
-        if (res.code === '200') {
+      selectWarehouseByUserSid({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+        if (res.success) {
           this.warehouwarehouse_list = res.data
           console.log('存放地点', this.warehouwarehouse_list)
         }
       })
     },
     getUser() {
-      getGressionUserList(window.sessionStorage.getItem('userSid')).then((res) => {
+      getGressionUserList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.staff_list = res.data
         }
@@ -315,6 +310,7 @@ export default {
       this.viewTitle = '【新增】车辆存放地点变更申请'
       this.temp.applicantName = window.sessionStorage.getItem('name')
       this.temp.userSid = window.sessionStorage.getItem('userSid')
+      this.temp.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       var nowDate = new Date()
       var date = {
         year: nowDate.getFullYear(),
@@ -458,6 +454,7 @@ export default {
         proCardState: '',
         proCardStateKey: '',
         temporaryCard: '',
+        orgPath: '',
         policyImage: [],
         scmVehicleGressionVehs: []
       }

anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengEdit.vue

@@ -174,13 +174,7 @@
 </template>
 
 <script>
-import {
-  getCarTransferInfo,
-  getVinByWarehouseSid,
-  saveCarTransferInfo,
-  selectWarehouseByUserSid,
-  submitCarTransfer
-} from '@/api/supplychain/cunfangdidianbiangeng'
+import { getCarTransferInfo, getVinByWarehouseSid, saveCarTransferInfo, selectWarehouseByUserSid, submitCarTransfer } from '@/api/supplychain/cunfangdidianbiangeng'
 import { getGressionUserList } from '@/api/cheliang/dictcommons'
 import Pagination from '@/components/pagination'
 
@@ -218,6 +212,7 @@ export default {
         proCardState: '',
         proCardStateKey: '',
         temporaryCard: '',
+        orgPath: '',
         policyImage: [],
         scmVehicleGressionVehs: []
       }, // 添加和修改
@@ -238,7 +233,8 @@ export default {
         params: {
           vin: '',
           warehouseSid: '',
-          userSid: window.sessionStorage.getItem('userSid'),
+          userSid: '',
+          orgPath: '',
           vins: []
         },
         total: 0
@@ -291,8 +287,7 @@ export default {
     },
     getType() {
       // 存放地点
-      const userSid = window.sessionStorage.getItem('userSid')
-      selectWarehouseByUserSid(userSid).then((res) => {
+      selectWarehouseByUserSid({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.code === '200') {
           this.warehouwarehouse_list = res.data
           console.log('存放地点', this.warehouwarehouse_list)
@@ -300,7 +295,7 @@ export default {
       })
     },
     getUser() {
-      getGressionUserList(window.sessionStorage.getItem('userSid')).then((res) => {
+      getGressionUserList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.staff_list = res.data
         }
@@ -396,6 +391,8 @@ export default {
     // 请求车架号列表接口
     getvinNoList() {
       this.vinNoLoading = true
+      this.vinNoList.params.userSid = window.sessionStorage.getItem('userSid')
+      this.vinNoList.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       getVinByWarehouseSid(this.vinNoList).then(resp => {
         this.vinNoLoading = false
         const data = resp.data