sunny hai 9 horas
pai
achega
5bbe051070

+ 2 - 1
ruoyi-ui/src/views/invest/pool/detail.vue

@@ -119,7 +119,7 @@
       </div>
     </section>
     <section class="section3">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="活动" name="0"></el-tab-pane>
         <el-tab-pane label="项目报备" name="1"></el-tab-pane>
         <el-tab-pane label="评估考察" name="9"></el-tab-pane>
@@ -629,6 +629,7 @@ export default {
     }
   }
   .section3 {
+    border: 1px solid #DCDFE6;
     margin-top: 40px;
   }
 }

+ 2 - 1
ruoyi-ui/src/views/project/approval/audit.vue

@@ -65,7 +65,7 @@
       </div>
     </section>
     <section class="section3">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="立项信息" name="0"></el-tab-pane>
         <el-tab-pane label="项目基本信息" name="1"></el-tab-pane>
       </el-tabs>
@@ -2040,6 +2040,7 @@ export default {
     }
   }
   .section3 {
+    border: 1px solid #DCDFE6;
     margin-top: 40px;
   }
   .btnList {

+ 2 - 1
ruoyi-ui/src/views/project/approval/detail.vue

@@ -71,7 +71,7 @@
       </div>
     </section>
     <section class="section3">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="立项信息" name="0"></el-tab-pane>
         <el-tab-pane label="项目基本信息" name="1"></el-tab-pane>
       </el-tabs>
@@ -957,6 +957,7 @@ export default {
     }
   }
   .section3 {
+    border: 1px solid #DCDFE6;
     margin-top: 40px;
   }
 }

+ 2 - 1
ruoyi-ui/src/views/project/approval/edit.vue

@@ -65,7 +65,7 @@
       </div>
     </section>
     <section class="section3">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="立项信息" name="0"></el-tab-pane>
         <el-tab-pane label="项目基本信息" name="1"></el-tab-pane>
       </el-tabs>
@@ -407,6 +407,7 @@ export default {
     }
   }
   .section3 {
+    border: 1px solid #DCDFE6;
     margin-top: 40px;
   }
   .approveBtn {

+ 2 - 1
ruoyi-ui/src/views/project/decision/audit.vue

@@ -72,7 +72,7 @@
       </div>
     </section>
     <section class="section3">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="投决信息" name="0"></el-tab-pane>
         <el-tab-pane label="项目基本信息" name="1"></el-tab-pane>
       </el-tabs>
@@ -1972,6 +1972,7 @@ export default {
     }
   }
   .section3 {
+    border: 1px solid #DCDFE6;
     margin-top: 40px;
   }
   .btnList {

+ 2 - 1
ruoyi-ui/src/views/project/decision/detail.vue

@@ -73,7 +73,7 @@
       </div>
     </section>
     <section class="section3">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="投决信息" name="0"></el-tab-pane>
         <el-tab-pane label="项目基本信息" name="1"></el-tab-pane>
       </el-tabs>
@@ -948,6 +948,7 @@ export default {
     }
   }
   .section3 {
+    border: 1px solid #DCDFE6;
     margin-top: 40px;
   }
 }

+ 1 - 1
ruoyi-ui/src/views/project/decision/edit.vue

@@ -72,7 +72,7 @@
       </div>
     </section>
     <section class="section3">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="投决信息" name="0"></el-tab-pane>
         <el-tab-pane label="项目基本信息" name="1"></el-tab-pane>
       </el-tabs>

+ 9 - 9
ruoyi-ui/src/views/project/investOpp/audit.vue

@@ -8,8 +8,7 @@
     </section>
     <el-divider></el-divider>
     <section class="section3">
-
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName"  type="border-card" @tab-click="handleClick">
         <el-tab-pane label="项目基本信息" name="0"></el-tab-pane>
         <el-tab-pane label="项目公司信息" name="1"></el-tab-pane>
         <el-tab-pane label="项目联系人信息" name="2"></el-tab-pane>
@@ -18,9 +17,9 @@
 <!--        <el-tab-pane v-if="form.taskDefKey=='presidents' && formAssess !== null && formAssess !== undefined && formAssess !== ''"  label="软件工程院评估意见" name="5"></el-tab-pane>-->
       </el-tabs>
       <section>
