完善厂家采购、车辆外采、车辆台账页面中采购系统数据获取来源

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

@@ -161,6 +161,14 @@ export function getListDeptByOrgSid(data) {
   })
 }
 
+// 根据分公司Sid获取分公司下部门对应的采购系统
+export function fetchDetailsByUseOrgSid(data) {
+  return request({
+    url: '/base/v1/basepurchasesystem/fetchDetailsByUseOrgSid/' + data,
+    method: 'GET'
+  })
+}
+
 // 获取厂家回款通路
 export function selectNameByOrg(data) {
   return request({

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue

@@ -41,7 +41,7 @@
             <el-col :span="5">
               <el-form-item prop="purchaseSystemName">
                 <el-select v-model="formobj.purchaseSystemName" placeholder="请选择" @change="changeOrgDept" clearable>
-                  <el-option v-for="item in orgDept_list" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptName"></el-option>
+                  <el-option v-for="item in orgDept_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -355,7 +355,7 @@ import modellibrary from '@/views/baseoutsourcingapplication/relation/modellibra
 import req from '@/api/baseoutsourcingapplication/baseoutsourcingapplication'
 import configuration from './chexingbyconfiguration'
 import { getStorage } from '@/utils/auth'
-import { getPathSidByUserSid, brandDown, selectOrgLists, typeValues, selectSysUserList } from '@/api/cheliang/dictcommons'
+import { getPathSidByUserSid, brandDown, fetchDetailsByUseOrgSid, typeValues, selectSysUserList } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'BaseOutsourcingApplicationAdd',
@@ -496,11 +496,6 @@ export default {
           this.depositUseRule_list = res.data
         }
       })
-      selectOrgLists({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
-        if (res.success) {
-          this.orgDept_list = res.data
-        }
-      })
       selectSysUserList({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
         if (resp.success) {
           this.user_list = resp.data
@@ -514,6 +509,11 @@ export default {
               this.formobj.useOrgName = resp.data.name
             }
           })
+          fetchDetailsByUseOrgSid(this.formobj.useOrgSid).then((res) => {
+            if (res.success) {
+              this.orgDept_list = res.data
+            }
+          })
           brandDown({ useOrg: res.data }).then((resp) => {
             if (resp.success) {
               this.carBrand_list = resp.data
@@ -661,8 +661,8 @@ export default {
       })
     },
     changeOrgDept(value) {
-      const choosetItem = this.orgDept_list.filter((item) => item.orgDeptName === value)
+      const choosetItem = this.orgDept_list.filter((item) => item.purchaseSystemName === value)
-      this.formobj.purchaseSystemSid = choosetItem[0].orgDeptSid
+      this.formobj.purchaseSystemSid = choosetItem[0].deptSid
     },
     carBrandChange(value) {
       const choosetItem = this.carBrand_list.filter((item) => item.brandName === value)

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue

@@ -40,7 +40,7 @@
             <el-col :span="5">
               <el-form-item prop="purchaseSystemName">
                 <el-select v-model="formobj.purchaseSystemName" placeholder="请选择" @change="changeOrgDept" clearable>
-                  <el-option v-for="item in orgDept_list" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptName"></el-option>
+                  <el-option v-for="item in orgDept_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -363,7 +363,7 @@ import modellibrary from '@/views/baseoutsourcingapplication/relation/modellibra
 import req from '@/api/baseoutsourcingapplication/baseoutsourcingapplication'
 import configuration from './chexingbyconfiguration'
 import { getStorage } from '@/utils/auth'
-import { getPathSidByUserSid, brandDown, selectOrgLists, typeValues, selectSysUserList } from '@/api/cheliang/dictcommons'
+import { getPathSidByUserSid, brandDown, fetchDetailsByUseOrgSid, typeValues, selectSysUserList } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'BaseOutsourcingApplicationAdd',
@@ -501,11 +501,6 @@ export default {
           this.depositUseRule_list = res.data
         }
       })
-      selectOrgLists({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
-        if (res.success) {
-          this.orgDept_list = res.data
-        }
-      })
       selectSysUserList({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
         if (resp.success) {
           this.user_list = resp.data
@@ -519,6 +514,11 @@ export default {
               this.formobj.useOrgName = resp.data.name
             }
           })
+          fetchDetailsByUseOrgSid(this.formobj.useOrgSid).then((res) => {
+            if (res.success) {
+              this.orgDept_list = res.data
+            }
+          })
           brandDown({ useOrg: res.data }).then((resp) => {
             if (resp.success) {
               this.carBrand_list = resp.data
@@ -772,8 +772,8 @@ export default {
       })
     },
     changeOrgDept(value) {
-      const choosetItem = this.orgDept_list.filter((item) => item.orgDeptName === value)
+      const choosetItem = this.orgDept_list.filter((item) => item.purchaseSystemName === value)
-      this.formobj.purchaseSystemSid = choosetItem[0].orgDeptSid
+      this.formobj.purchaseSystemSid = choosetItem[0].deptSid
     },
     carBrandChange(value) {
       const choosetItem = this.carBrand_list.filter((item) => item.brandName === value)

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue

@@ -18,7 +18,7 @@
             <el-form-item prop="purchaseSystemName">
               <span slot="label">采购系统：</span>
               <el-select v-model="temp.purchaseSystemName" class="addinputw" clearable placeholder="" filterable @change="orgDeptChange">
-                <el-option v-for="item in orgDept_list" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptName"/>
+                <el-option v-for="item in orgDept_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -293,7 +293,7 @@
 
 <script>
 import { SaveList, Update, selVehModelByUseOrgSidAll, details, selectSupplier } from '@/api/cheliang/basevehicle'
-import { typeValues, selectOrgLists, getPathSidByUserSid, fetchByUseOrgSid, fetchBySid, selectNameByOrg, brandDown } from '@/api/cheliang/dictcommons'
+import { typeValues, fetchDetailsByUseOrgSid, getPathSidByUserSid, fetchByUseOrgSid, fetchBySid, selectNameByOrg, brandDown } from '@/api/cheliang/dictcommons'
 import Pagination from '@/components/pagination'
 
 export default {
@@ -473,8 +473,6 @@ export default {
       this.temp.settlementStatusValue = '未买断'
       this.temp.freight = 0
       this.temp.isProblemVeh = '0'
-      this.temp.purchaseSystemName = window.sessionStorage.getItem('departmentName')
-      this.temp.purchaseSystemSid = window.sessionStorage.getItem('departmentSid')
     },
     showEdit(sid) {
       this.getType()
@@ -508,6 +506,11 @@ export default {
               this.temp.useOrgName = respsone.data.name
             }
           })
+          fetchDetailsByUseOrgSid(this.temp.useOrgSid).then((res) => {
+            if (res.success) {
+              this.orgDept_list = res.data
+            }
+          })
           fetchByUseOrgSid({ sid: res.data }).then((resp) => {
             if (resp.success) {
               this.location_list = resp.data
@@ -556,15 +559,10 @@ export default {
           this.settlementStatus_list = res.data
         }
       })
-      selectOrgLists({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
-        if (res.success) {
-          this.orgDept_list = res.data
-        }
-      })
     },
     orgDeptChange(val) {
-      const choosetItem = this.orgDept_list.filter((item) => item.orgDeptName === val)
+      const choosetItem = this.orgDept_list.filter((item) => item.purchaseSystemName === val)
-      this.temp.purchaseSystemSid = choosetItem[0].orgDeptSid
+      this.temp.purchaseSystemSid = choosetItem[0].deptSid
     },
     carBrandChange(val) {
       const choosetItem = this.carBrand_list.filter((item) => item.brandName === val)

anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue

@@ -33,7 +33,7 @@
               <div class="span-sty spanOneWidth"><span>采购系统:</span></div>
               <el-form-item>
                 <el-select v-model="formobj.orgDeptName" placeholder="请选择" @change="changeOrgDept" clearable class="addinputInfo addinputOne">
-                  <el-option v-for="item in orgDept_list" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptName"></el-option>
+                  <el-option v-for="item in orgDept_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -187,7 +187,7 @@ import configuration from './chexingbyconfiguration'
 import shangzhuangpeizhi from '../../../views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhi'
 import shangzhuangpeizhiAdd from '../../../views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiAdd'
 import vehicleconfiguration from '@/views/cheliang/cheliangcaigou/relation/vehicleconfiguration'
-import { getPathSidByUserSid, fetchBySid, selectSysUserList, selectOrgLists, brandDown, selectNameByOrg } from '@/api/cheliang/dictcommons'
+import { getPathSidByUserSid, fetchBySid, selectSysUserList, fetchDetailsByUseOrgSid, brandDown, selectNameByOrg } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'cheliangpaichanAdd',
@@ -263,11 +263,6 @@ export default {
       })
     },
     getUserOrg() {
-      selectOrgLists({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
-        if (res.success) {
-          this.orgDept_list = res.data
-        }
-      })
       getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
         if (resp.success) {
           this.formobj.createOrgSid = resp.data
@@ -276,6 +271,11 @@ export default {
               this.formobj.createOrgName = response.data.name
             }
           })
+          fetchDetailsByUseOrgSid(this.formobj.createOrgSid).then((res) => {
+            if (res.success) {
+              this.orgDept_list = res.data
+            }
+          })
           brandDown({ useOrg: resp.data }).then((res) => {
             if (res.success) {
               this.carBrand_list = res.data
@@ -355,8 +355,6 @@ export default {
       this.viewTitle = '【新增】厂家采购'
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
       this.formobj.createByName = window.sessionStorage.getItem('name')
-      this.formobj.orgDeptName = window.sessionStorage.getItem('departmentName')
-      this.formobj.orgDeptSid = window.sessionStorage.getItem('departmentSid')
     },
     showEdit(sid, row) {
       this.init()
@@ -417,10 +415,10 @@ export default {
     changeOrgDept(value) {
       let bb = null
       this.orgDept_list.forEach((e) => {
-        if (e.name === value) {
+        if (e.purchaseSystemName === value) {
           bb = {
-            name: e.orgDeptName,
+            name: e.purchaseSystemName,
-            sid: e.orgDeptSid
+            sid: e.deptSid
           }
         }
       })

anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue

@@ -32,7 +32,7 @@
               <div class="span-sty spanOneWidth"><span>采购系统:</span></div>
               <el-form-item>
                 <el-select v-model="formobj.orgDeptName" placeholder="请选择" @change="changeOrgDept" clearable class="addinputInfo addinputOne">
-                  <el-option v-for="item in orgDept_list" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptName"></el-option>
+                  <el-option v-for="item in orgDept_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -186,7 +186,7 @@ import configuration from './chexingbyconfiguration'
 import shangzhuangpeizhi from '../../../workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shuangzhuangpeizhi'
 import shangzhuangpeizhiAdd from '../../../workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiAdd'
 import vehicleconfiguration from '@/views/cheliang/cheliangcaigou/relation/vehicleconfiguration'
-import { selectSysUserList, selectOrgLists, brandDown, selectNameByOrg } from '@/api/cheliang/dictcommons'
+import { selectSysUserList, fetchDetailsByUseOrgSid, brandDown, selectNameByOrg } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'cheliangpaichanEdit',
@@ -279,11 +279,6 @@ export default {
           this.user_list = resp.data
         }
       })
-      selectOrgLists({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
-        if (res.success) {
-          this.orgDept_list = res.data
-        }
-      })
     },
     init() {
 
@@ -344,6 +339,11 @@ export default {
               this.carBrand_list = res.data
             }
           })
+          fetchDetailsByUseOrgSid(this.formobj.createOrgSid).then((res) => {
+            if (res.success) {
+              this.orgDept_list = res.data
+            }
+          })
           selectNameByOrg({ carBrandSid: this.formobj.carBrandSid }).then((res) => {
             if (res.success) {
               this.actualPay_list = res.data
@@ -409,8 +409,8 @@ export default {
       this.orgDept_list.forEach((e) => {
         if (e.name === value) {
           bb = {
-            name: e.orgDeptName,
+            name: e.purchaseSystemName,
-            sid: e.orgDeptSid
+            sid: e.deptSid
           }
         }
       })