申请信息列表查询样式修改

ruoyi-ui/src/App.vue

@@ -32,4 +32,43 @@ export default {
 #app .theme-picker {
   display: none;
 }
+
+::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 {
+  padding: 0;
+  line-height: 26px;
+}
+
+
+::v-deep .el-card__body{
+  background-color: #f3f3f4;
+}
+::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;
+}
+</style>
+<style>
+.app-container {
+  background-color: #f3f3f4;
+}
+.border-card {
+  padding: 15px;background-color: #fff;
+}
 </style>

ruoyi-ui/src/views/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container home">
+  <div class="home">
     <!-- <el-divider /> -->
     <el-row :gutter="20">
       <el-col :xs="24" :sm="24" :md="12" :lg="8">
@@ -45,6 +45,7 @@ export default {
 
 <style scoped lang="scss">
 .home {
+  padding: 20px;
   blockquote {
     padding: 10px 20px;
     margin: 0 0 20px;

ruoyi-ui/src/views/invest/components/followList.vue

@@ -82,7 +82,7 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <div style="padding: 15px;background-color: #fff;">
+    <div class="border-card">
        <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-if="type !== '3'" v-loading="loading" border
       :data="recordList" @selection-change="handleSelectionChange">
       <el-table-column v-if="type === '1'" type="selection" width="55" align="center" />
@@ -628,24 +628,5 @@ 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;
-}
 </style>

ruoyi-ui/src/views/project/approval/myTask.vue

@@ -3,7 +3,7 @@
   <div>
     <el-card shadow="hover">
       <!-- 查询表单区域 -->
-      <el-form :model="queryParams" ref="queryForm" inline label-position="top">
+      <el-form :model="queryParams" ref="queryForm" size="small" inline label-position="top">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="项目名称" prop="projectName">
@@ -806,41 +806,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::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 {
-  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;

ruoyi-ui/src/views/project/approval/processList.vue

@@ -1,107 +1,78 @@
 <template>
   <div class="app-container">
     <!-- 项目立项 -->
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="90px"
-      style="margin-left: -22px"
-    >
-      <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="projectOverview">
-        <el-input
-          v-model.trim="queryParams.projectOverview"
-          placeholder="请输入项目概况"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目亮点" prop="projectSparkle">
-        <el-input
-          v-model.trim="queryParams.projectSparkle"
-          placeholder="请输入项目亮点"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="流程状态" prop="status">
-        <!-- el-select 绑定表单字段 -->
-        <el-select v-model="queryParams.status" placeholder="请选择" clearable>
-          <!-- 静态选项 -->
-          <el-option label="暂存" value="0"></el-option>
-          <el-option label="已提交" value="1"></el-option>
-          <el-option label="审批中" value="2"></el-option>
-          <el-option label="审核完成" value="3"></el-option>
-          <el-option label="关闭" value="4"></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-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px"
+      label-position="top">
+      <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="projectOverview">
+            <el-input v-model.trim="queryParams.projectOverview" placeholder="请输入项目概况" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="项目亮点" prop="projectSparkle">
+            <el-input v-model.trim="queryParams.projectSparkle" placeholder="请输入项目亮点" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="流程状态" prop="status">
+            <!-- el-select 绑定表单字段 -->
+            <el-select v-model="queryParams.status" 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-option label="审核完成" value="3"></el-option>
+              <el-option label="关闭" value="4"></el-option>
+            </el-select>
+          </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 :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
+      <!--      <el-col :span="1.5">
         <el-button
-          plain
           type="warning"
-          size="mini"
+          size="small"
           icon="el-icon-document"
           @click="handleAdd"
           >立项申请</el-button
         >
       </el-col>-->
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
+        <el-button type="warning" icon="el-icon-download" size="small" @click="handleExport">导出</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-table
-      ref="dataTable"
-      @row-click="clickRow"
-      class="tableWrapper"
-      v-loading="loading"
-      border
-      :data="poolList"
-      @selection-change="handleSelectionChange"
-    >
+    <div class="border-card">
+      <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border :data="poolList"
+      @selection-change="handleSelectionChange">
       <!-- <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 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">
+      <!--      <el-table-column label="项目名称" align="center" prop="projectName">
         <template slot-scope="scope">
           <div
             :title="scope.row.projectName"
@@ -111,7 +82,7 @@
             {{ scope.row.projectName }}
           </div>
         </template>
-      </el-table-column-->>
+</el-table-column-->>
       <el-table-column label="项目名称" align="center" prop="projectName">
         <template slot-scope="scope">
           <div :title="scope.row.projectName">
@@ -120,41 +91,32 @@
         </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"
-          />
+      <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">
         <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.project_stage"
-            :value="scope.row.projectStage"
-          />
+          <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
         </template>
       </el-table-column>
       <el-table-column label="项目机会状态" align="center" prop="projectStatus">
         <template slot-scope="scope">
           <!-- 定义状态文本映射对象 -->
-          <el-tag
-            :type="{
-              0: 'success',
-              1: 'danger',
-              2: 'warning'
-            }[scope.row.projectStatus] || 'info'"
-          >
+          <el-tag :type="{
+            0: 'success',
+            1: 'danger',
+            2: 'warning'
+          }[scope.row.projectStatus] || 'info'">
             {{ {
-            0: '正常',
-            1: '终止',
-            2: '观望'
-          }[scope.row.projectStatus] || '未知状态' }}
+              0: '正常',
+              1: '终止',
+              2: '观望'
+            }[scope.row.projectStatus] || '未知状态' }}
           </el-tag>
         </template>
       </el-table-column>
-<!--      <el-table-column
+      <!--      <el-table-column
         label="已发起立项申请"
         align="center"
         prop="approvalFlag"
@@ -187,12 +149,7 @@
         </template>
       </el-table-column>
       <!-- delFlag -->
-      <el-table-column
-        label="状态"
-        align="center"
-        prop="investHead"
-        width="50px"
-      >
+      <el-table-column label="状态" align="center" prop="investHead" width="50px">
         <template slot-scope="scope">
           <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
             {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
@@ -213,18 +170,19 @@
       </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>
@@ -246,25 +204,17 @@
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+    </div>
+    
     <!-- 会议管理组件 -->
-    <meetingList
-      :type="'3'"
-      ref="meetingList"
-      :projectId="projectId"
-      @getList="getList"
-    ></meetingList>
+    <meetingList :type="'3'" ref="meetingList" :projectId="projectId" @getList="getList"></meetingList>
     <!-- 设置项目状态对话框 -->
     <businessUpdate @getList="getList" ref="businessUpdate"></businessUpdate>
     <!-- Flowable 流程图弹窗 -->
-    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%"  append-to-body>
-      <flow :flowData="flowData"/>
+    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body>
+      <flow :flowData="flowData" />
     </el-dialog>
   </div>
 </template>
@@ -298,7 +248,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 项目池表格数据
@@ -337,7 +287,7 @@ export default {
       channelList: [],
       projectId: "",
       //流程图信息
-      readImage:{
+      readImage: {
         open: false,
         src: "",
       },
@@ -525,7 +475,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -538,20 +488,20 @@ export default {
       );
     },
     /** 流程图查看 */
-    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;
       })
     },
     /*流程详情*/
     handleDetailProcess(row) {
       const id = row.id || this.ids;
-      const poolId=row.projectPoolId;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/project/approval/detail", query: { id: poolId , pInstId: pInstId } });
+      const poolId = row.projectPoolId;
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/myTask/project/approval/detail", query: { id: poolId, pInstId: pInstId } });
     },
   },
 };
