From daac1812bf2b89d869d15c46c7c6d0814f7e6d72 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 28 Jun 2024 16:25:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=81=E7=94=A8=E6=88=B7=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=82=B9=E5=87=BB=E4=BD=8D=E7=BD=AE=E3=80=81?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E5=85=AC=E5=8F=B8=E9=80=89=E6=8B=A9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/CompanyPicker.vue         | 36 +++++++++---------
 src/layout/navbar/index.vue                   |  4 +-
 src/views/project-demand/requirement/add.vue  |  8 ++--
 .../project-demand/requirement/detail.vue     |  6 ++-
 .../project-management/filing/attachment.vue  |  3 --
 .../implementation/account.vue                |  4 +-
 src/views/workflow/common/OperationRender.vue | 38 ++++++++++++-------
 7 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/src/components/DetailComponent/CompanyPicker.vue b/src/components/DetailComponent/CompanyPicker.vue
index b739cd8..61cedf2 100644
--- a/src/components/DetailComponent/CompanyPicker.vue
+++ b/src/components/DetailComponent/CompanyPicker.vue
@@ -89,7 +89,6 @@ const props = defineProps({
     type: Boolean
   }
 });
-const isChooseAll = ref(true);
 let selectItem = reactive({
   type: -1,
   value: "0"
@@ -138,22 +137,14 @@ const checkBoxChange = (val) => {
 }
 const matterTree = (list, flag) => {
   list.forEach(item => {
-    if (!flag&&item.value!==-1) {
+    if (!flag) {
       tree.value.setChecked(item, false)
     }
     if (item.children !== undefined) {
-      matterTree(item.children)
+      matterTree(item.children, false)
     }
   })
 }
-// const cancelAll = () => {
-//   isChooseAll.value = true
-//   tree.value.setCheckedNodes([])
-// }
-// const chooseAll = () => {
-//   isChooseAll.value = false
-//   matterTree(dataList.value)
-// }
 const getList = () => {
   getSubCompOpt().then(res => {
     dataList.value = [
@@ -176,15 +167,26 @@ const filterNode = (value, data) => {
 const show = () => {
   //用于弹开部门选择
   visible.value = true;
-  selectList.value = _value.value
-  defaultChecked.value = _value.value.map(item => item.value)
+  if(selectList.value.length==0){
+    selectList.value=[]
+    defaultChecked.value =[]
+  }else {
+    selectList.value = _value.value
+    defaultChecked.value = _value.value.map(item => item.value)
+  }
   getList()
 };
 const handleChange = (data, checked) => {
-  if (data.value == -1&&checked) {
-    // tree.value.setCheckedNodes(['-1'])
-    matterTree(dataList.value, false)
-    // return;
+  if (data.value == -1) {
+    if(checked){
+      checkStrictly.value = false
+      const index = checkList.value.indexOf('2')
+      if (index != -1) {
+        checkList.value.splice(index, 1)
+      }
+      matterTree(dataList.value[0].children, false)
+      tree.value.setChecked(data,true);
+    }
   }
   // 左侧有选择框 + 多选
   if (props.multiple) {
diff --git a/src/layout/navbar/index.vue b/src/layout/navbar/index.vue
index 642f14a..0a5618e 100644
--- a/src/layout/navbar/index.vue
+++ b/src/layout/navbar/index.vue
@@ -5,9 +5,9 @@
     <div class="right-bar">
       <!--        <bell-socket/>-->
       <div class="user-box">
-        <div>
+        <div  @click.stop="handleVisitedP">
           <el-avatar>{{ userInfo.nickName }}</el-avatar>
-          <div @click.stop="handleVisitedP">{{ userInfo.nickName }}
+          <div>{{ userInfo.nickName }}
             <el-icon style="margin-left: 5px">
               <ArrowDownBold/>
             </el-icon>
diff --git a/src/views/project-demand/requirement/add.vue b/src/views/project-demand/requirement/add.vue
index 2449aeb..93c11e1 100644
--- a/src/views/project-demand/requirement/add.vue
+++ b/src/views/project-demand/requirement/add.vue
@@ -34,13 +34,15 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="所属公司" prop="companyIds" class="tree-select">
+            <div style="width: 100%">
+              <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择所属公司' : '更改' }}
+              </el-button>
+            </div>
             <div v-if="route.query.id" :class="showExpendClass(showMoreCompany)">{{ selectedCompanyList }}</div>
             <div v-else :class="showExpendClass(showMoreCompany)">{{ getName(selectedCompanyList) }}</div>
             <div style="color: #2a99ff;text-align: center;width: 100%;font-size: 15px;cursor: pointer"
                  @click="handleExpend">{{ showExpendText }}
             </div>
-            <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择所属公司' : '更改' }}
-            </el-button>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -98,7 +100,7 @@
       <el-button color="#DED0B2" v-else @click="handleResubmit">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
-    <company-picker :multiple="true" ref="companyRef" title="请选择所属公司" @ok="selected"/>
+    <company-picker :multiple="true" ref="companyRef" title="请选择所属公司" @ok="selected" v-model:value="selectedCompanyList"/>
   </div>
 </template>
 
diff --git a/src/views/project-demand/requirement/detail.vue b/src/views/project-demand/requirement/detail.vue
index 7157acd..bcff8c0 100644
--- a/src/views/project-demand/requirement/detail.vue
+++ b/src/views/project-demand/requirement/detail.vue
@@ -63,7 +63,11 @@ const init = async () => {
     }
     loading.value = false
     let data = res.data
-    data.formData.companyIds = getCompanyOptionItem(data.formData.companyIds)
+    if(data.formData.companyIds[0]==-1){
+      data.formData.companyIds = ['所有公司']
+    }else {
+      data.formData.companyIds = getCompanyOptionItem(data.formData.companyIds)
+    }
     collectData.value = data
     formData.value = data.formData;
     if (data.formData.specialFund) {
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index 20dde41..ba98f28 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -81,9 +81,6 @@ const handleClick = (tab) => {
 }
 
 const search = async (param) => {
-  if (activeName.value === '00') {
-    param.requirementId = requirementId.value
-  }
   param.targetId = projectId.value
   param.targetState = activeName.value
   searchFileList(param).then(res => {
diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue
index a279d04..e12e82a 100644
--- a/src/views/project-management/implementation/account.vue
+++ b/src/views/project-management/implementation/account.vue
@@ -209,7 +209,7 @@ const tableConfig = reactive({
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         if (row.researchStage && row.researchStage !== null && row.researchStage !== undefined) {
-          return (<Tag dictType={'research_stage'} value={row.researchStage}/>)
+          return (<Tag dictType={'fee_stage'} value={row.researchStage}/>)
         } else {
           return '--'
         }
@@ -285,7 +285,7 @@ const handleUploadFee = () => {
 const exportExcelHandler = () => {
   console.log('exportIds.value',exportIds.value)
   let data = {
-    projectId: 113
+    projectId: route.query.id
   }
   exportExcel(data).then(res => {
     console.log(res)
diff --git a/src/views/workflow/common/OperationRender.vue b/src/views/workflow/common/OperationRender.vue
index e1d4538..b4fc42e 100644
--- a/src/views/workflow/common/OperationRender.vue
+++ b/src/views/workflow/common/OperationRender.vue
@@ -13,19 +13,22 @@
           </div>
           <div class="card">
             <div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name">
-              <div>
+              <div class="avatar-block">
                 <name-circle :user="user"/>
-                <span>{{ user.name }}</span>
+                <div class="name">
+                  <span>{{ user.name }}</span>
+                  <span>{{ user.jobActivityDesc }}</span>
+                </div>
               </div>
               <div>
                 <div class="remark">{{ operation.remark }}</div>
-                <div>
-                  <div>审批人：</div>
-                  <div>{{ user.name }}</div>
-                </div>
+                <!--                <div>-->
+                <!--                  <div>审批人：</div>-->
+                <!--                  <div>{{ user.name }}</div>-->
+                <!--                </div>-->
                 <div v-if="user.auditOpinion">
                   <div style="margin-bottom: 10px;color: #909399">{{ user.operationTime }}</div>
-                  <div  class="username">
+                  <div class="username">
                     <span style="font-weight: bold">审批意见：</span>
                     <el-text v-text="user.auditOpinion" style="word-break: break-all">
                     </el-text>
@@ -274,16 +277,25 @@ init()
       border-bottom: none;
     }
 
-    > div:first-child {
+   .avatar-block {
       display: flex;
 
-
-      > span {
-        width: 100px;
-        color: #2a99ff;
+     .name {
+        width:130px;
+        display: flex;
+        flex-direction: column;
         margin-left: 10px;
-        margin-right: 20px;
+       margin-right: 20px;
+
+        > span:first-child {
+          color: #2a99ff;
+        }
+        >span:last-child{
+          margin-top: 5px;
+          color: #909399;
+        }
       }
+
     }
 
     > div:nth-child(2) {