feat : 项目管理表单缓存,文件回显,个人中心icon排版

src/components/AttachmentUpload.vue

@@ -5,7 +5,7 @@
         <el-form-item :label="label" prop="attachment" label-width="125">
           <template v-if="preview&&JSON.stringify(singleFile) !== '{}'&&JSON.stringify(singleFile)!=='null'">
             <el-button type="primary" link @click="handleDownload(singleFile)" style="font-size: 16px">
-              {{ singleFile ? singleFile?.originalFileName : formData.singleFile?.originalFileName }}
+              {{ singleFile ? singleFile?.originalFileName : formData.singleFile?.originalFileName?formData.singleFile?.originalFileName:_singleFileValue[0]?.originalFileName }}
             </el-button>
             <el-button type="danger" link @click="deleteSingleFile(singleFile?singleFile:formData.singleFile,1)">删除
             </el-button>
@@ -16,10 +16,7 @@
                          :disabled="isSingleFile" ref="fileUploadRef"/>
             <!--           :showFileList="showFileList" @delete="deleteAttachment"-->
             <fvTable style="width: 100%;max-height: 80px;" v-if="showSingleTable"  height="80"   :tableConfig="singleTableConfig"
-                     :data="singleFileList" :isSettingCol="false" :pagination="false">
+                     :data="_singleFileValue" :isSettingCol="false" :pagination="false">
-              <template #empty>
-                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-              </template>
             </fvTable>
           </template>
         </el-form-item>
@@ -27,14 +24,12 @@
       <el-col :span="24">
         <el-form-item label="其他文件" label-width="125">
           <file-upload @getFile="getOtherFile"/>
-          <!--          <el-card style="width: 100%;box-shadow: none">-->
           <fvTable style="width: 100%;max-height: 162px;" v-if="showTable" height="162"  :tableConfig="tableConfig"
                    :data="allFileList" :isSettingCol="false" :pagination="false">
             <template #empty>
               <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
             </template>
           </fvTable>
-          <!--          </el-card>-->
         </el-form-item>
       </el-col>
     </el-row>
@@ -46,6 +41,7 @@ import FileUpload from '@/components/FileUpload.vue'
 import {deleteFile, downloadFile} from "@/api/project-demand";
 import {ElMessageBox, ElNotification} from "element-plus";
 