-        <el-form ref="form" :model="form" label-width="160px" class="special-el-form">
-          <div v-if="activeName === '0'" >
-            <el-row :gutter="20" style="margin-left: 0px;margin-right: 0px;">
+        <el-form label-position="left" ref="form" :model="form" label-width="160px" class="special-el-form">
+          <div v-if="activeName === '0'" class="public-padded-20">
+            <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="项目名称" prop="projectName">
                 <el-input maxlength="100" v-model="form.projectName" placeholder="请输入项目名称" :disabled="type === '2'"/>
@@ -119,7 +118,7 @@
             </el-col>
             </el-row>
           </div>
-          <div v-if="activeName === '1'">
+          <div v-if="activeName === '1'" class="public-padded-20">
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="公司名称" prop="tProjectCompany.companyName">
@@ -295,7 +294,7 @@
             </el-row>
 <!--            </el-form>-->
           </div>
-          <div v-if="activeName === '2'">
+          <div v-if="activeName === '2'" class="public-padded-20">
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="联系人姓名" prop="tProjectContacts.name">
@@ -329,7 +328,7 @@
               </el-col>
             </el-row>
           </div>
-          <div v-if="activeName === '3'" class="public-padded-20 detail-meeting">
+          <div v-if="activeName === '3'" class="public-padded-20">
 <!--            <el-form :model="form" label-width="120px">-->
             <el-row :gutter="20">
               <el-col :span="12">
@@ -508,7 +507,7 @@
             </el-row>
 <!--            </el-form>-->
           </div>
-          <div v-if="activeName === '4'">
+          <div v-if="activeName === '4'" class="public-padded-20">
 <!--            <el-form :model="tProjectCompany" label-width="120px">-->
             <el-row :gutter="20">
               <el-col>
@@ -993,6 +992,7 @@ export default {
     }
   }
   .section3 {
+    border: 1px solid #DCDFE6;
     margin-top: 40px;
     .el-form-item {
       width: 100%; /* 让表单占满父容器 */

+ 9 - 8
ruoyi-ui/src/views/project/investOpp/detail.vue

@@ -9,7 +9,7 @@
     <el-divider></el-divider>
     <section class="section3">
 
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="项目基本信息" name="0"></el-tab-pane>
         <el-tab-pane label="项目公司信息" name="1"></el-tab-pane>
         <el-tab-pane label="项目联系人信息" name="2"></el-tab-pane>
@@ -18,9 +18,9 @@
 <!--        <el-tab-pane v-if="formAssess!=null" label="软件工程院评估意见" name="5"></el-tab-pane>-->
       </el-tabs>
       <section>
-        <el-form ref="form" :model="form" label-width="160px" class="special-el-form">
-          <div v-if="activeName === '0'" >
-          <el-row :gutter="20" style="margin-left: 0px;margin-right: 0px;">
+        <el-form label-position="left" ref="form" :model="form" label-width="160px" class="special-el-form">
+          <div v-if="activeName === '0'" class="public-padded-20">
+          <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="项目名称" prop="projectName">
                 <el-input maxlength="100" v-model="form.projectName" placeholder="请输入项目名称" :disabled="type === '2'"/>
@@ -114,7 +114,7 @@
             </el-col>
             </el-row>
           </div>
-          <div v-if="activeName === '1'">
+          <div v-if="activeName === '1'" class="public-padded-20">
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="公司名称" prop="tProjectCompany.companyName">
@@ -290,7 +290,7 @@
             </el-row>
 <!--            </el-form>-->
           </div>
-          <div v-if="activeName === '2'">
+          <div v-if="activeName === '2'" class="public-padded-20">
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="联系人姓名" prop="tProjectContacts.name">
@@ -324,7 +324,7 @@
               </el-col>
             </el-row>
           </div>
-          <div v-if="activeName === '3'" class="public-padded-20 detail-meeting">
+          <div v-if="activeName === '3'" class="public-padded-20">
 <!--            <el-form :model="form" label-width="120px">-->
             <el-row :gutter="20">
               <el-col :span="12">
@@ -503,7 +503,7 @@
             </el-row>
 <!--            </el-form>-->
           </div>
-          <div v-if="activeName === '4'">
+          <div v-if="activeName === '4'" class="public-padded-20">
 <!--            <el-form :model="tProjectCompany" label-width="120px">-->
             <el-row :gutter="20">
               <el-col>
@@ -957,6 +957,7 @@ export default {
     }
   }
   .section3 {
+    border: 1px solid #DCDFE6;
     margin-top: 40px;
     .el-form-item {
       width: 100%; /* 让表单占满父容器 */

+ 2 - 1
ruoyi-ui/src/views/project/investigate/audit.vue

@@ -72,7 +72,7 @@
       </div>
     </section>
     <section class="section3">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="尽职背调信息" name="0"></el-tab-pane>
         <el-tab-pane label="项目基本信息" name="1"></el-tab-pane>
       </el-tabs>
@@ -682,6 +682,7 @@ export default {
     }
   }
   .section3 {
+    border: 1px solid #DCDFE6;
     margin-top: 40px;
   }
   .btnList {

+ 2 - 1
ruoyi-ui/src/views/project/investigate/detail.vue

@@ -73,7 +73,7 @@
       </div>
     </section>
     <section class="section3">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="尽职背调信息" name="0"></el-tab-pane>
         <el-tab-pane label="项目基本信息" name="1"></el-tab-pane>
       </el-tabs>
@@ -434,6 +434,7 @@ export default {
     }
   }
   .section3 {
+    border: 1px solid #DCDFE6;
     margin-top: 40px;
   }
 }

+ 2 - 1
ruoyi-ui/src/views/project/investigate/edit.vue

@@ -65,7 +65,7 @@
       </div>
     </section>
     <section class="section3">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="尽职背调信息" name="0"></el-tab-pane>
         <el-tab-pane label="项目基本信息" name="1"></el-tab-pane>
       </el-tabs>
@@ -535,6 +535,7 @@ export default {
     }
   }
   .section3 {
+    border: 1px solid #DCDFE6;
     margin-top: 40px;
   }
   .approveBtn {

+ 2 - 1
ruoyi-ui/src/views/project/poolDetail.vue

@@ -132,7 +132,7 @@
       </div>
     </section>
     <section class="section3">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="活动" name="0"></el-tab-pane>
         <el-tab-pane label="项目信息" name="1"></el-tab-pane>
         <!-- <el-tab-pane label="评估考察" name="9"></el-tab-pane> -->
@@ -661,6 +661,7 @@ export default {
     }
   }
   .section3 {
+    border: 1px solid #DCDFE6;
     margin-top: 40px;
   }
 }

