Sfoglia il codice sorgente

项目样式调整示例

sunny 1 settimana fa
parent
commit
306a700b57

+ 0 - 3
ruoyi-ui/src/App.vue

@@ -32,7 +32,4 @@ export default {
 #app .theme-picker {
   display: none;
 }
-::v-deep .el-tabs--border-card{
-  box-shadow:none;
-}
 </style>

+ 3 - 3
ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -76,8 +76,8 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
-      height: 32px;
+      width: 28px;
+      height: 28px;
       vertical-align: middle;
       margin-right: 12px;
     }
@@ -88,7 +88,7 @@ export default {
       color: #fff;
       font-weight: 600;
       line-height: 50px;
-      font-size: 14px;
+      font-size: 13px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       vertical-align: middle;
     }

+ 8 - 0
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue

@@ -124,4 +124,12 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+::v-deep .el-submenu__title{
+  font-size: 13px;
+}
+::v-deep .el-dropdown-menu__item, .el-menu-item {
+    font-size: 13px;
+}
+</style>
 

+ 201 - 271
ruoyi-ui/src/views/project/investOpp/myTask.vue

@@ -1,127 +1,104 @@
 <template>
-<!--  <div class="app-container">-->
+  <!--  <div class="app-container">-->
   <div>
     <el-card shadow="hover">
       <!-- 查询表单区域 -->
       <el-form :model="queryParams" ref="queryForm" inline label-position="top">
-        <el-form-item label="项目名称" prop="projectName">
-          <el-input
-            v-model.trim="queryParams.projectName"
-            placeholder="请输入项目名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="项目负责人" prop="investHead">
-          <el-input
-            v-model.trim="queryParams.investHead"
-            placeholder="请输入项目负责人"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="公司联系人" prop="projectContacts">
-          <el-input
-            v-model.trim="queryParams.projectContacts"
-            placeholder="请输入公司联系人"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="渠道" prop="channel">
-          <el-select v-model="queryParams.channel" placeholder="全部" clearable>
-            <el-option
-              v-for="item in channelList"
-              :key="item.id"
-              :label="item.channelName"
-              :value="item.id"
-            />
-            <el-option label="无" value="-1" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所属组别" prop="projectGroup">
-          <el-select
-            v-model="queryParams.projectGroup"
-            placeholder="全部"
-            clearable
-          >
-            <el-option
-              v-for="dict in dict.type.project_group"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="项目名称" prop="projectName">
+              <el-input v-model.trim="queryParams.projectName" placeholder="请输入项目名称" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目负责人" prop="investHead">
+              <el-input v-model.trim="queryParams.investHead" placeholder="请输入项目负责人" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="公司联系人" prop="projectContacts">
+              <el-input v-model.trim="queryParams.projectContacts" placeholder="请输入公司联系人" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="渠道" prop="channel">
+              <el-select v-model="queryParams.channel" placeholder="全部" clearable style="width: 100%;">
+                <el-option v-for="item in channelList" :key="item.id" :label="item.channelName" :value="item.id" />
+                <el-option label="无" value="-1" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-        <el-form-item label="项目公司" prop="company">
-          <el-input
-            v-model.trim="queryParams.company"
-            placeholder="请输入项目所属公司"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="所属组别" prop="projectGroup">
+              <el-select v-model="queryParams.projectGroup" placeholder="全部" clearable style="width: 100%;">
+                <el-option v-for="dict in dict.type.project_group" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目公司" prop="company">
+              <el-input v-model.trim="queryParams.company" placeholder="请输入项目所属公司" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"></el-col>
+          <el-col :span="6"></el-col>
+        </el-row>
         <!-- 可继续扩展其他查询表单项目,比如项目编号、负责人等 -->
-        <el-form-item label="搜索">
-          <el-button style="width: 217px;" type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        </el-form-item>
-         <el-form-item label="重置">
-          <el-button style="width: 217px;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-         <el-form-item label="导出">
-          <el-button style="width: 217px;" type="warning" plain icon="el-icon-download" @click="exportQuery">导出</el-button>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="搜索">
+              <el-button style="width: 100%;" type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重置">
+              <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="导出">
+              <el-button style="width: 100%;" type="warning" plain icon="el-icon-download"
+                @click="exportQuery">导出</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <!-- Tab 切换区域 -->
       <el-tabs v-model="activeTab" type="border-card" @tab-click="handleTabClick">
         <el-tab-pane label="待办任务" name="list1">
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myTaskList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myTaskList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                >
+                <div :title="scope.row.projectName">
                   {{ scope.row.projectName }}
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              label="公司名称"
-              align="center"
-              prop="tProjectCompany.companyName"
-            >
+            <el-table-column label="公司名称" align="center" prop="tProjectCompany.companyName">
               <template slot-scope="scope">
                 <div :title="scope.row.tProjectCompany.companyName">
                   {{ scope.row.tProjectCompany.companyName }}
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="所属行业" align="center" prop="industry"
-            ><template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.CUSTOMER_TRADE"
-                :value="scope.row.industry"
-              />
-            </template>
+            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
-<!--            <el-table-column label="项目阶段" align="center" prop="projectStage">
+            <!--            <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
                 <dict-tag
                   :options="dict.type.project_stage"
