From e4d0b8706943a6784aa98a1a310bc35bc0ffcde6 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Wed, 7 Aug 2024 23:47:49 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ProjectApply.vue          | 15 ++++-
 src/components/SearchFilesByTag.vue           |  4 +-
 .../project-management/filing/attachment.vue  | 18 +++---
 .../project-management/filing/upload.vue      | 32 +++++-----
 .../implementation/attachment.vue             |  6 +-
 .../implementation/phase.vue                  |  5 +-
 .../implementation/phaseDetail.vue            |  7 ++-
 .../implementation/share.vue                  | 19 ++++--
 .../implementation/upload.vue                 | 62 ++++++++++---------
 .../implementation/uploadFee.vue              |  4 +-
 10 files changed, 105 insertions(+), 67 deletions(-)

diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index e9d2745..8ff36d6 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -59,7 +59,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6" v-if="title==='apply'||title==='check'">
-          <el-form-item label="部门分管领导" label-width="115"
+          <el-form-item label="部门分管领导" :label-width="title==='check'?110:115"
           >
             <el-button color="#DED0B2" style="margin-right: 10px" @click="handleShowOptionalChargeLeadershipPicker">
               {{
@@ -830,6 +830,19 @@ onMounted(async () => {
       }
     }
   }
+  .is-leaf:first-child {
+    .cell {
+      margin-left: -18px !important;
+    }
+  }
+
+  .el-table__body {
+    .el-table__cell:first-child {
+      .cell {
+        margin-left: -10px !important;
+      }
+    }
+  }
 }
 </style>
 <style scoped lang="scss">
diff --git a/src/components/SearchFilesByTag.vue b/src/components/SearchFilesByTag.vue
index 748127d..1aeae95 100644
--- a/src/components/SearchFilesByTag.vue
+++ b/src/components/SearchFilesByTag.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-loading="_value">
-    <el-form :model="attachment" inline>
+    <el-form :model="attachment" inline style="margin-left: 15px">
       <el-form-item label="名称" prop="fileName">
         <el-input v-model="attachment.fileName" placeholder="请输入附件名称查询" clearable filterable style="width: 300px"/>
       </el-form-item>
@@ -20,7 +20,7 @@
         <el-button v-if="uploadState" color="#DED0B2" @click="handleUpload">上传附件</el-button>
       </el-form-item>
     </el-form>
-    <el-card style="width: 100%">
+    <el-card style="width: 100%;overflow-y: hidden">
       <fvTable style="width: 100%;max-height: 300px" v-if="showTable" height="300"  :tableConfig="tableConfig"
                :data="fileList" :isSettingCol="false" :pagination="false">
         <template #empty>
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index d92b97c..154f5a1 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -1,12 +1,14 @@
 <template>
-  <baseTitle title="项目基本信息"></baseTitle>
-  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
-  <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-    <el-tab-pane v-for="item in paneList" :label="item.label" :name="item.name">
-      <search-files-by-tag @search="search" @upload="upload" :type="item.name==='40'?'40':''"
-                           :fileList="fileList" :uploadState="uploadState" v-model:loading="loading"/>
-    </el-tab-pane>
-  </el-tabs>
+ <div style="padding: 0 30px">
+   <baseTitle title="项目基本信息"></baseTitle>
+   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
+   <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+     <el-tab-pane v-for="item in paneList" :label="item.label" :name="item.name">
+       <search-files-by-tag @search="search" @upload="upload" :type="item.name==='40'?'40':''"
+                            :fileList="fileList" :uploadState="uploadState" v-model:loading="loading"/>
+     </el-tab-pane>
+   </el-tabs>
+ </div>
 </template>
 
 <script setup lang="jsx">
diff --git a/src/views/project-management/filing/upload.vue b/src/views/project-management/filing/upload.vue
index e4f99f3..c80ca53 100644
--- a/src/views/project-management/filing/upload.vue
+++ b/src/views/project-management/filing/upload.vue
@@ -1,19 +1,21 @@
 <template>