+ 3 - 2
ruoyi-ui/src/views/project/termination/audit.vue

@@ -72,7 +72,7 @@
       </div>
     </section>
     <section class="section3">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="终止申请信息" name="0"></el-tab-pane>
         <el-tab-pane label="项目基本信息" name="1"></el-tab-pane>
       </el-tabs>
@@ -111,7 +111,7 @@
             </el-tab-pane>
           </el-tabs>
         </div>
-        <div v-show="activeName === '1'">
+        <div v-show="activeName === '1'" class="public-padded-20">
           <poolForm :type="type" :id="id"></poolForm>
         </div>
       </section>
@@ -329,6 +329,7 @@ export default {
     }
   }
   .section3 {
+    border: 1px solid #DCDFE6;
     margin-top: 40px;
   }
   .btnList {

+ 2 - 1
ruoyi-ui/src/views/project/termination/detail.vue

@@ -73,7 +73,7 @@
       </div>
     </section>
     <section class="section3">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="终止申请信息" name="0"></el-tab-pane>
         <el-tab-pane label="项目基本信息" name="1"></el-tab-pane>
       </el-tabs>
@@ -247,6 +247,7 @@ export default {
     }
   }
   .section3 {
+    border: 1px solid #DCDFE6;
     margin-top: 40px;
   }
 }

+ 2 - 1
ruoyi-ui/src/views/project/termination/edit.vue

@@ -72,7 +72,7 @@
       </div>
     </section>
     <section class="section3">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="终止申请信息" name="0"></el-tab-pane>
         <el-tab-pane label="项目基本信息" name="1"></el-tab-pane>
       </el-tabs>
@@ -311,6 +311,7 @@ export default {
     }
   }
   .section3 {
+    border: 1px solid #DCDFE6;
     margin-top: 40px;
   }
   .approveBtn {