@@ -129,7 +106,7 @@
                 />
               </template>
             </el-table-column>-->
-<!--            <el-table-column
+            <!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -143,7 +120,7 @@
               </template>
             </el-table-column>-->
 
-<!--            <el-table-column
+            <!--            <el-table-column
               label="备案时间"
               align="center"
               prop="tProjectCompany.filingTime"
@@ -154,7 +131,7 @@
             }}</span>
               </template>
             </el-table-column>-->
-<!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+            <!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 &lt;!&ndash; 定义状态文本映射对象 &ndash;&gt;
                 <el-tag
@@ -180,18 +157,11 @@
               </template>
             </el-table-column>
             <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
-            <el-table-column
-              label="渠道"
-              align="center"
-              prop="tProjectChannel.channelName"
-            >
+            <el-table-column label="渠道" align="center" prop="tProjectChannel.channelName">
               <template slot-scope="scope">
-                <div
-                  v-if="
-              scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
-            "
-                  :title="scope.row.tProjectChannel.channelName"
-                >
+                <div v-if="
+                  scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
+                " :title="scope.row.tProjectChannel.channelName">
                   {{ scope.row.tProjectChannel.channelName }}
                 </div>
               </template>
@@ -211,7 +181,7 @@
                 </div>
               </template>
             </el-table-column>
-<!--            <el-table-column label="申请人" align="center" prop="startUserName">
+            <!--            <el-table-column label="申请人" align="center" prop="startUserName">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
@@ -225,15 +195,16 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div :title="scope.row.taskName"  class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -250,80 +221,56 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="90" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button v-if="scope.row.taskDefKey=='modifyApply'" type="text" @click="handleEdit(scope.row)">处理</el-button>
+                <el-button v-if="scope.row.taskDefKey == 'modifyApply'" type="text"
+                  @click="handleEdit(scope.row)">处理</el-button>
                 <template v-else>
-                <!-- 1. 签收按钮:无签收人时显示 -->
-                  <el-button v-if="!scope.row.assignee" type="primary" size="mini" @click="handleSign(scope.row)">签收</el-button>
+                  <!-- 1. 签收按钮:无签收人时显示 -->
+                  <el-button v-if="!scope.row.assignee" type="text" size="mini"
+                    @click="handleSign(scope.row)">签收</el-button>
                   <!-- 2. 处理按钮:有签收人时显示 -->
                   <el-button v-else size="mini" type="text" @click="handleProcess(scope.row)">处理</el-button>
-                <!-- 3. 撤回按钮:需补充逻辑(比如仅未签收可撤回,可结合 signPerson 判断) -->
-<!--                <el-button v-if="!scope.row.assignee" size="mini" type="text" icon="el-icon-refresh-right" @click="handleWithdraw(scope.row)">撤回</el-button>-->
-                <!-- 4. 详情按钮:一直显示 -->
+                  <!-- 3. 撤回按钮:需补充逻辑(比如仅未签收可撤回,可结合 signPerson 判断) -->
+                  <!--                <el-button v-if="!scope.row.assignee" size="mini" type="text" icon="el-icon-refresh-right" @click="handleWithdraw(scope.row)">撤回</el-button>-->
+                  <!-- 4. 详情按钮:一直显示 -->
 
                 </template>
-                <el-button type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
 
           <!-- 分页 -->
-          <pagination
-            v-show="myTaskTotal > 0"
-            :total="myTaskTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyTaskList"
-          />
+          <pagination v-show="myTaskTotal > 0" :total="myTaskTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyTaskList" />
         </el-tab-pane>
 
         <el-tab-pane label="已办任务" name="list2">
           <!-- 我的单据表格 -->
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myDoneTaskList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myDoneTaskList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                >
+                <div :title="scope.row.projectName">
                   {{ scope.row.projectName }}
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              label="公司名称"
-              align="center"
-              prop="tProjectCompany.companyName"
-            >
+            <el-table-column label="公司名称" align="center" prop="tProjectCompany.companyName">
               <template slot-scope="scope">
                 <div :title="scope.row.tProjectCompany.companyName">
                   {{ scope.row.tProjectCompany.companyName }}
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="所属行业" align="center" prop="industry"
-            ><template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.CUSTOMER_TRADE"
-                :value="scope.row.industry"
-              />
-            </template>
+            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
-<!--            <el-table-column label="项目阶段" align="center" prop="projectStage">
+            <!--            <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
                 <dict-tag
                   :options="dict.type.project_stage"