+
 const props = defineProps({
   showFileList: {
     type: Boolean,
@@ -88,7 +84,7 @@ const props = defineProps({
     default: ''
   }
 })
-const emit = defineEmits(["getAttachment", "getOtherFile"])
+const emit = defineEmits(["getAttachment", "getOtherFile","update:singleList"])
 const tableConfig = reactive({
   columns: [
     {
@@ -223,14 +219,36 @@ const isSingleFile = ref(false)
 const allFileList = ref([])
 const deleteFileVal = ref({})
 const singleFileList = ref([])
-// if (props.formData.fileList !== null && props.formData.fileList?.length > 0) {
+if(localStorage.getItem('singleFile')){
-//   allFileList.value = props.formData.fileList
+  singleFile.value = JSON.parse(localStorage.getItem('singleFile'))
-// }
+}
+const _singleFileValue = computed({
+  get() {
+    return props.singleList;
+  },
+  set(value) {
+    emit('update:singleList', value)
+  }
+})
+
+console.log('_singleFileValue',_singleFileValue.value)
+const _otherFileListValue = computed({
+  get() {
+    return props.otherFileList;
+  },
+  set(value) {
+    emit('update:otherFileList', value)
+  }
+})
+if(_otherFileListValue.value&&_otherFileListValue.value.length>0){
+  _otherFileListValue.value.forEach(item=>{
+    allFileList.value.push(item)
+  })
+}
 watch(() => props.showSingleTable, (newVal) => {
   props.showSingleTable = newVal
 }, {deep: true})
 watch(() => props.formData.fileList, (newVal) => {
-  // console.log('newVal-fileList', newVal)
   if (props.preview) {
     newVal?.forEach(item => {
       allFileList.value.push(item)
@@ -256,18 +274,21 @@ watch(() => props.formData.fileList, (newVal) => {
 watch(() => props.showTable, (newVal) => {
   props.showTable = newVal
 }, {deep: true})
-watch(() => props.singleList, (newVal) => {
+// watch(() => props.singleList, (newVal) => {
-  // console.log('singleFile', newVal)
+//   console.log('singleFile', newVal)
-  singleFileList.value = newVal
+//   singleFileList.value = newVal
-}, {deep: true})
+// }, {deep: true})
 watch(() => props.formData.singleFile, (newVal) => {
-  // console.log('singleFile', newVal)
+  console.log('singleFile', newVal)
   singleFile.value = newVal
   props.formData.singleFile=newVal
 }, {deep: true})
 watch(() => isSingleFile.value, (newVal) => {
   isSingleFile.value = newVal
 }, {deep: true})
+watch(() => singleFile.value, (newVal) => {
+  singleFile.value = newVal
+}, {deep: true})
 const handleDelete = (row, type) => {
   deleteFile(row.fileId).then(res => {
     ElNotification({
@@ -277,7 +298,7 @@ const handleDelete = (row, type) => {
     })
     if (res.code === 1000) {
       if (type === 'single') {
-        singleFileList.value.splice(singleFileList.value.findIndex((item) => item.fileId === row.fileId), 1);
+        _singleFileValue.value.splice(_singleFileValue.value.findIndex((item) => item.fileId === row.fileId), 1);
         isSingleFile.value = false
       } else {
         allFileList.value.splice(allFileList.value.findIndex((item) => item.fileId === row.fileId), 1);
@@ -311,7 +332,7 @@ const getOtherFile = (val) => {
   if (props.preview) {
     allFileList.value.push(compositeParam(val))
   } else {
-    allFileList.value = props.otherFileList
+    allFileList.value = _otherFileListValue.value
   }
   emit('getOtherFile', val)
 }

src/components/DetailComponent/ApprovalDetail.vue

@@ -1,5 +1,33 @@
 <template>
   <div v-loading="loading">
+    <el-row  v-if="type==='execute'">
+      <el-col :span="24">
+        <baseTitle :title="'附件信息'"></baseTitle>
+      </el-col>
+      <el-form :model="attachmentParam" inline style="margin-top: 15px">
+        <el-form-item label="标签" prop="tag">
+          <el-select v-model="attachmentParam.tag" placeholder="请选择标签" clearable filterable style="width: 300px">
+            <el-option
+                v-for="item in tagsOption"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleSearch" color="#DED0B2">搜索</el-button>
+<!--          <el-button v-if="uploadState" color="#DED0B2" @click="handleUpload">上传附件</el-button>-->
+        </el-form-item>
+      </el-form>
+      <fvTable style="width: 100%;min-height:162px;max-height: 162px" v-if="showAttachmentTable" height="162"  :tableConfig="tableConfig"
+               :data="otherAttachmentList" :isSettingCol="false" :pagination="false">
+        <template #empty>
+          <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
+        </template>
+      </fvTable>
+    </el-row>
+
     <baseTitle :title="getTagName(type)+getTitleInfo(data.taskId)" ></baseTitle>
     <fvForm :schema="schema" @getInstance="(e)=>form = e"></fvForm>
     <el-form :model="formData" label-width="auto" style="margin-top: -15px">
@@ -42,9 +70,58 @@
 <script setup lang="jsx">
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {ElLoading} from 'element-plus';
+import {ElLoading, ElNotification} from 'element-plus';
 import {downloadFile} from "@/api/project-demand";
+import {searchImplementationFileList} from "@/api/project-manage/attachment";
+import {getTags} from "@/api/project-manage";
+const attachmentParam = reactive({
+  tag: ''
+})
+const tagsOption = ref([])
+const uploadState = ref(false)
+const showAttachmentTable = ref(true)
+const otherAttachmentList = ref([])
 
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: '80',
+    },
+    {
+      prop: 'originalFileName',
+      label: '文件名',
+      align: 'center',
+    },
+    {
+      prop: 'tag',
+      label: '标签',
+      align: 'center'
+    },
+    {
+      prop: 'size',
+      label: '文件大小',
+      align: 'center',
+      currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        return (
+            <div>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
+            </div>
+        )
+      }
+    }
+  ]
+})
 const changeDiagram = ref(false)
 const props = defineProps({
   formData: {
@@ -258,6 +335,7 @@ const schema = computed(() => {
   return arr
 })
 
+const route = useRoute()
 const emit = defineEmits(['update:value'])
 const _value = computed({
   get() {
@@ -267,6 +345,51 @@ const _value = computed({
     emit("update:value", val);
   }
 })
+const getTagsOption = () => {
+  if (!route.query.projectId) return
+  getTags(route.query.projectId).then(res => {
+    if (res.code === 1000) {
+      tagsOption.value = res.data
+    }else{
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
+  })
+}
+const handleSearch = () => {
+  let params = {
+    targetId: route.query.projectId,
+    targetState: "40"
+  }
+  if (attachmentParam.tag) {
+    tagsOption.value.forEach(item => {
+      if (item.value === attachmentParam.tag) {
+        attachmentParam.tag = item.label
+      }
+    })
+    params.tag = attachmentParam.tag
+  }
+  searchImplementationFileList(params).then(res => {
+    showAttachmentTable.value = false
+    if (res.code === 1000) {
+      otherAttachmentList.value = res.data.fileList
+      uploadState.value = res.data.upload
+      nextTick(() => {
+        showAttachmentTable.value = true
+      })
+    }else{
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
+  })
+}
+
 const getTitleInfo=(taskId)=>{
   if(taskId){
     return '审批'
@@ -300,6 +423,10 @@ const handleDownload = (row) => {
 }
 watchEffect(() => {
   Object.keys(props.formData).length && (form.value?.setValues(props.formData))
+  if(props.formData.mode=='view'&&props.type&&props.type==='execute'){
+    handleSearch()
+    getTagsOption()
+  }
 })
 
 watch(() => props.loading, (newVal) => {

src/components/DetailComponent/CollectionDetail.vue

@@ -1,5 +1,6 @@
 <template>
   <div v-loading="loading">
+    <baseTitle title="需求征集信息" v-if="type!=='singleDetail'"></baseTitle>
     <el-form :model="formData">
       <el-row>
         <el-col :span="6" v-if="type==='singleDetail'">

src/components/DetailComponent/ProjectApply.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="apply-block">
-    <el-row>
+    <el-row  v-if="title==='check'">
-      <el-col :span="24" v-if="title==='check'">
+      <el-col :span="24">
         <baseTitle :title="'附件信息'"></baseTitle>
       </el-col>
       <el-form :model="attachmentParam" inline style="margin-top: 15px">
@@ -20,7 +20,7 @@
           <el-button v-if="uploadState" color="#DED0B2" @click="handleUpload">上传附件</el-button>
         </el-form-item>
       </el-form>
-        <fvTable style="width: 100%;max-height: 162px" v-if="showAttachmentTable" height="162"  :tableConfig="tableConfig"
+        <fvTable style="width: 100%;min-height:162px;max-height: 162px" v-if="showAttachmentTable" height="162"  :tableConfig="tableConfig"
                  :data="otherAttachmentList" :isSettingCol="false" :pagination="false">
           <template #empty>
             <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
@@ -49,34 +49,35 @@
                         label-width="125">
             <el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowProjectPersonTable">
               <!--              {{ localFormData.projectPersonIds ? '更改' : '请选择' }}-->
-              {{ projectPersonUserList.length !== 0 ? '更改' : '请选择' }}
+              {{ projectPersonUserList.length !== 0 ? '更改' :getProjectPerson(projectPersonUserList)?'更改': '请选择' }}
             </el-button>
-            <div v-for="item in projectPersonUserList" :key="item.id" style="margin-right: 5px">
+            <div v-for="item in getProjectPerson(projectPersonUserList)" :key="item.id" style="margin-right: 5px">
               {{ item.name }}
             </div>
             <user-picker :multiple="true" ref="projectPersonUserPicker" title="请选择项目成员"
                          v-model:value="projectPersonUserList" @ok="projectPersonUserPickerOk"/>
           </el-form-item>
         </el-col>
-
         <el-col :span="24">
           <el-form-item label="前置流程" :required="preProcessRequired" prop="preProcess" label-width="125">
             <el-button color="#DED0B2" @click="handleShowPreTable" style="margin-right: 10px">
-              {{ localFormData.preProcess ? '更改' : '请选择' }}
+              {{ localFormData.preProcess&&localFormData.preProcess.length>0 ? '更改' :sessionParams.preProcess&&sessionParams.preProcess.length>0 ? '更改' : '请选择' }}
             </el-button>
-            <div v-for="item in localFormData.preProcess" :key="item.requestId">
+            <div v-for="item in getRequestName(localFormData.preProcess)" :key="item.requestId">
               <a :href="item.baseUrl" target="_blank"
-                 style="color: #2a99ff;margin-right: 10px;cursor: pointer">{{ item.requestName }}</a>
+                 style="color: #2a99ff;margin-right: 10px;cursor: pointer">{{item.requestName}}
+                </a>
             </div>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    <AttachmentUpload ref="attachment" :label="getTitleName(title)+'附件'" :showTable="showTable"
+<!--    v-if="showAttachment"-->
-                      :otherFileList="otherFileList" :tag="getTitleName(props.title)"
+    <AttachmentUpload  ref="attachment" :label="getTitleName(title)+'附件'" :showTable="showTable"
-                      @getAttachment="getAttachment" :singleList="singleList" :showSingleTable="showSingleTable"
+                      v-model:otherFileList="otherFileList" :tag="getTitleName(props.title)"
+                      @getAttachment="getAttachment" v-model:singleList="singleList" :showSingleTable="showSingleTable"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
-                      :preview="mode == 'resubmit'"/>
+                      :preview="mode == 'resubmit'||mode == 'submit'"/>
     <div>
       <div class="approval-record">
         <div class="approval-title">
@@ -102,7 +103,7 @@
       <el-button color="#DED0B2" v-else-if="mode === 'resubmit'" @click="handleSubmit">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
-    <el-dialog title="前置流程" v-model="showPreTable" width="80%">
+    <el-dialog v-if="showPreTable" title="前置流程" v-model="showPreTable" width="80%">
       <el-form :model="preProcessForm" inline @submit.prevent="searchPreProcess">
         <el-form-item label="请求名称">
           <el-input v-model="preProcessForm.requestName" placeholder="请输入请求名称" clearable>
@@ -113,7 +114,7 @@
           <el-button @click="handleReset">重置</el-button>
         </el-form-item>
       </el-form>
-      <el-table :data="preProcessList" stripe v-loading="loading"
+      <el-table :data="preProcessList"  v-loading="loading"
                 @select="handleSelect" @select-all="handleSelect" row-key="requestId" ref="preProcessTable">
         <el-table-column type="selection" width="55" :reserve-selection="true"/>
         <el-table-column prop="requestId" label="请求id"></el-table-column>
@@ -266,6 +267,7 @@ const rules = reactive({
 })
 const tagsViewStore = useTagsView()
 const processStore = useProcessStore()
+const localProjectPerson = ref([])
 const otherFileList = ref([])
 const localFormData = ref({
   projectPersonIds: [],
@@ -288,6 +290,71 @@ const name = ref(router.currentRoute.value.name)
 const deploymentId = ref()
 const selectRows = ref([])
 const projectId = ref(route.query.projectId)
+const sessionParams=ref({})
+
+if(localStorage.getItem('preProcess')){
+  let param=JSON.parse(localStorage.getItem('preProcess'))
+  localFormData.value.preProcess=param
+  sessionParams.value.preProcess=param
+  localStorage.setItem('preProcess', JSON.stringify(param))
+}
+if(localStorage.getItem('singleFile')){
+  let param=JSON.parse(localStorage.getItem('singleFile'))
+  localFormData.value.singleFile=param
+  singleList.value=[param]
+  localStorage.setItem('singleFile', JSON.stringify(param))
+}
+if(localStorage.getItem('otherFileList')){
+  let param=JSON.parse(localStorage.getItem('otherFileList'))
+  localFormData.value.otherFileList=param
+  otherFileList.value=param
+  localStorage.setItem('otherFileList', JSON.stringify(param))
+}
+// if(localStorage.getItem('sessionParams')){
+//   let param=JSON.parse(localStorage.getItem('sessionParams'))
+//   if(param.otherFileList){
+//     localFormData.value.otherFileList = param.otherFileList
+//     // localStorage.setItem('sessionParams', JSON.stringify(localFormData.value))
+//     otherFileList.value=param.otherFileList
+//     // showTable.value=false
+//     // nextTick(()=>{
+//     //   showTable.value=true
+//     // })
+//   }
+//
+//   localStorage.setItem('sessionParams', JSON.stringify(localFormData.value))
+// }
+if(localStorage.getItem('projectChargePersonUserList')){
+  let param=JSON.parse(localStorage.getItem('projectChargePersonUserList'))
+  projectChargePersonUserList.value=param
+  localStorage.setItem('projectChargePersonUserList', JSON.stringify(param))
+}
+if(localStorage.getItem('projectPersonUserList')){
+  let param=JSON.parse(localStorage.getItem('projectPersonUserList'))
+  projectPersonUserList.value= param
+  localProjectPerson.value=param
+  localStorage.setItem('projectPersonUserList', JSON.stringify(param))
+}
+const getProjectPerson=(list)=>{
+  if(!list||list&&list.length===0){
+    if(localStorage.getItem('projectPersonUserList')){
+      let param=JSON.parse(localStorage.getItem('projectPersonUserList'))
+      projectPersonUserList.value=param
+      return projectPersonUserList.value
+    }
+  }else {
+    return list
+  }
+}
+const getRequestName=(list)=>{
+  if(!list||(list&&list.length===0)){
+    if(sessionParams.value.preProcess){
+      return sessionParams.value.preProcess
+    }
+  }else {
+    return list
+  }
+}
 const getTagsOption = () => {
   if (!route.query.projectId) return
   getTags(route.query.projectId).then(res => {
@@ -332,9 +399,10 @@ const handleSearch = () => {
     }
   })
 }
-
+if(props.title&&props.title==='check'){
-handleSearch()
+  handleSearch()
-getTagsOption()
+  getTagsOption()
+}
 const handleUpload = () => {
   router.push({
     name: 'Implementation/upload',
@@ -347,29 +415,9 @@ const handleUpload = () => {
   })
 }
 const getProjectChargePersonUser = () => {
-  console.log('list', projectChargePersonUserList.value)
   if (projectChargePersonUserList.value.length !== 0) {
     return projectChargePersonUserList.value.map(item => item.name).join()
   }
-  // if(list[0]!==null){
-  //   return list.map(item=>item.name).join()
-  // }
-}
-const getProjectPersonUser = (list) => {
-  console.log('list2', projectPersonUserList.value)
-  // if(list!=null){
-  //   return list.map(item=>item.name).join()
-  // }
-}
-const getPreProcessUrl = (list) => {
-  // list.map(item => {
-  //   item.baseUrl = getPreProcessUrl(item.preProcess)
-  // })
-  // let baseUrl=
-  // list.forEach(item => {
-  //   baseUrl=item.baseUrl
-  // })
-  // return baseUrl
 }
 const handleSelect = async (selection) => {
   selectRows.value = selection
@@ -394,6 +442,7 @@ const handleShowProjectChargePersonTable = () => {
 }
 const projectChargePersonUserPickerOk = (userList) => {
   projectChargePersonUserList.value = userList
+  localStorage.setItem('projectChargePersonUserList', JSON.stringify(projectChargePersonUserList.value))
 }
 const handleShowProjectPersonTable = () => {
   projectPersonUserPicker.value.showUserPicker()
@@ -401,10 +450,11 @@ const handleShowProjectPersonTable = () => {
 
 const projectPersonUserPickerOk = (userList) => {
   projectPersonUserList.value = userList
-  let userIds = []
+  localStorage.setItem('projectPersonUserList', JSON.stringify(userList))
-  for (const user of userList) {
+  // let userIds = []
-    userIds.push(user.id)
+  // for (const user of userList) {
-  }
+  //   userIds.push(user.id)
+  // }
 }
 const getPreProcessList = () => {
   loading.value = true
@@ -443,6 +493,7 @@ const choosePreProcess = () => {
   })
   localFormData.value.preProcess = preProcessArray
   showPreTable.value = false
+  localStorage.setItem('preProcess', JSON.stringify(preProcessArray))
 }
 
 //切换每页显示条数
@@ -481,13 +532,14 @@ const compositeParam = (item) => {
   }
 }
 const getAttachment = (val) => {
-  // console.log('上传文件getAttachment', val)
+  console.log('上传文件getAttachment', val)
   showSingleTable.value = false
   localFormData.value.singleFile = compositeParam(val)
   singleList.value.push(compositeParam(val))
   nextTick(() => {
     showSingleTable.value = true
   })
+  localStorage.setItem('singleFile', JSON.stringify(compositeParam(val)))
 }
 watch(() => singleList.value, (newVal) => {
   showSingleTable.value = newVal.length !== 0;
@@ -500,6 +552,9 @@ const getOtherFile = (val) => {
   nextTick(() => {
     showTable.value = true
   })
+
+  // localFormData.value.otherFileList = otherFileList.value
+  localStorage.setItem('otherFileList', JSON.stringify(otherFileList.value))
 }
 const getFileParam = (item) => {
   return {
@@ -509,7 +564,7 @@ const getFileParam = (item) => {
 }
 const handleSubmit = async () => {
   if (deploymentData.value.deploymentName === '重大项目立项' || deploymentData.value.deploymentName === '重大项目验收') {
-    if (localFormData.value.preProcess === undefined) {
+    if (localFormData.value.preProcess == undefined) {
       ElNotification({
         title: '提示',
         message: '请选择前置流程!',
@@ -518,22 +573,7 @@ const handleSubmit = async () => {
       return;
     }
   }
-  if (projectChargePersonUserList.value && projectChargePersonUserList.value.length === 0) {
+
-    ElNotification({
-      title: '提示',
-      message: '请选择项目负责人!',
-      type: 'error'
-    })
-    return;
-  }
-  if (projectPersonUserList.value && projectPersonUserList.value.length === 0) {
-    ElNotification({
-      title: '提示',
-      message: '请选择项目成员!',
-      type: 'error'
-    })
-    return;
-  }
   let files = []
   if (props.mode === 'resubmit') {
     attachment.value.allFileList.forEach(item => {
@@ -567,9 +607,28 @@ const handleSubmit = async () => {
     projectId: projectId.value,
     preProcess: JSON.stringify(localFormData.value.preProcess)
   }
-  console.log(params)
+  if(sessionParams.value.preProcess&&!localFormData.value.preProcess){
+    params.preProcess=JSON.stringify(sessionParams.value.preProcess)
+  }
+  console.log(params.preProcess)
   let res
   if (props.step === '20') {
+    if (projectChargePersonUserList.value && projectChargePersonUserList.value.length === 0) {
+      ElNotification({
+        title: '提示',
+        message: '请选择项目负责人!',
+        type: 'error'
+      })
+      return;
+    }
+    if (projectPersonUserList.value && projectPersonUserList.value.length === 0) {
+      ElNotification({
+        title: '提示',
+        message: '请选择项目成员!',
+        type: 'error'
+      })
+      return;
+    }
     params.projectChargePerson = parseInt(projectChargePersonUserList.value[0].id)
     params.projectPersonIds = projectPersonIds
     if (props.mode === 'resubmit') {
@@ -659,6 +718,9 @@ watchEffect(() => {
   if (props.formData.projectChargePerson != null) {
     localFormData.value.projectChargePerson = props.formData.projectChargePerson.id
   }
+  // if(props.formData.fileList&&props.formData.fileList.length>0){
+  //  otherFileList.value=props.formData.fileList
+  // }
   // localFormData.value.projectPersonIds = []
   // if (projectPersonUserList.value){
   //   projectPersonUserList.value.forEach(item => {

src/views/auth/index.vue

@@ -6,55 +6,91 @@
           <!-- 标题 -->
           <template #header>
             <div class="card-header">
-              <span>个人信息</span>
+              <div>个人信息</div>
             </div>
           </template>
           <div class="userDetail">
             <div class="userInfo_item">
-              用户名: <span>{{ userParams.userName }}</span>
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <User/>
+                </el-icon>
+                用户名:
+              </div>
+              <div>{{ userParams.userName }}</div>
             </div>
             <div class="userInfo_item">
-              用户名称: <span>{{ userParams.nickName }}</span>
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <User/>
+                </el-icon>
+                用户名称:
+              </div>
+              <div>{{ userParams.nickName }}</div>
             </div>
             <div class="userInfo_item">
-              工号: <span>{{ userParams.workCode }}</span>
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <Notification/>
+                </el-icon>
+                工号:
+              </div>
+              <div>{{ userParams.workCode }}</div>
             </div>
             <div class="userInfo_item">
-              <el-icon>
+              <div style="display: flex;align-items: center">
-                <Iphone/>
+                <el-icon size="18" style="margin-right: 5px">
-              </el-icon>
+                  <Phone/>
-              电话号码: <span>{{ userParams.mobile }}</span></div>
+                </el-icon>
-            <div class="userInfo_item">
+                电话号码:
-              <el-icon>
+              </div>
-                <HomeFilled/>
+              <div>{{ userParams.mobile }}</div>
-              </el-icon>
-              所属公司: <span>{{ userParams.subCompanyName }}</span>
             </div>
             <div class="userInfo_item">
-              <el-icon>
+              <div style="display: flex;align-items: center">
-                <HomeFilled/>
+                <el-icon size="18" style="margin-right: 5px">
-              </el-icon>
+                  <House/>
-              所属部门: <span>{{ userParams.departmentName }}</span>
+                </el-icon>
+                所属公司:
+              </div>
+              <div>{{ userParams.subCompanyName }}</div>
             </div>
             <div class="userInfo_item">
-              <el-icon>
+              <div style="display: flex;align-items: center">
-                <HomeFilled/>
+                <el-icon size="18" style="margin-right: 5px">
-              </el-icon>
+                  <FolderOpened/>
-              岗位: <span>{{ userParams.jobActivityDesc }}</span>
+                </el-icon>
+                所属部门:
+              </div>
+              <div>{{ userParams.departmentName }}</div>
             </div>
             <div class="userInfo_item">
-              <el-icon>
+              <div style="display: flex;align-items: center">
-                <HomeFilled/>
+                <el-icon size="18" style="margin-right: 5px">
-              </el-icon>
+                  <Folder/>
-              账号类型: <span>{{ userParams.accountType === '0' ? '主账号' : '次账号' }}</span>
+                </el-icon>
+                岗位:
+              </div>
+              <div>{{ userParams.jobActivityDesc }}</div>
             </div>
             <div class="userInfo_item">
-              <el-icon>
+              <div style="display: flex;align-items: center">
-                <OfficeBuilding/>
+                <el-icon size="18" style="margin-right: 5px">
-              </el-icon>
+                  <Wallet/>
-              所属角色: <span>{{ belongToRole(userParams.roles) }}</span></div>
+                </el-icon>
-          </div>
+                账号类型:
-          <div>
+              </div>
+              <div>{{ userParams.accountType === '0' ? '主账号' : '次账号' }}</div>
+            </div>
+            <div class="userInfo_item">
+              <div style="display: flex;align-items: center">
+                <el-icon size="18" style="margin-right: 5px">
+                  <User/>
+                </el-icon>
+                所属角色:
+              </div>
+              <div>{{ belongToRole(userParams.roles) }}</div>
+            </div>
           </div>
         </el-card>
       </el-col>
@@ -63,7 +99,7 @@
           <!-- 标题 -->
           <template #header>
             <div class="card-header">
-              <span>{{ isInitPassword ? '修改密码' : '初始化密码' }}</span>
+              <div>{{ isInitPassword ? '修改密码' : '初始化密码' }}</div>
             </div>
           </template>
           <el-form label-width="120px" ref="passwordRef" :model="userPassword" :rules="rules">
@@ -220,17 +256,21 @@ body, div {
   }
 
   .userInfo_item {
+    display: flex;align-items: center;
+    justify-content: space-between;
     height: 40px;
     border-bottom-style: solid;
     border-color: #daddd2;
     border-width: 1px;
-    text-align: left;
+    //text-align: left;
-    line-height: 40px;
+    //line-height: 40px;
+
   }
 
-  .userInfo_item > span {
+  //
-    float: right;
+  //.userInfo_item > div {
-  }
+  //  float: right;
+  //}
 }
 
 </style>

src/views/plan/detail.vue

@@ -159,8 +159,10 @@ const formData = ref({})
 const table = ref()
 const route = useRoute()
 const isEdit = ref(false)
-const editVisible = ref(true)
+const editVisible = ref(false)
-
+if(route.query.type=='summary'){
+  editVisible.value=true
+}
 const exportTable = () => {
   const $e = table.value.$el
   let $table = $e.querySelector('.el-table__fixed')

src/views/project-demand/requirement/detail.vue

@@ -87,7 +87,7 @@ const init = async () => {
     nextTick(() => {
       processViewer.value = true
       showTable.value = true
-      if (data.formPermMap["fileList"]) {
+      if (data.formPermMap&&data.formPermMap["fileList"]) {
         fileListShow.value = data.formPermMap["fileList"].perm
       }
     })

src/views/project-demand/summary/add.vue

@@ -244,8 +244,8 @@
         </el-col>
       </el-row>
     </el-form>
-    <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" :otherFileList="otherFileList"
+    <AttachmentUpload ref="attachment" label="需求申请书附件" :showTable="showTable" v-model:otherFileList="otherFileList"
-                      @getAttachment="getAttachment" :singleList="singleList" :showSingleTable="showSingleTable"
+                      @getAttachment="getAttachment" v-model:singleList="singleList" :showSingleTable="showSingleTable"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" tag="需求上报"
                       :preview="name === 'Summary/edit'"/>
     <div class="approval-record" style="margin-left: 70px">

src/views/project-demand/summary/detail.vue

@@ -48,6 +48,8 @@ const getInfo = async (state) => {
     loading.value = true
     const {code, data, msg} = await getMapProjectStateInfo(projectId, state)
     if (code === 1000) {
+      data.formData.preProcess = data.formData.preProcess ? JSON.parse(data.formData.preProcess) : undefined
+
       summaryData.value = data;
       loading.value = false
       if(data.runningList===null) {

src/views/project-demand/summary/index.vue

@@ -312,7 +312,8 @@ const handleExport = () => {
         router.push({
           name: 'Plan/detail',
           query: {
-            annualPlanId: res.data
+            annualPlanId: res.data,
+            type:'summary'
           }
         })
       }

src/views/project-management/implementation/detail.vue

@@ -75,7 +75,12 @@ route.query.step == '50' && (currentStep.value = 4)
 const showActive = ref()
 const detailData = ref({})
 const commonProvessViewer = ref(true)
-
+console.log('刷新详情')
+localStorage.removeItem('singleFile')
+localStorage.removeItem('otherFileList')
+localStorage.removeItem('preProcess')
+localStorage.removeItem('projectChargePersonUserList')
+localStorage.removeItem('projectPersonUserList')
 const getAllInfo = async (state) => {
   const loading = ElLoading.service({fullscreen: true})
   try {

src/views/project-management/implementation/phase.vue

@@ -8,8 +8,8 @@
       </el-form-item>
     </el-form>
     <user-picker :multiple="true" ref="userPicker" title="请选择抄送人员" v-model:value="userList" @ok="selected"/>
-    <AttachmentUpload ref="attachment" label="阶段变更附件" :showTable="showTable" :otherFileList="otherFileList"
+    <AttachmentUpload ref="attachment" label="阶段变更附件" :showTable="showTable" v-model:otherFileList="otherFileList"
-                      @getAttachment="getAttachment"  :singleList="singleList" :showSingleTable="showSingleTable"
+                      @getAttachment="getAttachment"  v-model:singleList="singleList" :showSingleTable="showSingleTable"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData" tag="阶段变更"
                       :preview="name === 'Phase/edit'"/>
     <div class="approval-record"  style="margin-left: 68px">

src/views/project-management/mobledetail/ProjectApplyMoblie.vue

@@ -16,7 +16,7 @@
       </el-row>
     </el-form>
     <AttachmentUpload ref="attachment" :label="getTitleName(title)+'附件'" :showTable="showTable"
-                      :otherFileList="otherFileList" :tag="getTitleName(props.title)"
+                      v-model:otherFileList="otherFileList" :tag="getTitleName(props.title)"
                       @getAttachment="getAttachment" :labelPosition="'top'"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="localFormData"
                       :preview="mode == 'resubmit'"/>