-  <baseTitle title="项目基本信息"></baseTitle>
-  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
-  <baseTitle :title="getName()+'-上传附件'"></baseTitle>
-  <el-card style="width: 100%;margin: 15px 0">
-    <file-upload @getFile="getFile" />
-    <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" height="300"  :tableConfig="tableConfig"
-             :data="fileList" :isSettingCol="false" :pagination="false">
-      <template #empty>
-        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-      </template>
-    </fvTable>
-  </el-card>
-  <div class="oper-page-btn">
-    <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
-  </div>
+ <div style="padding: 0 30px">
+   <baseTitle title="项目基本信息"></baseTitle>
+   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
+   <baseTitle :title="getName()+'-上传附件'"></baseTitle>
+   <el-card style="width: 100%;margin: 15px 0">
+     <file-upload @getFile="getFile" />
+     <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" height="300"  :tableConfig="tableConfig"
+              :data="fileList" :isSettingCol="false" :pagination="false">
+       <template #empty>
+         <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+       </template>
+     </fvTable>
+   </el-card>
+   <div class="oper-page-btn">
+     <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
+   </div>
+ </div>
 </template>
 
 <script setup lang="jsx">
diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue
index 95bfc8e..848fb32 100644
--- a/src/views/project-management/implementation/attachment.vue
+++ b/src/views/project-management/implementation/attachment.vue
@@ -1,7 +1,8 @@
 <template>
+<div style="padding: 0 30px">
   <baseTitle title="项目基本信息"></baseTitle>
-  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
-  <el-form :model="attachment" inline style="margin-top: 15px">
+  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
+  <el-form :model="attachment" inline style="margin-left: 15px">
     <el-form-item label="标签" prop="tag">
       <el-select v-model="attachment.tag" placeholder="请选择标签" clearable filterable style="width: 300px">
         <el-option
@@ -25,6 +26,7 @@
       </template>
     </fvTable>
   </el-card>
+</div>
 </template>
 
 <script setup lang="jsx">
diff --git a/src/views/project-management/implementation/phase.vue b/src/views/project-management/implementation/phase.vue
index a338d72..3d562f6 100644
--- a/src/views/project-management/implementation/phase.vue
+++ b/src/views/project-management/implementation/phase.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="apply-block" v-loading="loading">
     <baseTitle title="项目基本信息"></baseTitle>
-    <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
+    <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
     <baseTitle title="阶段变更信息" style="margin-top: -10px"></baseTitle>
     <el-form :model="formData" label-width="auto">
-      <el-form-item label="抄送人员" label-width="105">
+      <el-form-item label="抄送人员" label-width="110">
         <Ttsup :modelValue="chooseUserInfo()" @clickCopyUser="chooseUser"/>
       </el-form-item>
     </el-form>
