From 61f18c74e36b2a8fb9b36258520f9296417264de Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 18 Jan 2023 17:26:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E5=9E=8B=E8=B0=83?=
 =?UTF-8?q?=E4=BB=B7--=E4=B8=8E=E5=88=87=E6=8D=A2=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tiaojiaguanli/chexingbyconfiguration.vue         |  5 ++---
 .../src/views/kucunguanli/tiaojiaguanli/priceAdd.vue |  3 +++
 .../views/kucunguanli/tiaojiaguanli/priceguanli.vue  | 12 ++++++++----
 .../tiaojiaguanli/chexingbyconfiguration.vue         |  5 ++---
 .../tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue  |  1 +
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
index 240fba9337..e64d066d02 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
@@ -73,7 +73,7 @@
 <script>
 import Pagination from '@/components/pagination'
 import req from '@/api/kucunguanli/price'
-import { getPathSidByUserSid } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
 
 export default {
   name: "chexingbyconfiguration",
@@ -115,8 +115,7 @@ export default {
       }
     },
     getPathSid() {
-      const userSid = window.sessionStorage.getItem('userSid')
-      getPathSidByUserSid({ userSid: userSid }).then((res) => {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.listQuery.params.useOrgSid = res.data
           this.getList()
diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
index 8b422b47d3..80756e2e34 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
@@ -118,6 +118,7 @@ export default {
         instanceId: '', // 流程实例ID
         taskId: '', // 任务ID
         createBySid: '',
+        orgPath: '',
         baseModelModpriceModels: []
       },
       rules: {},
@@ -168,6 +169,7 @@ export default {
       this.formobj.createOrgSid = createOrgSid
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
       this.formobj.applyPeoName = window.sessionStorage.getItem('name')
+      this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.viewTitle = '【新增】车型调价申请'
     },
     showEdit(row) {
@@ -256,6 +258,7 @@ export default {
         instanceId: '', // 流程实例ID
         taskId: '', // 任务ID
         createBySid: '',
+        orgPath: '',
         baseModelModpriceModels: []
       }
       this.submitdisabled = false
diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceguanli.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceguanli.vue
index 2d047fa417..ee14372297 100644
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceguanli.vue
@@ -78,7 +78,7 @@ import ButtonBar from '@/components/ButtonBar'
 import priceAdd from './priceAdd.vue'
 import priceInfo from './priceInfo.vue'
 import req from '@/api/kucunguanli/price'
-import { getPathSidByUserSid } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath, selectHaveMessage } from '@/api/cheliang/dictcommons'
 import { getStorage } from '@/utils/auth'
 
 export default {
@@ -215,7 +215,7 @@ export default {
       }
     },
     init() {
-      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.listQuery.params.createOrgSid = res.data
           this.getList()
@@ -275,8 +275,12 @@ export default {
       this.init()
     },
     toAdd() {
-      this.viewState = 2
-      this.$refs['divAdd'].showAdd(this.listQuery.params.createOrgSid)
+      selectHaveMessage({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
+        if (resp.success) {
+          this.viewState = 2
+          this.$refs['divAdd'].showAdd(this.listQuery.params.createOrgSid)
+        }
+      })
     },
     toEdit(row) {
       this.viewState = 3
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue
index bf62476314..8f03b79b91 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue
@@ -73,7 +73,7 @@
 <script>
 import Pagination from '@/components/pagination'
 import req from '@/api/kucunguanli/price'
-import { getPathSidByUserSid } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
 
 export default {
   name: "chexingbyconfiguration",
@@ -115,8 +115,7 @@ export default {
       }
     },
     getPathSid() {
-      const userSid = window.sessionStorage.getItem('userSid')
-      getPathSidByUserSid({ userSid: userSid }).then((res) => {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.code === '200') {
           this.listQuery.params.useOrgSid = res.data
           this.getList()
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
index 0142bee632..8691a717ef 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
@@ -117,6 +117,7 @@ export default {
         instanceId: '', // 流程实例ID
         taskId: '', // 任务ID
         createBySid: '',
+        orgPath: '',
         baseModelModpriceModels: []
       },
       rules: {},