@@ -560,6 +510,7 @@ export default {
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -576,6 +527,7 @@ export default {
     -webkit-box-orient: vertical;
   }
 }
+
 /**找到表头那一行，然后把里面的复选框隐藏掉**/
 .tableWrapper::v-deep .el-table__header-wrapper .el-table__header .el-checkbox {
   display: none;

ruoyi-ui/src/views/project/decision/myTask.vue

@@ -3,7 +3,7 @@
   <div>
     <el-card shadow="hover">
       <!-- 查询表单区域 -->
-      <el-form :model="queryParams" ref="queryForm" inline label-position="top">
+      <el-form :model="queryParams" ref="queryForm" size="small" inline label-position="top">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="项目名称" prop="projectName">
@@ -771,41 +771,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::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 {
-  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;

ruoyi-ui/src/views/project/decision/processList.vue

@@ -1,99 +1,78 @@
 <template>
   <div class="app-container">
     <!-- 项目投决 -->
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="90px"
-      style="margin-left: -22px"
-    >
-      <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="provision">
-        <el-input
-          v-model.trim="queryParams.provision"
-          placeholder="请输入股权/其他合作商务条款"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="流程状态" prop="status">
-        <!-- el-select 绑定表单字段 -->
-        <el-select v-model="queryParams.status" placeholder="请选择" clearable>
-          <!-- 静态选项 -->
-          <el-option label="暂存" value="0"></el-option>
-          <el-option label="已提交" value="1"></el-option>
-          <el-option label="审批中" value="2"></el-option>
-          <el-option label="审核完成" value="3"></el-option>
-          <el-option label="关闭" value="4"></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-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px"
+      label-position="top">
+      <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="provision">
+            <el-input v-model.trim="queryParams.provision" placeholder="请输入股权/其他合作商务条款" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="流程状态" prop="status">
+            <!-- el-select 绑定表单字段 -->
+            <el-select v-model="queryParams.status" 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-option label="审核完成" value="3"></el-option>
+              <el-option label="关闭" value="4"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+
+        </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 :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
+      <!--      <el-col :span="1.5">
         <el-button
-          plain
           type="warning"
-          size="mini"
+          size="small"
           icon="el-icon-document"
           @click="handleAdd"
           >投决申请</el-button
         >
       </el-col>-->
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-table
-      ref="dataTable"
-      @row-click="clickRow"
-      class="tableWrapper"
-      v-loading="loading"
-      border
-      :data="poolList"
-      @selection-change="handleSelectionChange"
-    >
-      <!-- <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">
+    <div class="border-card">
+      <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+        :data="poolList" @selection-change="handleSelectionChange">
+        <!-- <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">
         <template slot-scope="scope">
           <div
             :title="scope.row.projectName"
@@ -103,31 +82,24 @@
             {{ scope.row.projectName }}
           </div>
         </template>
-      </el-table-column>-->
-      <el-table-column label="项目名称" align="center" prop="projectName">
-        <template slot-scope="scope">
-          <div :title="scope.row.projectName">
-            {{ scope.row.projectName }}
-          </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>
-      <el-table-column label="项目阶段" align="center" prop="projectStage">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.project_stage"
-            :value="scope.row.projectStage"
-          />
-        </template>
-      </el-table-column>
-<!--      <el-table-column
+</el-table-column>-->
+        <el-table-column label="项目名称" align="center" prop="projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.projectName">
+              {{ scope.row.projectName }}
+            </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>
+        <el-table-column label="项目阶段" align="center" prop="projectStage">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
+          </template>
+        </el-table-column>
+        <!--      <el-table-column
         label="项目状态"
         align="center"
         prop="projectState"
@@ -140,25 +112,23 @@
           />
         </template>
       </el-table-column>-->
-      <el-table-column label="项目机会状态" align="center" prop="projectStatus">
-        <template slot-scope="scope">
-          <!-- 定义状态文本映射对象 -->
-          <el-tag
-            :type="{
+        <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+          <template slot-scope="scope">
+            <!-- 定义状态文本映射对象 -->
+            <el-tag :type="{
               0: 'success',
               1: 'danger',
               2: 'warning'
-            }[scope.row.projectStatus] || 'info'"
-          >
-            {{ {
-            0: '正常',
-            1: '终止',
-            2: '观望'
-          }[scope.row.projectStatus] || '未知状态' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-<!--      <el-table-column
+            }[scope.row.projectStatus] || 'info'">
+              {{ {
+                0: '正常',
+                1: '终止',
+                2: '观望'
+              }[scope.row.projectStatus] || '未知状态' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <!--      <el-table-column
         label="已发起投决申请"
         align="center"
         prop="decisionFlag"
@@ -170,97 +140,84 @@
         </template>
       </el-table-column>-->
 
-      <el-table-column label="项目负责人" align="center" prop="investHead">
-        <template slot-scope="scope">
-          <div :title="scope.row.investHead">
-            {{ scope.row.investHead }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="股权/其他合作商务条款" align="center" prop="provision">
-        <template slot-scope="scope">
-          <div :title="scope.row.provision">
-            {{ scope.row.provision }}
-          </div>
-        </template>
-      </el-table-column>
-      <!-- delFlag -->
-      <el-table-column
-        label="状态"
-        align="center"
-        prop="investHead"
-        width="50px"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="申请人" align="center" prop="startUserName">
-        <template slot-scope="scope">
-          <div :title="scope.row.startUserName">
-            {{ scope.row.startUserName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="申请日期" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </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>
-        </template>
-      </el-table-column>
-      <el-table-column label="当前处理人" align="center" prop="assigneeName">
-        <template slot-scope="scope">
-          <div :title="scope.row.assigneeName">
-            {{ scope.row.assigneeName}}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="流程状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <div :title="scope.row.status">
-            <span v-if="scope.row.status === 0">暂存</span>
-            <span v-else-if="scope.row.status === 1">已提交</span>
-            <span v-else-if="scope.row.status === 2">审批中</span>
-            <span v-else-if="scope.row.status === 3">审批完成</span>
-            <span v-else-if="scope.row.status === 4">关闭</span>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button type="text" size="mini" @click="handleDetailProcess(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column label="项目负责人" align="center" prop="investHead">
+          <template slot-scope="scope">
+            <div :title="scope.row.investHead">
+              {{ scope.row.investHead }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="股权/其他合作商务条款" align="center" prop="provision">
+          <template slot-scope="scope">
+            <div :title="scope.row.provision">
+              {{ scope.row.provision }}
+            </div>
+          </template>
+        </el-table-column>
+        <!-- delFlag -->
+        <el-table-column label="状态" align="center" prop="investHead" width="50px">
+          <template slot-scope="scope">
+            <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+              {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="申请人" align="center" prop="startUserName">
+          <template slot-scope="scope">
+            <div :title="scope.row.startUserName">
+              {{ scope.row.startUserName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="申请日期" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+          </template>
+        </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>
+          </template>
+        </el-table-column>
+        <el-table-column label="当前处理人" align="center" prop="assigneeName">
+          <template slot-scope="scope">
+            <div :title="scope.row.assigneeName">
+              {{ scope.row.assigneeName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="流程状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <div :title="scope.row.status">
+              <span v-if="scope.row.status === 0">暂存</span>
+              <span v-else-if="scope.row.status === 1">已提交</span>
+              <span v-else-if="scope.row.status === 2">审批中</span>
+              <span v-else-if="scope.row.status === 3">审批完成</span>
+              <span v-else-if="scope.row.status === 4">关闭</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="handleDetailProcess(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
     <!-- 会议管理组件 -->
-    <meetingList
-      :type="'3'"
-      ref="meetingList"
-      :projectId="projectId"
-      @getList="getList"
-    ></meetingList>
+    <meetingList :type="'3'" ref="meetingList" :projectId="projectId" @getList="getList"></meetingList>
     <!-- 设置项目状态对话框 -->
     <businessUpdate @getList="getList" ref="businessUpdate"></businessUpdate>
     <!-- Flowable 流程图弹窗 -->
-    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%"  append-to-body>
+    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body>
       <!-- <el-image :src="readImage.src"></el-image> -->
-      <flow :flowData="flowData"/>
+      <flow :flowData="flowData" />
     </el-dialog>
   </div>
 </template>
@@ -294,7 +251,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 项目池表格数据
@@ -333,7 +290,7 @@ export default {
       channelList: [],
       projectId: "",
       //流程图信息
-      readImage:{
+      readImage: {
         open: false,
         src: "",
       },
@@ -512,7 +469,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -525,20 +482,20 @@ export default {
       );
     },
     /** 流程图查看 */
-    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;
       })
     },
     /*流程详情*/
     handleDetailProcess(row) {
       const id = row.id || this.ids;
-      const poolId=row.projectPoolId;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/project/decision/detail", query: { id: poolId , pInstId: pInstId } });
+      const poolId = row.projectPoolId;
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/myTask/project/decision/detail", query: { id: poolId, pInstId: pInstId } });
     },
   },
 };
@@ -547,6 +504,7 @@ export default {
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -563,6 +521,7 @@ export default {
     -webkit-box-orient: vertical;
   }
 }
+
 /**找到表头那一行，然后把里面的复选框隐藏掉**/
 .tableWrapper::v-deep .el-table__header-wrapper .el-table__header .el-checkbox {
   display: none;

ruoyi-ui/src/views/project/investOpp/myTask copy.vue

@@ -56,61 +56,7 @@
        style="color:#1890ff" type="text" size="small"
        /myTask
         style="width: 100%;"
-       <div style="padding: 15px;background-color: #fff;">  </div>
+       <div class="border-card"></div>
     </el-card>
   </div>
 </template>
-.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;
-}
-<style lang="scss" scoped>
-
-::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 {
-  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;
-}
-</style>

ruoyi-ui/src/views/project/investOpp/myTask.vue

@@ -3,7 +3,7 @@
   <div>
     <el-card shadow="hover">
       <!-- 查询表单区域 -->
-      <el-form :model="queryParams" ref="queryForm" inline label-position="top">
+      <el-form :model="queryParams" ref="queryForm" size="small" inline label-position="top">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="项目名称" prop="projectName">
@@ -877,39 +877,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-
-::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 {
-  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;

ruoyi-ui/src/views/project/investOpp/processList.vue

@@ -1,143 +1,105 @@
 <template>
   <div class="app-container">
     <!-- 项目立项 -->
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="90px"
-      style="margin-left: -22px"
-    >
-      <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-option label="内部推荐" value="2" />
-<!--          <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-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px"
+      label-position="top">
+      <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-option label="内部推荐" value="2" />
+            </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-form-item label="流程状态" prop="status">
-        <!-- el-select 绑定表单字段 -->
-        <el-select v-model="queryParams.status" placeholder="请选择" clearable>
-          <!-- 静态选项 -->
-          <el-option label="暂存" value="0"></el-option>
-          <el-option label="已提交" value="1"></el-option>
-          <el-option label="审批中" value="2"></el-option>
-          <el-option label="审核完成" value="3"></el-option>
-          <el-option label="关闭" value="4"></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-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-form-item label="流程状态" prop="status">
+            <!-- el-select 绑定表单字段 -->
+            <el-select v-model="queryParams.status" 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-option label="审核完成" value="3"></el-option>
+              <el-option label="关闭" value="4"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6"></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 :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
+      <!--      <el-col :span="1.5">
         <el-button
-          plain
           type="warning"
-          size="mini"
+          size="small"
           icon="el-icon-document"
           @click="handleAdd"
           >项目机会申请</el-button
         >
       </el-col>-->
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
+        <el-button type="warning" icon="el-icon-download" size="small" @click="handleExport">导出</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-table
-      ref="dataTable"
-      @row-click="clickRow"
-      class="tableWrapper"
-      v-loading="loading"
-      border
-      :data="poolList"
-      @selection-change="handleSelectionChange"
-    >
-      <!-- <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">
+    <div class="border-card">
+      <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+        :data="poolList" @selection-change="handleSelectionChange">
+        <!-- <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">
         <template slot-scope="scope">
           <div
             :title="scope.row.projectName"
@@ -147,71 +109,54 @@
             {{ scope.row.projectName }}
           </div>
         </template>
-      </el-table-column>-->
-      <el-table-column label="项目名称" align="center" prop="projectName">
-        <template slot-scope="scope">
-          <div :title="scope.row.projectName">
-            {{ scope.row.projectName }}
-          </div>
-        </template>
-      </el-table-column>
-      <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="tProjectCompany.registeredAddress"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectCompany.registeredAddress">
-            {{ scope.row.tProjectCompany.registeredAddress }}
-          </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>
-      <el-table-column label="项目阶段" align="center" prop="projectStage">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.project_stage"
-            :value="scope.row.projectStage"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="项目机会状态" align="center" prop="projectStatus">
-        <template slot-scope="scope">
-          <!-- 定义状态文本映射对象 -->
-          <el-tag
-            :type="{
+</el-table-column>-->
+        <el-table-column label="项目名称" align="center" prop="projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.projectName">
+              {{ scope.row.projectName }}
+            </div>
+          </template>
+        </el-table-column>
+        <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="tProjectCompany.registeredAddress">
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectCompany.registeredAddress">
+              {{ scope.row.tProjectCompany.registeredAddress }}
+            </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>
+        <el-table-column label="项目阶段" align="center" prop="projectStage">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+          <template slot-scope="scope">
+            <!-- 定义状态文本映射对象 -->
+            <el-tag :type="{
               0: 'success',
               1: 'danger',
               2: 'warning'
-            }[scope.row.projectStatus] || 'info'"
-          >
-            {{ {
-            0: '正常',
-            1: '终止',
-            2: '观望'
-          }[scope.row.projectStatus] || '未知状态' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-<!--      <el-table-column
+            }[scope.row.projectStatus] || 'info'">
+              {{ {
+                0: '正常',
+                1: '终止',
+                2: '观望'
+              }[scope.row.projectStatus] || '未知状态' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <!--      <el-table-column
         label="项目状态"
         align="center"
         prop="projectState"
@@ -224,122 +169,99 @@
           />
         </template>
       </el-table-column>-->
-      <el-table-column
-        label="备案时间"
-        align="center"
-        prop="tProjectCompany.filingTime"
-      >
-        <template slot-scope="scope">
-          <span>{{
-            parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}")
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="项目负责人" align="center" prop="investHead">
-        <template slot-scope="scope">
-          <div :title="scope.row.investHead">
-            {{ scope.row.investHead }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="渠道"
-        align="center"
-        prop="tProjectChannel.channelName"
-      >
-        <template slot-scope="scope">
-          <div
-            v-if="
+        <el-table-column label="备案时间" align="center" prop="tProjectCompany.filingTime">
+          <template slot-scope="scope">
+            <span>{{
+              parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}")
+              }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目负责人" align="center" prop="investHead">
+          <template slot-scope="scope">
+            <div :title="scope.row.investHead">
+              {{ scope.row.investHead }}
+            </div>
+          </template>
+        </el-table-column>
+        <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"
-          >
-            {{ scope.row.tProjectChannel.channelName }}
-          </div>
-          <div v-else-if="scope.row.channel=='1'" >
-            直接触达
-          </div>
-          <div v-else="scope.row.channel=='2'" >
-            内部推荐
-          </div>
-        </template>
-      </el-table-column>
-      <!-- delFlag -->
-      <el-table-column
-        label="状态"
-        align="center"
-        prop="investHead"
-        width="50px"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="申请人" align="center" prop="startUserName">
-        <template slot-scope="scope">
-          <div :title="scope.row.startUserName">
-            {{ scope.row.startUserName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="申请日期" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </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>
-        </template>
-      </el-table-column>
-      <el-table-column label="当前处理人" align="center" prop="assigneeName">
-        <template slot-scope="scope">
-          <div :title="scope.row.assigneeName">
-            {{ scope.row.assigneeName}}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="流程状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <div :title="scope.row.status">
-            <span v-if="scope.row.status === 0">暂存</span>
-            <span v-else-if="scope.row.status === 1">已提交</span>
-            <span v-else-if="scope.row.status === 2">审批中</span>
-            <span v-else-if="scope.row.status === 3">审批完成</span>
-            <span v-else-if="scope.row.status === 4">关闭</span>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button style="color:#1890ff" type="text" size="small" @click="handleDetailProcess(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+            " :title="scope.row.tProjectChannel.channelName">
+              {{ scope.row.tProjectChannel.channelName }}
+            </div>
+            <div v-else-if="scope.row.channel == '1'">
+              直接触达
+            </div>
+            <div v-else="scope.row.channel=='2'">
+              内部推荐
+            </div>
+          </template>
+        </el-table-column>
+        <!-- delFlag -->
+        <el-table-column label="状态" align="center" prop="investHead" width="50px">
+          <template slot-scope="scope">
+            <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+              {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="申请人" align="center" prop="startUserName">
+          <template slot-scope="scope">
+            <div :title="scope.row.startUserName">
+              {{ scope.row.startUserName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="申请日期" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+          </template>
+        </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>
+          </template>
+        </el-table-column>
+        <el-table-column label="当前处理人" align="center" prop="assigneeName">
+          <template slot-scope="scope">
+            <div :title="scope.row.assigneeName">
+              {{ scope.row.assigneeName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="流程状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <div :title="scope.row.status">
+              <span v-if="scope.row.status === 0">暂存</span>
+              <span v-else-if="scope.row.status === 1">已提交</span>
+              <span v-else-if="scope.row.status === 2">审批中</span>
+              <span v-else-if="scope.row.status === 3">审批完成</span>
+              <span v-else-if="scope.row.status === 4">关闭</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button style="color:#1890ff" type="text" size="small"
+              @click="handleDetailProcess(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
     <!-- 会议管理组件 -->
-    <meetingList
-      :type="'3'"
-      ref="meetingList"
-      :projectId="projectId"
-      @getList="getList"
-    ></meetingList>
+    <meetingList :type="'3'" ref="meetingList" :projectId="projectId" @getList="getList"></meetingList>
     <!-- 设置项目状态对话框 -->
     <businessUpdate @getList="getList" ref="businessUpdate"></businessUpdate>
     <!-- Flowable 流程图弹窗 -->
-    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%"  append-to-body>
-      <flow :flowData="flowData"/>
+    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body>
+      <flow :flowData="flowData" />
     </el-dialog>
   </div>
 </template>
@@ -373,7 +295,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 项目池表格数据
@@ -408,12 +330,12 @@ export default {
         orderByColumn: "createTime",
         isAsc: "desc",
         createTime: null,
-        status:"",
+        status: "",
       },
       channelList: [],
       projectId: "",
       //流程图信息
-      readImage:{
+      readImage: {
         open: false,
         src: "",
       },
@@ -601,7 +523,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -614,27 +536,29 @@ export default {
       );
     },
     /** 流程图查看 */
-    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;
       })
     },
     /*流程详情*/
     handleDetailProcess(row) {
       const id = row.id || this.ids;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/myTask/project/investOpp/detail", query: { id: id , pInstId: pInstId } });
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/myTask/project/investOpp/detail", query: { id: id, pInstId: pInstId } });
     },
   },
 };
 </script>
 <style lang="scss" scoped>
+
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -651,6 +575,7 @@ export default {
     -webkit-box-orient: vertical;
   }
 }
+
 /**找到表头那一行，然后把里面的复选框隐藏掉**/
 .tableWrapper::v-deep .el-table__header-wrapper .el-table__header .el-checkbox {
   display: none;

ruoyi-ui/src/views/project/investigate/myTask.vue

@@ -3,7 +3,7 @@
   <div>
     <el-card shadow="hover">
       <!-- 查询表单区域 -->
-      <el-form :model="queryParams" ref="queryForm" inline label-position="top">
+      <el-form :model="queryParams" ref="queryForm" size="small" inline label-position="top">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="项目名称" prop="projectName">
@@ -756,41 +756,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::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 {
-  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;

ruoyi-ui/src/views/project/investigate/processList.vue

@@ -1,69 +1,62 @@
 <template>
   <div class="app-container">
     <!-- 尽职背调 -->
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="90px"
-      style="margin-left: -22px"
-    >
-      <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="investigateName">
-        <el-input
-          v-model.trim="queryParams.investigateName"
-          placeholder="请输入尽调名称"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="尽调地点" prop="investigatePlace">
-        <el-input
-          v-model.trim="queryParams.investigatePlace"
-          placeholder="请输入尽调地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="流程状态" prop="status">
-        <!-- el-select 绑定表单字段 -->
-        <el-select v-model="queryParams.status" placeholder="请选择" clearable>
-          <!-- 静态选项 -->
-          <el-option label="暂存" value="0"></el-option>
-          <el-option label="已提交" value="1"></el-option>
-          <el-option label="审批中" value="2"></el-option>
-          <el-option label="审核完成" value="3"></el-option>
-          <el-option label="关闭" value="4"></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-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px"
+      label-position="top">
+      <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="investigateName">
+            <el-input v-model.trim="queryParams.investigateName" placeholder="请输入尽调名称"
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="尽调地点" prop="investigatePlace">
+            <el-input v-model.trim="queryParams.investigatePlace" placeholder="请输入尽调地址" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="流程状态" prop="status">
+            <!-- el-select 绑定表单字段 -->
+            <el-select v-model="queryParams.status" 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-option label="审核完成" value="3"></el-option>
+              <el-option label="关闭" value="4"></el-option>
+            </el-select>
+          </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 :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
+      <!--      <el-col :span="1.5">
         <el-button
-          plain
           type="warning"
-          size="mini"
+          size="small"
           icon="el-icon-tickets"
           @click="handleAdd"
           v-hasPermi="['invest:pool:due']"
@@ -71,49 +64,22 @@
         >
       </el-col>-->
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
+        <el-button type="warning" icon="el-icon-download" size="small" @click="handleExport">导出</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          plain
-          type="warning"
-          size="mini"
-          icon="el-icon-tickets"
-          @click="chooseApprove"
-          v-hasPermi="['system:approve:add']"
-        >指定审批人</el-button
-        >
-<!--        <button @click="showDialog = true">指定审批人员</button>-->
+        <el-button type="warning" size="small" icon="el-icon-tickets" @click="chooseApprove"
+          v-hasPermi="['system:approve:add']">指定审批人</el-button>
+        <!--        <button @click="showDialog = true">指定审批人员</button>-->
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-table
-      ref="dataTable"
-      @row-click="clickRow"
-      class="tableWrapper"
-      v-loading="loading"
-      border
-      :data="poolList"
-      @selection-change="handleSelectionChange"
-    >
-      <!-- <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">
+    <div class="border-card">
+      <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+        :data="poolList" @selection-change="handleSelectionChange">
+        <!-- <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">
         <template slot-scope="scope">
           <div
             :title="scope.row.projectName"
@@ -123,49 +89,40 @@
             {{ scope.row.projectName }}
           </div>
         </template>
-      </el-table-column>-->
-      <el-table-column label="项目名称" align="center" prop="projectName">
-        <template slot-scope="scope">
-          <div :title="scope.row.projectName">
-            {{ scope.row.projectName }}
-          </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>
-      <el-table-column label="项目阶段" align="center" prop="projectStage">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.project_stage"
-            :value="scope.row.projectStage"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="项目机会状态" align="center" prop="projectStatus">
-        <template slot-scope="scope">
-          <!-- 定义状态文本映射对象 -->
-          <el-tag
-            :type="{
+</el-table-column>-->
+        <el-table-column label="项目名称" align="center" prop="projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.projectName">
+              {{ scope.row.projectName }}
+            </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>
+        <el-table-column label="项目阶段" align="center" prop="projectStage">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+          <template slot-scope="scope">
+            <!-- 定义状态文本映射对象 -->
+            <el-tag :type="{
               0: 'success',
               1: 'danger',
               2: 'warning'
-            }[scope.row.projectStatus] || 'info'"
-          >
-            {{ {
-            0: '正常',
-            1: '终止',
-            2: '观望'
-          }[scope.row.projectStatus] || '未知状态' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-<!--      <el-table-column
+            }[scope.row.projectStatus] || 'info'">
+              {{ {
+                0: '正常',
+                1: '终止',
+                2: '观望'
+              }[scope.row.projectStatus] || '未知状态' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <!--      <el-table-column
         label="已发起尽调申请"
         align="center"
         prop="investigateFlag"
@@ -176,112 +133,100 @@
           </div>
         </template>
       </el-table-column>-->
-      <!-- <el-table-column label="投决通过日期" align="center" prop="decisionDate">
+        <!-- <el-table-column label="投决通过日期" align="center" prop="decisionDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column> -->
 
-      <el-table-column label="项目负责人" align="center" prop="investHead">
-        <template slot-scope="scope">
-          <div :title="scope.row.investHead">
-            {{ scope.row.investHead }}
-          </div>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
-      <el-table-column label="尽调名称" align="center" prop="investigateName">
-        <template slot-scope="scope">
-          <div :title="scope.row.investigateName">
-            {{ scope.row.investigateName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="尽调地点" align="center" prop="investigatePlace">
-        <template slot-scope="scope">
-          <div :title="scope.row.investigatePlace">
-            {{ scope.row.investigatePlace }}
-          </div>
-        </template>
-      </el-table-column>
-      <!-- delFlag -->
-      <el-table-column
-        label="状态"
-        align="center"
-        prop="investHead"
-        width="50px"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="申请人" align="center" prop="startUserName">
-        <template slot-scope="scope">
-          <div :title="scope.row.startUserName">
-            {{ scope.row.startUserName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="申请日期" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </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>
-        </template>
-      </el-table-column>
-      <el-table-column label="当前处理人" align="center" prop="assigneeName">
-        <template slot-scope="scope">
-          <div :title="scope.row.assigneeName">
-            {{ scope.row.assigneeName}}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="流程状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <div :title="scope.row.status">
-            <span v-if="scope.row.status === 0">暂存</span>
-            <span v-else-if="scope.row.status === 1">已提交</span>
-            <span v-else-if="scope.row.status === 2">审批中</span>
-            <span v-else-if="scope.row.status === 3">审批完成</span>
-            <span v-else-if="scope.row.status === 4">关闭</span>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button type="text" size="mini" @click="handleDetailProcess(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column label="项目负责人" align="center" prop="investHead">
+          <template slot-scope="scope">
+            <div :title="scope.row.investHead">
+              {{ scope.row.investHead }}
+            </div>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
+        <el-table-column label="尽调名称" align="center" prop="investigateName">
+          <template slot-scope="scope">
+            <div :title="scope.row.investigateName">
+              {{ scope.row.investigateName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="尽调地点" align="center" prop="investigatePlace">
+          <template slot-scope="scope">
+            <div :title="scope.row.investigatePlace">
+              {{ scope.row.investigatePlace }}
+            </div>
+          </template>
+        </el-table-column>
+        <!-- delFlag -->
+        <el-table-column label="状态" align="center" prop="investHead" width="50px">
+          <template slot-scope="scope">
+            <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+              {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="申请人" align="center" prop="startUserName">
+          <template slot-scope="scope">
+            <div :title="scope.row.startUserName">
+              {{ scope.row.startUserName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="申请日期" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+          </template>
+        </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>
+          </template>
+        </el-table-column>
+        <el-table-column label="当前处理人" align="center" prop="assigneeName">
+          <template slot-scope="scope">
+            <div :title="scope.row.assigneeName">
+              {{ scope.row.assigneeName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="流程状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <div :title="scope.row.status">
+              <span v-if="scope.row.status === 0">暂存</span>
+              <span v-else-if="scope.row.status === 1">已提交</span>
+              <span v-else-if="scope.row.status === 2">审批中</span>
+              <span v-else-if="scope.row.status === 3">审批完成</span>
+              <span v-else-if="scope.row.status === 4">关闭</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="handleDetailProcess(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
     <!-- 尽调组件 -->
-    <dueDiligenceList
-      ref="dueDiligenceLists"
-      :projectId="projectId"
-      @getList="getList"
-    ></dueDiligenceList>
+    <dueDiligenceList ref="dueDiligenceLists" :projectId="projectId" @getList="getList"></dueDiligenceList>
     <!-- 设置项目状态对话框 -->
     <businessUpdate @getList="getList" ref="businessUpdate"></businessUpdate>
     <!-- 指定审批人院   -->
     <approveDialog @getList="getList" ref="setApproval"></approveDialog>
     <!-- Flowable 流程图弹窗 -->
-    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%"  append-to-body>
+    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body>
       <!-- <el-image :src="readImage.src"></el-image> -->
-      <flow :flowData="flowData"/>
+      <flow :flowData="flowData" />
     </el-dialog>
   </div>
 </template>
@@ -318,7 +263,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 项目池表格数据
@@ -356,7 +301,7 @@ export default {
       },
       channelList: [],
       //流程图信息
-      readImage:{
+      readImage: {
         open: false,
         src: "",
       },
@@ -541,7 +486,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -554,24 +499,24 @@ export default {
       );
     },
     /*指定审批人员*/
-    chooseApprove(){
+    chooseApprove() {
       this.$refs.setApproval.handleShowApplyPop();
     },
     /** 流程图查看 */
-    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;
       })
     },
     /*流程详情*/
     handleDetailProcess(row) {
       const id = row.id || this.ids;
-      const poolId=row.projectPoolId;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/project/investigate/detail", query: { id: poolId , pInstId: pInstId } });
+      const poolId = row.projectPoolId;
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/myTask/project/investigate/detail", query: { id: poolId, pInstId: pInstId } });
     },
   },
 };
@@ -580,6 +525,7 @@ export default {
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -596,8 +542,10 @@ export default {
     -webkit-box-orient: vertical;
   }
 }
+
 /**找到表头那一行，然后把里面的复选框隐藏掉**/
 .tableWrapper::v-deep .el-table__header-wrapper .el-table__header .el-checkbox {
   display: none;
 }
 </style>
+ 

ruoyi-ui/src/views/project/listStage/listApproval.vue

@@ -80,7 +80,7 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <div style="padding: 15px;background-color: #fff;">
+    <div class="border-card">
       <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border :data="poolList"
         @selection-change="handleSelectionChange">
         <!--      <el-table-column type="selection" width="40" align="center" />-->
@@ -453,26 +453,7 @@ 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;

ruoyi-ui/src/views/project/listStage/listDecision.vue

@@ -75,7 +75,7 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <div style="padding: 15px;background-color: #fff;">
+    <div class="border-card">
       <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
         :data="poolList" @selection-change="handleSelectionChange">
         <!--      <el-table-column type="selection" width="40" align="center" />-->
@@ -436,26 +436,7 @@ 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;

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

@@ -82,7 +82,7 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <div style="padding: 15px;background-color: #fff;">
+    <div class="border-card">
       <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper"
         :class="{ hideHeaderCheckBox: stage !== '0' }" v-loading="loading" border :data="poolList"
         @selection-change="handleSelectionChange">
@@ -442,26 +442,7 @@ 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;

ruoyi-ui/src/views/project/listStage/listInvestigate.vue

@@ -75,7 +75,7 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <div style="padding: 15px;background-color: #fff;">
+    <div class="border-card">
       <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
         :data="poolList" @selection-change="handleSelectionChange">
         <!--      <el-table-column type="selection" width="40" align="center" />-->
@@ -458,26 +458,7 @@ 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;

ruoyi-ui/src/views/project/listStage/listPool.vue

@@ -1,312 +1,202 @@
 <template>
   <div class="app-container">
-    <el-form
-      v-if="type !== '2'"
-      :model="queryParams"
-      ref="queryForm"
-      :inline="true"
-      v-show="showSearch"
-      label-position="top"
-    >
+    <el-form v-if="type !== '2'" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+      label-position="top">
       <el-row :gutter="20">
         <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-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-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-option label="内部推荐" value="2" />
-        </el-select>
-      </el-form-item>
+            <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-option label="内部推荐" value="2" />
+            </el-select>
+          </el-form-item>
         </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"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+            <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-row>
 
       <el-row :gutter="20">
         <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-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-form-item label="项目机会状态" prop="projectStatus">
-        <!-- el-select 绑定表单字段 -->
-        <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 label="项目机会状态" prop="projectStatus">
+            <!-- el-select 绑定表单字段 -->
+            <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-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-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-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
         </el-col>
       </el-row>
     </el-form>
 
-    <el-row
-      :gutter="10"
-      class="mb8"
-      v-if="type === '2' && stage == '4' ? false : true"
-    >
+    <el-row :gutter="10" class="mb8" v-if="type === '2' && stage == '4' ? false : true">
       <el-col :span="1.5">
-        <el-button
-          :disabled="multiple"
-          type="primary"
-          size="small"
-          icon="el-icon-edit"
-          @click="handleSelectData(14)"
-        >编辑</el-button
-        >
+        <el-button :disabled="multiple" type="primary" size="small" icon="el-icon-edit"
+          @click="handleSelectData(14)">编辑</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="small"
-          @click="handleExport"
-        >导出</el-button
-        >
+        <el-button type="warning" icon="el-icon-download" size="small" @click="handleExport">导出</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <div style="padding: 15px;background-color: #fff;">
-      <el-table
-    height="450"
-      ref="dataTable"
-      @row-click="clickRow"
-      class="tableWrapper"
-      :class="{ hideHeaderCheckBox: stage !== '0' }"
-      v-loading="loading"
-      border
-      :data="poolList"
-      @selection-change="handleSelectionChange"
-    >
-      <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">
-        <template slot-scope="scope">
-          <div
-            :title="scope.row.projectName"
-            class="public-text-blue public-cursor"
-            @click.stop="handleDetail(scope.row)"
-          >
-            {{ scope.row.projectName }}
-          </div>
-        </template>
-      </el-table-column>
-      <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="tProjectCompany.registeredAddress"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectCompany.registeredAddress">
-            {{ scope.row.tProjectCompany.registeredAddress }}
-          </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>
-      <el-table-column label="项目阶段" align="center" prop="projectStage">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.project_stage"
-            :value="scope.row.projectStage"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="项目机会状态" align="center" prop="projectStatus">
-        <template slot-scope="scope">
-          <!-- 定义状态文本映射对象 -->
-          <el-tag
-            :type="{
+    <div class="border-card">
+      <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper"
+        :class="{ hideHeaderCheckBox: stage !== '0' }" v-loading="loading" border :data="poolList"
+        @selection-change="handleSelectionChange">
+        <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">
+          <template slot-scope="scope">
+            <div :title="scope.row.projectName" class="public-text-blue public-cursor"
+              @click.stop="handleDetail(scope.row)">
+              {{ scope.row.projectName }}
+            </div>
+          </template>
+        </el-table-column>
+        <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="tProjectCompany.registeredAddress">
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectCompany.registeredAddress">
+              {{ scope.row.tProjectCompany.registeredAddress }}
+            </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>
+        <el-table-column label="项目阶段" align="center" prop="projectStage">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+          <template slot-scope="scope">
+            <!-- 定义状态文本映射对象 -->
+            <el-tag :type="{
               0: 'success',
               1: 'danger',
               2: 'warning'
-            }[scope.row.projectStatus] || 'info'"
-          >
-            {{ {
-            0: '正常',
-            1: '终止',
-            2: '观望'
-          }[scope.row.projectStatus] || '未知状态' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="备案时间"
-        align="center"
-        prop="tProjectCompany.filingTime"
-      >
-        <template slot-scope="scope">
-          <span>{{
+            }[scope.row.projectStatus] || 'info'">
+              {{ {
+                0: '正常',
+                1: '终止',
+                2: '观望'
+              }[scope.row.projectStatus] || '未知状态' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="备案时间" align="center" prop="tProjectCompany.filingTime">
+          <template slot-scope="scope">
+            <span>{{
               parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}")
             }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="立项通过日期"
-        align="center"
-        prop="projectDate"
-        v-if="stage !== '1'"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="投决通过日期"
-        align="center"
-        prop="decisionDate"
-        v-if="stage !== '1'"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
+          </template>
+        </el-table-column>
+        <el-table-column label="立项通过日期" align="center" prop="projectDate" v-if="stage !== '1'">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="投决通过日期" align="center" prop="decisionDate" v-if="stage !== '1'">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
 
-      <el-table-column label="项目负责人" align="center" prop="investHead">
-        <template slot-scope="scope">
-          <div :title="scope.row.investHead">
-            {{ scope.row.investHead }}
-          </div>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
-      <el-table-column
-        label="渠道"
-        align="center"
-        prop="tProjectChannel.channelName"
-      >
-        <template slot-scope="scope">
-          <div
-            v-if="
+        <el-table-column label="项目负责人" align="center" prop="investHead">
+          <template slot-scope="scope">
+            <div :title="scope.row.investHead">
+              {{ scope.row.investHead }}
+            </div>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
+        <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"
-          >
-            {{ scope.row.tProjectChannel.channelName }}
-          </div>
-          <div v-else-if="scope.row.channel=='1'" >
-            直接触达
-          </div>
-          <div v-else="scope.row.channel=='2'" >
-            内部推荐
-          </div>
-        </template>
-      </el-table-column>
-      <!-- delFlag -->
-      <el-table-column label="状态" align="center" prop="investHead">
-        <template slot-scope="scope">
-          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="项目机会流程状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <div :title="scope.row.status">
-            <span v-if="scope.row.status === 0">暂存</span>
-            <span v-else-if="scope.row.status === 1">已提交</span>
-            <span v-else-if="scope.row.status === 2">审批中</span>
-            <span v-else-if="scope.row.status === 3">审批完成</span>
-            <span v-else-if="scope.row.status === 4">关闭</span>
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+            " :title="scope.row.tProjectChannel.channelName">
+              {{ scope.row.tProjectChannel.channelName }}
+            </div>
+            <div v-else-if="scope.row.channel == '1'">
+              直接触达
+            </div>
+            <div v-else="scope.row.channel=='2'">
+              内部推荐
+            </div>
+          </template>
+        </el-table-column>
+        <!-- delFlag -->
+        <el-table-column label="状态" align="center" prop="investHead">
+          <template slot-scope="scope">
+            <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+              {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目机会流程状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <div :title="scope.row.status">
+              <span v-if="scope.row.status === 0">暂存</span>
+              <span v-else-if="scope.row.status === 1">已提交</span>
+              <span v-else-if="scope.row.status === 2">审批中</span>
+              <span v-else-if="scope.row.status === 3">审批完成</span>
+              <span v-else-if="scope.row.status === 4">关闭</span>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
     </div>
-    
+
     <!-- 设置项目状态对话框 -->
     <businessUpdate @getList="getList" ref="businessUpdate"></businessUpdate>
 
@@ -392,7 +282,7 @@ export default {
         orderByColumn: "createTime",
         isAsc: "desc",
         createTime: null,
-        projectStatus:null
+        projectStatus: null
       },
       channelList: [],
     };
@@ -400,7 +290,7 @@ export default {
   computed: {
     ...mapGetters(["user"]),
   },
-  created() {},
+  created() { },
   mounted() {
     this.getList();
     // 渠道
@@ -494,7 +384,7 @@ export default {
           } else if (type === 4) {
             // 终止
             this.handleDelete(row);
-          } else if (type===14) {
+          } else if (type === 14) {
             if (row.status === 3) {
               //保存-项目机会
               this.handleEdit(row);
@@ -544,13 +434,13 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 编辑按钮操作 */
     handleEdit(row) {
       const id = row.id || this.ids;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/stage/project/poolEdit", query: { id: id , pInstId: pInstId} });
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/stage/project/poolEdit", query: { id: id, pInstId: pInstId } });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -566,26 +456,12 @@ 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;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -602,13 +478,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>
-

ruoyi-ui/src/views/project/listStage/listSign.vue

@@ -72,7 +72,7 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <div style="padding: 15px;background-color: #fff;">
+    <div class="border-card">
       <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper"
         :class="{ hideHeaderCheckBox: stage !== '0' }" v-loading="loading" border :data="poolList"
         @selection-change="handleSelectionChange">
@@ -421,26 +421,7 @@ 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;

ruoyi-ui/src/views/project/listStage/terminationList.vue

@@ -87,7 +87,7 @@
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
-    <div style="padding: 15px;background-color: #fff;">
+    <div class="border-card">
       <el-table
     height="450"
       ref="dataTable"
@@ -485,26 +485,7 @@ 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;

ruoyi-ui/src/views/project/listStage/watchList.vue

@@ -84,7 +84,7 @@
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <div style="padding: 15px;background-color: #fff;">
+    <div class="border-card">
       <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
         :data="poolList" @selection-change="handleSelectionChange">
         <!-- <el-table-column type="selection" width="40" align="center" /> -->
@@ -453,26 +453,7 @@ 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;

ruoyi-ui/src/views/project/termination/myTask.vue

@@ -3,7 +3,7 @@
   <div>
     <el-card shadow="hover">
       <!-- 查询表单区域 -->
-      <el-form :model="queryParams" ref="queryForm" inline label-position="top">
+      <el-form :model="queryParams" ref="queryForm" size="small" inline label-position="top">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="项目名称" prop="projectName">
@@ -788,41 +788,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::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 {
-  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;

ruoyi-ui/src/views/project/termination/processList.vue

@@ -1,98 +1,77 @@
 <template>
   <div class="app-container">
     <!-- 项目投决 -->
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="90px"
-      style="margin-left: -22px"
-    >
-      <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="reason">
-        <el-input
-          v-model.trim="queryParams.reason"
-          placeholder="请输入终止原因"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="流程状态" prop="status">
-        <!-- el-select 绑定表单字段 -->
-        <el-select v-model="queryParams.status" placeholder="请选择" clearable>
-          <!-- 静态选项 -->
-          <el-option label="暂存" value="0"></el-option>
-          <el-option label="已提交" value="1"></el-option>
-          <el-option label="审批中" value="2"></el-option>
-          <el-option label="审核完成" value="3"></el-option>
-          <el-option label="关闭" value="4"></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-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px"
+      label-position="top">
+      <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="reason">
+            <el-input v-model.trim="queryParams.reason" placeholder="请输入终止原因" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="流程状态" prop="status">
+            <!-- el-select 绑定表单字段 -->
+            <el-select v-model="queryParams.status" 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-option label="审核完成" value="3"></el-option>
+              <el-option label="关闭" value="4"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+
+        </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 :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">
+      <!--      <el-col :span="1.5">
         <el-button
-          plain
           type="warning"
-          size="mini"
+          size="small"
           icon="el-icon-document"
           @click="handleAdd"
         >终止申请</el-button>
       </el-col>-->
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
+        <el-button type="warning" icon="el-icon-download" size="small" @click="handleExport">导出</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-table
-      ref="dataTable"
-      @row-click="clickRow"
-      class="tableWrapper"
-      v-loading="loading"
-      border
-      :data="poolList"
-      @selection-change="handleSelectionChange"
-    >
-      <!-- <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">
+    <div class="border-card">
+      <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+        :data="poolList" @selection-change="handleSelectionChange">
+        <!-- <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">
         <template slot-scope="scope">
           <div
             :title="scope.row.projectName"
@@ -102,139 +81,117 @@
             {{ scope.row.projectName }}
           </div>
         </template>
-      </el-table-column>-->
-      <el-table-column label="项目名称" align="center" prop="projectName">
-        <template slot-scope="scope">
-          <div :title="scope.row.projectName">
-            {{ scope.row.projectName }}
-          </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>
-      <el-table-column label="项目阶段" align="center" prop="projectStage">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.project_stage"
-            :value="scope.row.projectStage"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="项目机会状态" align="center" prop="projectStatus">
-        <template slot-scope="scope">
-          <!-- 定义状态文本映射对象 -->
-          <el-tag
-            :type="{
+</el-table-column>-->
+        <el-table-column label="项目名称" align="center" prop="projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.projectName">
+              {{ scope.row.projectName }}
+            </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>
+        <el-table-column label="项目阶段" align="center" prop="projectStage">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+          <template slot-scope="scope">
+            <!-- 定义状态文本映射对象 -->
+            <el-tag :type="{
               0: 'success',
               1: 'danger',
               2: 'warning'
-            }[scope.row.projectStatus] || 'info'"
-          >
-            {{ {
-            0: '正常',
-            1: '终止',
-            2: '观望'
-          }[scope.row.projectStatus] || '未知状态' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="项目负责人" align="center" prop="investHead">
-        <template slot-scope="scope">
-          <div :title="scope.row.investHead">
-            {{ scope.row.investHead }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="终止原因" align="center" prop="reason">
-        <template slot-scope="scope">
-          <div :title="scope.row.reason">
-            {{ scope.row.reason }}
-          </div>
-        </template>
-      </el-table-column>
-      <!-- delFlag -->
-      <el-table-column
-        label="状态"
-        align="center"
-        prop="investHead"
-        width="50px"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="申请人" align="center" prop="startUserName">
-        <template slot-scope="scope">
-          <div :title="scope.row.startUserName">
-            {{ scope.row.startUserName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="申请日期" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </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>
-        </template>
-      </el-table-column>
-      <el-table-column label="当前处理人" align="center" prop="assigneeName">
-        <template slot-scope="scope">
-          <div :title="scope.row.assigneeName">
-            {{ scope.row.assigneeName}}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="流程状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <div :title="scope.row.status">
-            <span v-if="scope.row.status === 0">暂存</span>
-            <span v-else-if="scope.row.status === 1">已提交</span>
-            <span v-else-if="scope.row.status === 2">审批中</span>
-            <span v-else-if="scope.row.status === 3">审批完成</span>
-            <span v-else-if="scope.row.status === 4">关闭</span>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button type="text" size="mini" @click="handleDetailProcess(scope.row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+            }[scope.row.projectStatus] || 'info'">
+              {{ {
+                0: '正常',
+                1: '终止',
+                2: '观望'
+              }[scope.row.projectStatus] || '未知状态' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目负责人" align="center" prop="investHead">
+          <template slot-scope="scope">
+            <div :title="scope.row.investHead">
+              {{ scope.row.investHead }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="终止原因" align="center" prop="reason">
+          <template slot-scope="scope">
+            <div :title="scope.row.reason">
+              {{ scope.row.reason }}
+            </div>
+          </template>
+        </el-table-column>
+        <!-- delFlag -->
+        <el-table-column label="状态" align="center" prop="investHead" width="50px">
+          <template slot-scope="scope">
+            <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+              {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="申请人" align="center" prop="startUserName">
+          <template slot-scope="scope">
+            <div :title="scope.row.startUserName">
+              {{ scope.row.startUserName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="申请日期" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+          </template>
+        </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>
+          </template>
+        </el-table-column>
+        <el-table-column label="当前处理人" align="center" prop="assigneeName">
+          <template slot-scope="scope">
+            <div :title="scope.row.assigneeName">
+              {{ scope.row.assigneeName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="流程状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <div :title="scope.row.status">
+              <span v-if="scope.row.status === 0">暂存</span>
+              <span v-else-if="scope.row.status === 1">已提交</span>
+              <span v-else-if="scope.row.status === 2">审批中</span>
+              <span v-else-if="scope.row.status === 3">审批完成</span>
+              <span v-else-if="scope.row.status === 4">关闭</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="handleDetailProcess(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
     <!-- 会议管理组件 -->
-    <meetingList
-      :type="'3'"
-      ref="meetingList"
-      :projectId="projectId"
-      @getList="getList"
-    ></meetingList>
+    <meetingList :type="'3'" ref="meetingList" :projectId="projectId" @getList="getList"></meetingList>
     <!-- 设置项目状态对话框 -->
     <businessUpdate @getList="getList" ref="businessUpdate"></businessUpdate>
     <!-- Flowable 流程图弹窗 -->
-    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%"  append-to-body>
+    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body>
       <!-- <el-image :src="readImage.src"></el-image> -->
-      <flow :flowData="flowData"/>
+      <flow :flowData="flowData" />
     </el-dialog>
   </div>
 </template>
@@ -269,7 +226,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 项目池表格数据
@@ -308,7 +265,7 @@ export default {
       channelList: [],
       projectId: "",
       //流程图信息
-      readImage:{
+      readImage: {
         open: false,
         src: "",
       },
@@ -319,7 +276,7 @@ export default {
   computed: {
     ...mapGetters(["user"]),
   },
-  created() {},
+  created() { },
   mounted() {
     this.getList();
     // 渠道
@@ -487,7 +444,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -500,20 +457,20 @@ export default {
       );
     },
     /** 流程图查看 */
-    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;
       })
     },
     /*流程详情*/
     handleDetailProcess(row) {
       const id = row.id || this.ids;
-      const poolId=row.projectPoolId;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/project/termination/detail", query: { id: poolId , pInstId: pInstId } });
+      const poolId = row.projectPoolId;
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/myTask/project/termination/detail", query: { id: poolId, pInstId: pInstId } });
     },
   },
 };
@@ -522,6 +479,7 @@ export default {
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -538,6 +496,7 @@ export default {
     -webkit-box-orient: vertical;
   }
 }
+
 /**找到表头那一行，然后把里面的复选框隐藏掉**/
 .tableWrapper::v-deep .el-table__header-wrapper .el-table__header .el-checkbox {
   display: none;