@@ -331,7 +278,7 @@
                 />
               </template>
             </el-table-column>-->
-<!--            <el-table-column
+            <!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -344,7 +291,7 @@
                 />
               </template>
             </el-table-column>-->
-<!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+            <!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 &lt;!&ndash; 定义状态文本映射对象 &ndash;&gt;
                 <el-tag
@@ -362,7 +309,7 @@
                 </el-tag>
               </template>
             </el-table-column>-->
-<!--            <el-table-column
+            <!--            <el-table-column
               label="备案时间"
               align="center"
               prop="tProjectCompany.filingTime"
@@ -380,18 +327,11 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              label="渠道"
-              align="center"
-              prop="tProjectChannel.channelName"
-            >
+            <el-table-column label="渠道" align="center" prop="tProjectChannel.channelName">
               <template slot-scope="scope">
-                <div
-                  v-if="
-              scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
-            "
-                  :title="scope.row.tProjectChannel.channelName"
-                >
+                <div v-if="
+                  scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
+                " :title="scope.row.tProjectChannel.channelName">
                   {{ scope.row.tProjectChannel.channelName }}
                 </div>
               </template>
@@ -418,18 +358,20 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div  v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"  :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"
+                  :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
                 <div v-else :title="scope.row.taskName">
-                  {{ scope.row.taskName}}
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -446,67 +388,41 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
           <!-- 分页 -->
-          <pagination
-            v-show="myDoneTaskTotal > 0"
-            :total="myDoneTaskTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyDoneTaskList"
-          />
+          <pagination v-show="myDoneTaskTotal > 0" :total="myDoneTaskTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyDoneTaskList" />
         </el-tab-pane>
         <el-tab-pane label="我的单据" name="list3">
           <!-- 我的单据表格 -->
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                >
+                <div :title="scope.row.projectName">
                   {{ scope.row.projectName }}
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              label="公司名称"
-              align="center"
-              prop="tProjectCompany.companyName"
-            >
+            <el-table-column label="公司名称" align="center" prop="tProjectCompany.companyName">
               <template slot-scope="scope">
                 <div :title="scope.row.tProjectCompany.companyName">
                   {{ scope.row.tProjectCompany.companyName }}
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="所属行业" align="center" prop="industry"
-            ><template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.CUSTOMER_TRADE"
-                :value="scope.row.industry"
-              />
-            </template>
+            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
-<!--            <el-table-column label="项目阶段" align="center" prop="projectStage">
+            <!--            <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
                 <dict-tag
                   :options="dict.type.project_stage"
@@ -514,7 +430,7 @@
                 />
               </template>
             </el-table-column>-->
-<!--            <el-table-column
+            <!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -527,7 +443,7 @@
                 />
               </template>
             </el-table-column>-->
-<!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+            <!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 &lt;!&ndash; 定义状态文本映射对象 &ndash;&gt;
                 <el-tag
@@ -545,7 +461,7 @@
                 </el-tag>
               </template>
             </el-table-column>-->
-<!--            <el-table-column
+            <!--            <el-table-column
               label="备案时间"
               align="center"
               prop="tProjectCompany.filingTime"
@@ -563,18 +479,11 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              label="渠道"
-              align="center"
-              prop="tProjectChannel.channelName"
-            >
+            <el-table-column label="渠道" align="center" prop="tProjectChannel.channelName">
               <template slot-scope="scope">
-                <div
-                  v-if="
-              scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
-            "
-                  :title="scope.row.tProjectChannel.channelName"
-                >
+                <div v-if="
+                  scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
+                " :title="scope.row.tProjectChannel.channelName">
                   {{ scope.row.tProjectChannel.channelName }}
                 </div>
               </template>
@@ -601,15 +510,16 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -626,34 +536,29 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
           <!-- 分页 -->
-          <pagination
-            v-show="myTotal > 0"
-            :total="myTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyList"
-          />
+          <pagination v-show="myTotal > 0" :total="myTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyList" />
         </el-tab-pane>
       </el-tabs>
     </el-card>
