From 786f7a98cce6ac6cc51be052816767a5cdcf8ae6 Mon Sep 17 00:00:00 2001
From: fengdong777 <1478994744@qq.com>
Date: Fri, 8 Sep 2023 16:55:47 +0800
Subject: [PATCH] 9.8

---
 .../src/views/Yjsq/AddYjsq.vue                | 23 +++++++++++++++----
 .../src/views/Yjsq/LookYzsq/index.vue         |  9 +-------
 supervise-portal-ui/src/store/modules/user.js |  4 +++-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue b/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue
index 16ece9e8..9632d161 100644
--- a/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue
+++ b/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue
@@ -23,7 +23,9 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item class="trightb_item">
-                  <el-form-item>{{ projectName }}</el-form-item>
+                  <el-select v-model="formobj.orgDeptName"  placeholder="请选择" @change="changeOrgDept" clearable >
+                  <el-option v-for="(item,i) in projectSidList" :key="i" :label="item.entryName" :value="item.entryName"></el-option>
+                </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="4" class="trightb">
@@ -204,19 +206,17 @@
           },
           industryAllList: [],
           industryList: [],
-          projectName:'heps',
-          projectSid:'51be22ac-4944-4ccb-a4d3-fce5740b814f',
           userSid:'',
           imgList: [],
           msg:[],
           checkList:[],
+          projectSidList:[]
           
         }
       },
       created() {
         this.formobj.user_sid = window.sessionStorage.getItem('userSid')
-        this.formobj.project_name=this.projectName
-        this.formobj.project_sid=this.projectSid
+        this.projectSidList= JSON.parse(window.sessionStorage.getItem("projectSidList"));
       },
       watch: {
        imgList:{
@@ -340,6 +340,19 @@
           var List=str.replace(/^,+/, '');
           this.formobj.seal_type = List
         },
+        changeOrgDept(value) {
+          let bb = {}
+          this.projectSidList.forEach((e) => {
+            if (e.entryName === value) {
+              bb = {
+                entryName: e.entryName,
+                sid: e.sid
+              }
+            }
+          })
+          this.formobj.project_sid = bb.sid
+          this.formobj.project_name = bb.entryName
+        },
         getHangYe(value) {
            const choose = this.industryList.filter((item) => item.dictKey === value)
            this.formobj.industryName = choose[0].dictValue
diff --git a/supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue b/supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue
index 2effdcf7..38e451a2 100644
--- a/supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue
+++ b/supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue
@@ -202,8 +202,6 @@
           },
           industryAllList: [],
           industryList: [],
-          projectName:'heps',
-          projectSid:'51be22ac-4944-4ccb-a4d3-fce5740b814f',
           userSid:'',
           imgList: [],
           msg:[],
@@ -233,9 +231,6 @@
     },
       methods: {
         saveOrUpdate() {
-          this.formobj.project_name=this.projectName
-          this.formobj.project_sid=this.projectSid
-          this.formobj.user_sid = '164ec725-0b27-489c-974f-18d46de7bcfb'
           this.backcheckList()
           if( this.formobj.sid){
             req.sealrecordSave(this.formobj)
@@ -256,9 +251,6 @@
           }
           },
         saveSubmit(){
-          this.formobj.project_name=this.projectName
-          this.formobj.project_sid=this.projectSid
-          this.formobj.user_sid = '164ec725-0b27-489c-974f-18d46de7bcfb'
           this.backcheckList()
             req.sealrecordSubmit(this.formobj)
               .then(resp => {
@@ -286,6 +278,7 @@
            req.fetchDetailsBySid(sid).then((res)=>{
             if(res.code==200){
                 this.formobj.project_sid=res.data.project_sid
+                this.formobj.project_name=res.data.project_name
                 this.formobj.sid=res.data.sid
                 this.formobj.project_name=res.data.project_name
                 this.formobj.code=res.data.code
diff --git a/supervise-portal-ui/src/store/modules/user.js b/supervise-portal-ui/src/store/modules/user.js
index a5c891d5..636dc0af 100644
--- a/supervise-portal-ui/src/store/modules/user.js
+++ b/supervise-portal-ui/src/store/modules/user.js
@@ -43,8 +43,9 @@ const actions = {
           pNameAndDepartmentNameAndPostName: data.pNameAndDepartmentNameAndPostName,
           roleName: data.roleName,
           defaultOrgPathName: data.defaultOrgPathName,
-          defaultOrgPath: data.defaultOrgPath
+          defaultOrgPath: data.defaultOrgPath,
         }
+        let projectSidList=data.projectSidList
         commit('SET_UESRINFO', user)
         window.sessionStorage.setItem('userSid', user.userSid)
         window.sessionStorage.setItem('Orgname', user.Orgname)
@@ -54,6 +55,7 @@ const actions = {
         window.sessionStorage.setItem('roleName', user.roleName)
         window.sessionStorage.setItem('defaultOrgPathName', user.defaultOrgPathName)
         window.sessionStorage.setItem('defaultOrgPath', user.defaultOrgPath)
+        window.sessionStorage.setItem("projectSidList",JSON.stringify(projectSidList));
         resolve(data)
       }).catch(error => {
         reject(error)