From 5600b48d8eaf277b1c24eab8390355bbd57bdb87 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 29 Mar 2024 15:38:30 +0800
Subject: [PATCH] add

---
 .../default/components/header/index.vue       |  2 +-
 .../components/header/multiple-tabs.vue       |  2 +-
 src/styles/var.css                            |  2 +-
 .../jianli_project_progress_report/detail.js  |  2 +-
 .../jianli_project_progress_report/edit.vue   | 29 ++++++++++---------
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/layout/default/components/header/index.vue b/src/layout/default/components/header/index.vue
index 5b4631f..1cb88d1 100644
--- a/src/layout/default/components/header/index.vue
+++ b/src/layout/default/components/header/index.vue
@@ -19,7 +19,7 @@
 
             </div>
 
-            <div class="flex">
+            <div class=" flex">
                 <div class="navbar-item" v-if="!isMobile">
                     <full-screen />
                 </div>
diff --git a/src/layout/default/components/header/multiple-tabs.vue b/src/layout/default/components/header/multiple-tabs.vue
index 43ef1c7..d9840a5 100644
--- a/src/layout/default/components/header/multiple-tabs.vue
+++ b/src/layout/default/components/header/multiple-tabs.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="flex">
-        <div class="menu flex-1 flex flex-wrap px-4 mt-8">
+        <div class="menu flex-1 flex flex-wrap px-4 mt-0">
             <div v-for="(item, index) in tabsLists" class="flex py-1 px-5 cursor-pointer mb-2 items-center"
                 :class="{ act: (currentRoute == item.fullPath) }">
                 <span v-show="currentRoute == item.fullPath" class="w-1.5 h-1.5 mr-1 bg-primary rounded"></span>
diff --git a/src/styles/var.css b/src/styles/var.css
index a10631a..64be46a 100644
--- a/src/styles/var.css
+++ b/src/styles/var.css
@@ -5,7 +5,7 @@
     --el-menu-sub-item-height: var(--el-menu-item-height);
     --el-menu-icon-width: 18px;
     --aside-width: 200px;
-    --navbar-height: 50px;
+    --navbar-height: 80px;
     --color-white: #ffffff;
     --table-header-bg-color: #f8f8f8;
     --el-font-size-extra-large: 18px;
diff --git a/src/views/jianli_project_progress_report/detail.js b/src/views/jianli_project_progress_report/detail.js
index e4f980e..c309444 100644
--- a/src/views/jianli_project_progress_report/detail.js
+++ b/src/views/jianli_project_progress_report/detail.js
@@ -68,7 +68,7 @@ const detailConfig = {
             column: 1
         },
         {
-            label: "文本输入框",
+            label: "备注",
             value: "fd_23",
             column: 1
         },
diff --git a/src/views/jianli_project_progress_report/edit.vue b/src/views/jianli_project_progress_report/edit.vue
index b03cb32..71b29f6 100644
--- a/src/views/jianli_project_progress_report/edit.vue
+++ b/src/views/jianli_project_progress_report/edit.vue
@@ -1,7 +1,6 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
-            @close="handleClose">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="140px" :rules="formRules">
                 <el-row>
                     <el-col :span="8">
@@ -25,8 +24,7 @@
                     <el-col :span="8">
 
                         <el-form-item label="部门负责人" prop="bm_master">
-                            <el-input v-model="formData.bm_master" clearable placeholder="请选择部门负责人"
-                                @click="userclick()" />
+                            <el-input v-model="formData.bm_master" clearable placeholder="请选择部门负责人" @click="userclick()" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
@@ -76,8 +74,7 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="本阶段完成进度(%)" prop="bjd_progress">
-                            <el-input v-model="formData.bjd_progress" clearable placeholder="请输入本阶段完成进度(%)"
-                                type="number" />
+                            <el-input v-model="formData.bjd_progress" clearable placeholder="请输入本阶段完成进度(%)" type="number" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -100,15 +97,19 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <el-col :span="8">
-                    <el-form-item label="附件" prop="datas">
-                        <uploadAnnex :formData="formData"></uploadAnnex>
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="附件" prop="datas">
+                            <uploadAnnex :formData="formData"></uploadAnnex>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="备注" prop="fd_23">
+                            <el-input v-model="formData.fd_23" clearable placeholder="请输入文本输入框" type="textarea" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
 
-                    </el-form-item>
-                </el-col>
-                <el-form-item label="文本输入框" prop="fd_23">
-                    <el-input v-model="formData.fd_23" clearable placeholder="请输入文本输入框" />
-                </el-form-item>
                 <el-dialog v-model="showDialog" title="选择项目" width="70%">
                     <dialogTable :config="cost_project" @customEvent="customEvent">
                     </dialogTable>