-  <!-- Flowable 流程图弹窗 -->
-  <!-- 流程图 -->
+    <!-- Flowable 流程图弹窗 -->
+    <!-- 流程图 -->
 
-  <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%"  append-to-body>
-    <!-- <el-image :src="readImage.src"></el-image> -->
-    <flow :flowData="flowData"/>
-  </el-dialog>
+    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body>
+      <!-- <el-image :src="readImage.src"></el-image> -->
+      <flow :flowData="flowData" />
+    </el-dialog>
 
   </div>
 </template>
 
 <script>
-import { getMyTaskList,getMyDoneTaskList,getMyList } from "@/api/project/investOpp/pool";
+import { getMyTaskList, getMyDoneTaskList, getMyList } from "@/api/project/investOpp/pool";
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { listChannel } from "@/api/invest/channel";
 import dueDiligenceList from "../../invest/components/dueDiligenceList.vue";
@@ -675,7 +580,7 @@ export default {
   data() {
     return {
       // 当前激活的 Tab
-      activeTab:"list1",
+      activeTab: "list1",
       // 遮罩层
       loading: false,
       // 查询参数
@@ -721,7 +626,7 @@ export default {
       myTotal: 0,
       channelList: [], //渠道
       //流程图信息
-      readImage:{
+      readImage: {
         open: false,
         src: "",
       },
@@ -876,10 +781,10 @@ export default {
       this.$refs.dataTable.toggleRowSelection(row);
     },
     // 跳转到处理页面(暂存节点页面)
-    handleEdit(row){
+    handleEdit(row) {
       const id = row.id || this.ids;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/project/investOpp/edit", query: { id: id , pInstId: pInstId} });
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/project/investOpp/edit", query: { id: id, pInstId: pInstId } });
     },
     // 签收操作
     handleSign(row) {
@@ -888,7 +793,7 @@ export default {
       this.$message.success('签收成功');
     },
     // 跳转到处理页面
-    handleProcess(row){
+    handleProcess(row) {
       /*this.$router.push({ path: '/flowable/task/todo/detail/index',
         query: {
           procInsId: row.procInsId,
@@ -899,8 +804,8 @@ export default {
           startUser: row.startUserName + '-' + row.startDeptName,
         }})*/
       const id = row.id || this.ids;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/project/investOpp/audit", query: { id:id , pInstId: pInstId } });
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/project/investOpp/audit", query: { id: id, pInstId: pInstId } });
 
     },
     // 撤回操作
@@ -917,8 +822,8 @@ export default {
     /*详情*/
     handleDetail(row) {
       const id = row.id || this.ids;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/project/investOpp/detail", query: { id: id , pInstId: pInstId } });
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/project/investOpp/detail", query: { id: id, pInstId: pInstId } });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -938,14 +843,14 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 流程图查看 */
-    handleReadImage(row){
+    handleReadImage(row) {
       this.readImage.title = "流程图";
       this.readImage.open = true;
       // this.readImage.src = process.env.VUE_APP_BASE_API + "/flowable/definition/readImage/" + deploymentId;
-      flowXmlAndNode({procInsId: row.procInstId,deployId:row.deployId}).then(res => {
+      flowXmlAndNode({ procInsId: row.procInstId, deployId: row.deployId }).then(res => {
         this.flowData = res.data;
       })
     },
@@ -954,15 +859,43 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep .el-form-item{
-  margin-right: 35px;
+
+::v-deep .el-card__body{
+  background-color: #f3f3f4;
+}
+
+::v-deep .el-form-item {
+  width: 100%;
+  margin-right: 0px;
+  margin-bottom: 10px;
+}
+
+::v-deep .el-form--label-top{
+  background-color: #fff;
+  padding: 10px;
+  margin-bottom: 15px;
 }
-::v-deep .el-form--label-top .el-form-item__label{
+::v-deep .el-form--label-top .el-form-item__label {
   padding: 0;
+  line-height: 26px;
+}
+
+
+::v-deep .el-tabs--border-card{
+  border:none;
+  box-shadow:none;
+}
+::v-deep .el-tabs--border-card>.el-tabs__header{
+  background-color: #f3f3f4;
 }
+::v-deep .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active {
+  border-radius: 4px 4px 0 0;
+}
+
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -979,12 +912,9 @@ export default {
     -webkit-box-orient: vertical;
   }
 }
+
 /**找到表头那一行,然后把里面的复选框隐藏掉**/
-.hideHeaderCheckBox
-::v-deep
-.el-table__header-wrapper
-.el-table__header
-.el-checkbox {
+.hideHeaderCheckBox::v-deep .el-table__header-wrapper .el-table__header .el-checkbox {
   display: none;
 }
 </style>

+ 1 - 1
ruoyi-ui/src/views/project/listStage/listInvestOpp.vue

@@ -331,7 +331,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 项目池表格数据

+ 65 - 38
ruoyi-ui/src/views/project/listStage/listPool.vue

@@ -4,21 +4,13 @@
       v-if="type !== '2'"
       :model="queryParams"
       ref="queryForm"
-      size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="90px"
-      style="margin-left: -22px"
+      label-position="top"
     >
-      <el-form-item label="项目名称" prop="projectName">
-        <el-input
-          v-model.trim="queryParams.projectName"
-          placeholder="请输入项目名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目负责人" prop="investHead">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="项目负责人" prop="investHead">
         <el-input
           v-model.trim="queryParams.investHead"
           placeholder="请输入项目负责人"
@@ -26,7 +18,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="公司联系人" prop="projectContacts">
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="公司联系人" prop="projectContacts">
         <el-input
           v-model.trim="queryParams.projectContacts"
           placeholder="请输入公司联系人"
@@ -34,8 +28,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="渠道" prop="channel">
-        <el-select v-model="queryParams.channel" placeholder="全部" clearable>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="渠道" prop="channel">
+        <el-select v-model="queryParams.channel" placeholder="全部" clearable style="width: 100%;">
           <el-option
             v-for="item in channelList"
             :key="item.id"
@@ -45,11 +41,14 @@
           <el-option label="无" value="-1" />
         </el-select>
       </el-form-item>
-      <el-form-item label="所属组别" prop="projectGroup">
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="所属组别" prop="projectGroup">
         <el-select
           v-model="queryParams.projectGroup"
           placeholder="全部"
           clearable
+          style="width: 100%;"
         >
           <el-option
             v-for="dict in dict.type.project_group"
@@ -59,8 +58,12 @@
           />
         </el-select>
       </el-form-item>
+        </el-col>
+      </el-row>
 
-      <el-form-item label="项目公司" prop="company">
+      <el-row :gutter="20">
+        <el-col :span="6">
+           <el-form-item label="项目公司" prop="company">
         <el-input
           v-model.trim="queryParams.company"
           placeholder="请输入项目所属公司"
@@ -68,27 +71,32 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="项目机会状态" prop="projectStatus">
+        </el-col>
+        <el-col :span="6">
+           <el-form-item label="项目机会状态" prop="projectStatus">
         <!-- el-select 绑定表单字段 -->
-        <el-select v-model="queryParams.projectStatus" placeholder="请选择" clearable>
+        <el-select v-model="queryParams.projectStatus" placeholder="请选择" clearable style="width: 100%;">
           <!-- 静态选项 -->
           <el-option label="正常" value="0"></el-option>
           <el-option label="终止" value="1"></el-option>
           <el-option label="观望" value="2"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item class="searchWrapper">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-        >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-        >重置</el-button
-        >
-      </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="搜索">
+              <el-button style="width: 100%;" type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="重置">
+              <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <el-row
@@ -99,9 +107,8 @@
       <el-col :span="1.5">
         <el-button
           :disabled="multiple"
-          plain
-          type="success"
-          size="mini"
+          type="primary"
+          size="small"
           icon="el-icon-edit"
           @click="handleSelectData(14)"
         >编辑</el-button
@@ -110,9 +117,8 @@
       <el-col :span="1.5">
         <el-button
           type="warning"
-          plain
           icon="el-icon-download"
-          size="mini"
+          size="small"
           @click="handleExport"
         >导出</el-button
         >
@@ -122,7 +128,9 @@
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
-    <el-table
+    <div style="padding: 15px;background-color: #fff;">
+      <el-table
+    height="450"
       ref="dataTable"
       @row-click="clickRow"
       class="tableWrapper"
@@ -290,6 +298,8 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+    </div>
+    
     <!-- 设置项目状态对话框 -->
     <businessUpdate @getList="getList" ref="businessUpdate"></businessUpdate>
 
@@ -340,7 +350,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 项目池表格数据
@@ -549,6 +559,23 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.app-container{
+  background-color: #f3f3f4;
+}
+::v-deep .el-form--label-top{
+  background-color: #fff;
+  padding: 10px;
+  margin-bottom: 15px;
+}
+::v-deep .el-form--label-top .el-form-item__label {
+  padding: 0;
+  line-height: 26px;
+}
+::v-deep .el-form-item {
+  width: 100%;
+  margin-right: 0px;
+  margin-bottom: 10px;
+}
 .tableWrapper {
   font-size: 12px;
   color: #000;