@@ -528,5 +528,6 @@ onMounted(async () => {
 <style scoped>
 .apply-block {
   margin: 15px 0;
+  padding: 0 30px ;
 }
 </style>
diff --git a/src/views/project-management/implementation/phaseDetail.vue b/src/views/project-management/implementation/phaseDetail.vue
index bc801a6..f64dd9c 100644
--- a/src/views/project-management/implementation/phaseDetail.vue
+++ b/src/views/project-management/implementation/phaseDetail.vue
@@ -1,11 +1,14 @@
 <template>
+<div style="padding: 0 30px">
   <baseTitle title="项目基本信息"></baseTitle>
-  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
+  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
   <baseTitle title="阶段变更详情" style="margin-top: -10px"></baseTitle>
-  <div style="color: #606266;font-size: 14px;height:25px;"><span style="display:inline-block;text-align: right;margin-right: 14px">抄送人</span>{{copyName?copyName:'--'}}</div>
+  <div style="color: #606266;font-size: 14px;height:25px;"><span style="display:inline-block;text-align: right;margin-right: 14px;margin-left: 15px">抄送人</span>{{copyName?copyName:'--'}}</div>
   <ApprovalDetail :formData="summaryData.formData" :data="summaryData" type="phase"
                   :processViewer="summaryProcessViewer" :loading="loading" :fileListShow="fileListShow"  v-model:value="auditOpinion"/>
   <opinion v-if="summaryData.taskId" :formData="summaryData.formData" :taskId="summaryData.taskId"  :taskUserOptionList="summaryData.taskUserOptionList"  v-model:value="auditOpinion"></opinion>
+
+</div>
 </template>
 
 <script setup lang="jsx">
diff --git a/src/views/project-management/implementation/share.vue b/src/views/project-management/implementation/share.vue
index 67f5cd6..df7308c 100644
--- a/src/views/project-management/implementation/share.vue
+++ b/src/views/project-management/implementation/share.vue
@@ -1,7 +1,7 @@
 <template>
   <baseTitle title="项目基本信息"></baseTitle>
-  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
-  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
+  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
+  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 15px;"></fvSearchForm>
   <fvTable ref="tableIns" :tableConfig="tableConfig">
     <template #empty>
       <el-empty description="暂无数据"/>
@@ -347,6 +347,17 @@ const getBaseInfo = async () => {
 getBaseInfo()
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+.search-form{
+  padding-top: 0;
+}
+:deep(.el-col-offset-1){
+  margin-left: 50px;
+}
+:deep(.el-date-editor.el-input, .el-date-editor.el-input__wrapper ){
+  width: 100%!important;
+}
+:deep(.btn-col){
+  margin-left: -28px;
+}
 </style>
diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue
index 52fa536..ec2cf95 100644
--- a/src/views/project-management/implementation/upload.vue
+++ b/src/views/project-management/implementation/upload.vue
@@ -1,33 +1,35 @@
 <template>
-  <baseTitle title="项目基本信息"></baseTitle>
-  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
-  <baseTitle title="项目实施-上传附件"></baseTitle>
-  <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" clearable/>
-      <el-select v-model="formData.tagName" placeholder="请选择标签名称" clearable filterable style="width: 300px" v-else>
-        <el-option
-            v-for="item in tagsOption"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-        />
-      </el-select>
-      <el-button type="primary" link @click="changeInput">{{ showInput ? '选择' : '输入' }}</el-button>
-    </el-form-item>
-  </el-form>
-  <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: 300px;" v-if="showTable" height="300" :tableConfig="tableConfig"
-           :data="fileList" :isSettingCol="false" :pagination="false">
-    <template #empty>
-      <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-    </template>
-  </fvTable>
-  <div class="oper-page-btn">
-    <el-button color="#DED0B2" @click="handleSubmit(tagForm)">提交</el-button>
+  <div style="padding: 0 30px">
+    <baseTitle title="项目基本信息"></baseTitle>
+    <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
+    <baseTitle title="项目实施-上传附件" style="margin-bottom: 15px"></baseTitle>
+    <el-form :model="formData" ref="tagForm" label-width="auto">
+      <el-form-item label="标签名称" prop="tagName" style="margin-left: 15px;">
+        <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"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+          />
+        </el-select>
+        <el-button type="primary" link @click="changeInput">{{ showInput ? '选择' : '输入' }}</el-button>
+      </el-form-item>
+    </el-form>
+    <div style="display: flex; align-items: center;margin-top: -5px">
+      <baseTitle title="其他文件" style="margin-right: 10px;"></baseTitle>
+      <file-upload @getFile="getFile" :disabled="!formData.tagName" :title="!formData.tagName?'请先选择/输入标签！':''"/>
+    </div>
+    <fvTable style="width: 100%;max-height: 300px;" v-if="showTable" height="300" :tableConfig="tableConfig"
+             :data="fileList" :isSettingCol="false" :pagination="false">
+      <template #empty>
+        <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+      </template>
+    </fvTable>
+    <div class="oper-page-btn">
+      <el-button color="#DED0B2" @click="handleSubmit(tagForm)">提交</el-button>
+    </div>
   </div>
 </template>
 
@@ -457,7 +459,7 @@ const handleSubmit = async (instance) => {
           await router.push({
             name: 'Implementation/detail',
             query: {
-              id: route.query.requirementId,
+              id: route.query.id,
               projectId: route.query.projectId,
               state: route.query.state,
               step: '40'
diff --git a/src/views/project-management/implementation/uploadFee.vue b/src/views/project-management/implementation/uploadFee.vue
index bec292c..3ecd986 100644
--- a/src/views/project-management/implementation/uploadFee.vue
+++ b/src/views/project-management/implementation/uploadFee.vue
@@ -1,6 +1,7 @@
 <template>
+<div style="padding: 0 30px ">
   <baseTitle title="项目基本信息"></baseTitle>
-  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
+  <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
   <el-form :model="tableForm" ref="form" class="query-form">
     <el-table :data="tableForm.tableData">
       <el-table-column prop="time" label="时间" min-width="180">
@@ -75,6 +76,7 @@
     <el-button color="#DED0B2" @click="handleSubmit(form)">提交</el-button>
     <el-button @click="handleBack">返回</el-button>
   </div>
+</div>
 </template>
 
 <script setup lang="jsx">