From c4bd7d1604fe91d663dd68781724f6db5df9677f Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 11 Jan 2023 17:45:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E3=80=81=E8=BD=A6=E8=BE=86=E5=A4=96=E9=87=87=E3=80=81?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=8F=B0=E8=B4=A6=E9=A1=B5=E9=9D=A2=E4=B8=AD?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=B3=BB=E7=BB=9F=E6=95=B0=E6=8D=AE=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/cheliang/dictcommons.js           |  8 +++++++
 .../baseoutsourcingapplicationAdd.vue         | 18 +++++++--------
 .../baseoutsourcingapplicationAdd.vue         | 18 +++++++--------
 .../cheliangtaizhang/cheliangtaizhangAdd.vue  | 20 ++++++++---------
 .../cheliangpaichan/cheliangpaichanAdd.vue    | 22 +++++++++----------
 .../paichanguanli/cheliangpaichanEdit.vue     | 18 +++++++--------
 6 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
index 1c8f05e5fc..f04e9d5e65 100644
--- a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
+++ b/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({
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
index 18ad5a9127..cd1b0a7717 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
+++ b/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)
-      this.formobj.purchaseSystemSid = choosetItem[0].orgDeptSid
+      const choosetItem = this.orgDept_list.filter((item) => item.purchaseSystemName === value)
+      this.formobj.purchaseSystemSid = choosetItem[0].deptSid
     },
     carBrandChange(value) {
       const choosetItem = this.carBrand_list.filter((item) => item.brandName === value)
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
index 86697ef262..df07ea4b01 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
+++ b/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)
-      this.formobj.purchaseSystemSid = choosetItem[0].orgDeptSid
+      const choosetItem = this.orgDept_list.filter((item) => item.purchaseSystemName === value)
+      this.formobj.purchaseSystemSid = choosetItem[0].deptSid
     },
     carBrandChange(value) {
       const choosetItem = this.carBrand_list.filter((item) => item.brandName === value)
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
index 9b140fa3cb..9d49974abd 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
+++ b/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)
-      this.temp.purchaseSystemSid = choosetItem[0].orgDeptSid
+      const choosetItem = this.orgDept_list.filter((item) => item.purchaseSystemName === val)
+      this.temp.purchaseSystemSid = choosetItem[0].deptSid
     },
     carBrandChange(val) {
       const choosetItem = this.carBrand_list.filter((item) => item.brandName === val)
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
index 96f29ee962..be938c5e25 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
+++ b/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,
-            sid: e.orgDeptSid
+            name: e.purchaseSystemName,
+            sid: e.deptSid
           }
         }
       })
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
index 25cab842fa..97a5a6bc5d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
+++ b/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,
-            sid: e.orgDeptSid
+            name: e.purchaseSystemName,
+            sid: e.deptSid
           }
         }
       })