fix : 修复项目详情排版,组织机构管理排版

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

@@ -141,9 +141,9 @@ const stepChange = (data) => {
 </script>
 
 <style scoped lang="scss">
-.detail-block {
-  padding-top: 15px;
-}
+//.detail-block{
+//  padding-top: 15px;
+//}
 
 :deep(.el-tabs__nav-scroll) {
   width: 100%;

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

@@ -2,9 +2,9 @@
   <baseTitle title="基础信息"></baseTitle>
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
   <baseTitle title="项目实施-上传附件"></baseTitle>
-  <el-form :model="formData" ref="tagForm" label-width="auto" :rules="rules">
+  <el-form :model="formData" ref="tagForm" label-width="auto" >
     <el-form-item label="标签名称" prop="tagName">
-      <el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 300px" v-if="showInput"/>
+      <el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 300px" v-if="showInput" clearable/>
       <el-select v-model="formData.tagName" placeholder="请选择标签名称" clearable filterable style="width: 300px" v-else>
         <el-option
             v-for="item in tagsOption"
@@ -16,16 +16,15 @@
       <el-button type="primary" link @click="changeInput">{{ showInput ? '选择' : '输入' }}</el-button>
     </el-form-item>
   </el-form>
-  <baseTitle title="其他文件"></baseTitle>
-  <el-card style="width: 100%;margin: 15px 0">
-    <file-upload @getFile="getFile" :disabled="!formData.tagName" :title="!formData.tagName?'请先选择/输入标签！':''"/>
+  <div style="display: flex; align-items: center">
+    <baseTitle title="其他文件" style="margin-right: 10px"></baseTitle>
+    <file-upload @getFile="getFile" :disabled="!formData.tagName" :title="!formData.tagName?'请先选择/输入标签！':''"/></div>
     <fvTable style="width: 100%;max-height: 162px;" v-if="showTable" height="162"  :tableConfig="tableConfig"
              :data="fileList" :isSettingCol="false" :pagination="false">
       <template #empty>
         <el-empty :image-size="55" description="暂无数据" style="padding: 0"/>
       </template>
     </fvTable>
-  </el-card>
   <div class="oper-page-btn">
     <el-button color="#DED0B2" @click="handleSubmit(tagForm)">提交</el-button>
   </div>
@@ -131,6 +130,15 @@ const name = ref(router.currentRoute.value.name)
 const rules = reactive({
   tagName: [{required: true, message: '请输入标签名称', trigger: ['blur', 'change']}],
 })
+onActivated(()=>{
+  console.log('onActivated')
+  formData.value.tagName = '';
+  showTable.value=false
+  nextTick(()=>{
+    showTable.value=true
+  })
+  fileList.value=[]
+})
 const handleDelete = (row) => {
   deleteFile(row.fileId).then(res => {
     ElNotification({
@@ -155,7 +163,7 @@ const handleDownload = (row) => {
 }
 const getBaseInfo = async () => {
   try {
-    const {code, data} = await getBaseInfoApi(route.query.id)
+    const {code, data} = await getBaseInfoApi(route.query.projectId)
     baseForm.value.setValues(data)
   } catch {
   }
@@ -167,8 +175,8 @@ const changeInput = () => {
   formData.value.tagName = '';
 }
 const getTagsOption = () => {
-  if (!route.query.id) return
-  getTags(route.query.id).then(res => {
+  if (!route.query.projectId) return
+  getTags(route.query.projectId).then(res => {
     ElNotification({
       title: '提示',
       message: res.msg,
@@ -219,7 +227,7 @@ const handleSubmit = async (instance) => {
     }
     let params = {
       fileList: fileList.value,
-      projectId: route.query.id,
+      projectId: route.query.projectId,
       targetState: "40"
     }
     let res = await uploadFileList(params)
@@ -234,14 +242,17 @@ const handleSubmit = async (instance) => {
         await router.push({
           name: 'Filing/attachment',
           query: {
-            id: route.query.id
+            id: route.query.projectId
           }
         })
       } else {
         await router.push({
-          name: 'Implementation/attachment',
+          name: 'Implementation/detail',
           query: {
-            id: route.query.id
+            id: route.query.id,
+            state: route.query.state,
+            projectId: route.query.projectId,
+            step: '40'
           }
         })
       }