项目管理样式修改

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

@@ -1,165 +1,98 @@
 <template>
   <div class="app-container">
-    <el-form
-      v-if="type === '1'"
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="70px"
-    >
-      <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="contacts"
-        style="white-space: nowrap"
-      >
-        <el-input
-          v-model.trim="queryParams.contacts"
-          placeholder="请输入公司联系人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="跟进人" prop="upPerson">
-        <el-input
-          v-model.trim="queryParams.upPerson"
-          placeholder="请输入跟进人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="跟进方式" prop="upWay">
-        <el-select v-model="queryParams.upWay" placeholder="全部" clearable>
-          <el-option
-            v-for="dict in dict.type.up_way"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="跟进日期" prop="realityUpDate">
-        <el-date-picker
-          style="width: 205px"
-          clearable
-          v-model="queryParams.realityUpDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择跟进日期"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <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 v-if="type === '1'" :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="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="contacts" style="white-space: nowrap">
+            <el-input v-model.trim="queryParams.contacts" placeholder="请输入公司联系人" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="跟进人" prop="upPerson">
+            <el-input v-model.trim="queryParams.upPerson" placeholder="请输入跟进人" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="跟进方式" prop="upWay">
+            <el-select v-model="queryParams.upWay" placeholder="全部" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.up_way" :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="realityUpDate">
+            <el-date-picker style="width: 100%;" clearable v-model="queryParams.realityUpDate" type="date"
+              value-format="yyyy-MM-dd" placeholder="请选择跟进日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+
+        </el-col>
+        <el-col :span="6"></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" v-if="type === '1'">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['invest:record:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd"
+          v-hasPermi="['invest:record:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleSelectData(1)"
-          v-hasPermi="['invest:record:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" icon="el-icon-edit" size="small" :disabled="single" @click="handleSelectData(1)"
+          v-hasPermi="['invest:record:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="single"
-          @click="handleSelectData(2)"
-          v-hasPermi="['invest:record:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="single" @click="handleSelectData(2)"
+          v-hasPermi="['invest:record:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['invest:record:export']"
-          >导出</el-button
-        >
+        <el-button type="warning" icon="el-icon-download" size="small" @click="handleExport"
+          v-hasPermi="['invest:record:export']">导出</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-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"
-      />
-      <el-table-column
-        type="index"
-        label="序号"
-        width="50"
-        align="center"
-      ></el-table-column>
+    <div style="padding: 15px;background-color: #fff;">
+       <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" />
+      <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="projectId" /> -->
-      <el-table-column
-        label="项目名称"
-        align="center"
-        prop="tProjectPool.projectName"
-      >
+      <el-table-column label="项目名称" align="center" prop="tProjectPool.projectName">
         <template slot-scope="scope">
-          <div
-            :title="scope.row.tProjectPool.projectName"
-            class="public-text-blue public-cursor"
-            @click.stop="handleDetail(scope.row)"
-          >
+          <div :title="scope.row.tProjectPool.projectName" class="public-text-blue public-cursor"
+            @click.stop="handleDetail(scope.row)">
             {{ scope.row.tProjectPool.projectName }}
           </div>
         </template>
@@ -213,12 +146,7 @@
       </el-table-column> -->
       <!-- fixed="right" -->
       <!-- v-if="type == '1'" -->
-      <el-table-column
-        label="操作"
-        v-if="false"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" v-if="false" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <!-- <el-button
             v-if="user.nickName !== scope.row.createBy"
@@ -229,204 +157,88 @@
             @click="handleDetail(scope.row)"
             >详情</el-button
           > -->
-          <el-button
-            v-if="user.nickName === scope.row.createBy"
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['invest:record:edit']"
-            >修改</el-button
-          >
-          <el-button
-            v-if="user.nickName === scope.row.createBy"
-            class="custom-red-color"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['invest:record:remove']"
-            >删除</el-button
-          >
+          <el-button v-if="user.nickName === scope.row.createBy" size="mini" type="text" icon="el-icon-edit"
+            @click="handleUpdate(scope.row)" v-hasPermi="['invest:record:edit']">修改</el-button>
+          <el-button v-if="user.nickName === scope.row.createBy" class="custom-red-color" size="mini" type="text"
+            icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['invest:record:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0 && type !== '3'"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0 && type !== '3'" :total="total" :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize" @pagination="getList" />
+    </div>
+   
 
     <!-- 添加或修改跟进记录对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-    >
-      <el-form
-        class="special-el-form"
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="120px"
-      >
-        <el-form-item
-          label="项目名称"
-          prop="projectName"
-          class="special-el-form-item public-input-height-2"
-        >
-          <div
-            class="el-input__inner inputSimulation"
-            @click="handleProjectItem"
-            :class="{ show_disabled: pageType === '1' }"
-            :title="form.projectName"
-          >
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form class="special-el-form" ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="项目名称" prop="projectName" class="special-el-form-item public-input-height-2">
+          <div class="el-input__inner inputSimulation" @click="handleProjectItem"
+            :class="{ show_disabled: pageType === '1' }" :title="form.projectName">
             {{ form.projectName ? form.projectName : "请选择 " }}
           </div>
-          <projectItem
-            ref="projectItem"
-            @getProjectInfo="getProjectInfo"
-          ></projectItem>
+          <projectItem ref="projectItem" @getProjectInfo="getProjectInfo"></projectItem>
         </el-form-item>
-        <el-form-item
-          label="项目阶段"
-          prop="projectStage"
-          class="special-el-form-item"
-        >
+        <el-form-item label="项目阶段" prop="projectStage" class="special-el-form-item">
           <el-select v-model="form.projectStage" disabled placeholder="">
-            <el-option
-              v-for="dict in dict.type.project_stage"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
+            <el-option v-for="dict in dict.type.project_stage" :key="dict.value" :label="dict.label"
+              :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="公司联系人" prop="contacts">
           <el-input disabled v-model="form.contacts" />
         </el-form-item>
         <el-form-item label="跟进日期" prop="realityUpDate">
-          <el-date-picker
-            clearable
-            v-model="form.realityUpDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择跟进日期"
-          >
+          <el-date-picker clearable v-model="form.realityUpDate" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择跟进日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="跟进人" prop="upPerson">
           <div class="el-input__inner inputSimulation" @click="openSelectDept">
             {{ form.upPerson ? form.upPerson : "请选择 " }}
           </div>
-          <selecDept
-            ref="selecDepts"
-            @getDeptUserInfo="getDeptUserInfo"
-            :deptId="deptId"
-          ></selecDept>
+          <selecDept ref="selecDepts" @getDeptUserInfo="getDeptUserInfo" :deptId="deptId"></selecDept>
         </el-form-item>
         <el-form-item label="跟进方式" prop="upWay">
           <el-select v-model="form.upWay" placeholder="请选择跟进方式">
-            <el-option
-              v-for="dict in dict.type.up_way"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.up_way" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="附件" prop="file" class="special-el-form-item">
-          <fileItem
-            ref="fileItems"
-            :id="form.id"
-            @getFileList="getFileList"
-          ></fileItem>
+          <fileItem ref="fileItems" :id="form.id" @getFileList="getFileList"></fileItem>
         </el-form-item>
-        <el-form-item
-          label="跟进内容"
-          prop="upContent"
-          class="special-el-form-item"
-        >
-          <el-input
-            maxlength="200"
-            rows="4"
-            type="textarea"
-            v-model="form.upContent"
-            placeholder="请输入跟进内容"
-          />
+        <el-form-item label="跟进内容" prop="upContent" class="special-el-form-item">
+          <el-input maxlength="200" rows="4" type="textarea" v-model="form.upContent" placeholder="请输入跟进内容" />
         </el-form-item>
 
         <el-form-item label="备注" prop="mark" class="special-el-form-item">
-          <el-input
-            maxlength="200"
-            rows="4"
-            type="textarea"
-            v-model="form.mark"
-            placeholder="请输入备注"
-          />
+          <el-input maxlength="200" rows="4" type="textarea" v-model="form.mark" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-preventReClick
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="submitForm" v-preventReClick>确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
     <!-- 跟进记录详情 -->
-    <el-dialog
-      title="跟进记录详情"
-      :visible.sync="openDetail"
-      width="1000px"
-      append-to-body
-    >
-      <el-form
-        class="special-el-form"
-        ref="form"
-        :model="form"
-        label-width="120px"
-      >
-        <el-form-item
-          label="项目名称"
-          prop="projectName"
-          class="special-el-form-item"
-        >
-          <el-input
-            type="textarea"
-            rows="2"
-            disabled
-            v-model="form.projectName"
-          />
+    <el-dialog title="跟进记录详情" :visible.sync="openDetail" width="1000px" append-to-body>
+      <el-form class="special-el-form" ref="form" :model="form" label-width="120px">
+        <el-form-item label="项目名称" prop="projectName" class="special-el-form-item">
+          <el-input type="textarea" rows="2" disabled v-model="form.projectName" />
         </el-form-item>
-        <el-form-item
-          label="项目阶段"
-          prop="projectStage"
-          class="special-el-form-item"
-        >
+        <el-form-item label="项目阶段" prop="projectStage" class="special-el-form-item">
           <el-select disabled v-model="form.projectStage">
-            <el-option
-              v-for="dict in dict.type.project_stage"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
+            <el-option v-for="dict in dict.type.project_stage" :key="dict.value" :label="dict.label"
+              :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="公司联系人" prop="contacts">
           <el-input disabled v-model="form.contacts" />
         </el-form-item>
         <el-form-item label="跟进日期" prop="realityUpDate">
-          <el-date-picker
-            clearable
-            disabled
-            v-model="form.realityUpDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-          >
+          <el-date-picker clearable disabled v-model="form.realityUpDate" type="date" value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="跟进人" prop="upPerson">
@@ -434,43 +246,19 @@
         </el-form-item>
         <el-form-item label="跟进方式" prop="upWay">
           <el-select v-model="form.upWay" disabled>
-            <el-option
-              v-for="dict in dict.type.up_way"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.up_way" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="附件" prop="file" class="special-el-form-item">
-          <fileItem
-            ref="fileItemsDet"
-            :id="form.id"
-            @getFileList="getFileList"
-          ></fileItem>
+          <fileItem ref="fileItemsDet" :id="form.id" @getFileList="getFileList"></fileItem>
         </el-form-item>
-        <el-form-item
-          label="跟进内容"
-          prop="upContent"
-          class="special-el-form-item"
-        >
-          <el-input
-            maxlength="200"
-            rows="4"
-            type="textarea"
-            v-model="form.upContent"
-            disabled
-          />
+        <el-form-item label="跟进内容" prop="upContent" class="special-el-form-item">
+          <el-input maxlength="200" rows="4" type="textarea" v-model="form.upContent" disabled />
         </el-form-item>
 
         <el-form-item label="备注" prop="mark" class="special-el-form-item">
-          <el-input
-            maxlength="200"
-            rows="4"
-            type="textarea"
-            v-model="form.mark"
-            disabled
-          />
+          <el-input maxlength="200" rows="4" type="textarea" v-model="form.mark" disabled />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -532,7 +320,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 跟进记录表格数据
@@ -796,7 +584,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -840,6 +628,24 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.inputSimulation {
+.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/investOpp/myTask copy.vue

@@ -55,10 +55,31 @@
        type="text" size="small"
        style="color:#1890ff" type="text" size="small"
        /myTask
+        style="width: 100%;"
+       <div style="padding: 15px;background-color: #fff;">  </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{

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

@@ -1,272 +1,190 @@
 <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-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-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="所属组别" prop="projectGroup">
+            <el-select v-model="queryParams.projectGroup" placeholder="全部" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.project_group" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="项目公司" prop="company">
+            <el-input v-model.trim="queryParams.company" placeholder="请输入项目所属公司" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6"></el-col>
+        <el-col :span="6"></el-col>
+      </el-row>
 
-      <el-form-item label="项目公司" prop="company">
-        <el-input
-          v-model.trim="queryParams.company"
-          placeholder="请输入项目所属公司"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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="搜索">
+            <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-button
-          plain
-          type="warning"
-          size="mini"
-          icon="el-icon-document"
-          @click="handleAdd"
-        >立项申请</el-button
-        >
+        <el-button type="warning" 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">
-        <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="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 style="padding: 15px;background-color: #fff;">
+      <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" 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="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>{{
-            parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}")
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="立项通过日期" align="center" prop="projectDate">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="已发起立项申请"
-        align="center"
-        prop="approvalFlag"
-      >
-        <template slot-scope="scope">
-          <div>
-            {{ scope.row.approvalFlag === "1" ? "是" : "否" }}
-          </div>
-        </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="
+            }[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">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="已发起立项申请" align="center" prop="approvalFlag">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.approvalFlag === "1" ? "是" : "否" }}
+            </div>
+          </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="
               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>
+            " :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>
+      <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>
   </div>
@@ -300,7 +218,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 项目池表格数据
@@ -344,7 +262,7 @@ export default {
   computed: {
     ...mapGetters(["user"]),
   },
-  created() {},
+  created() { },
   mounted() {
     this.getList();
     // 渠道
@@ -494,7 +412,7 @@ export default {
     },
     handleDetail(row) {
       const id = row.id || this.ids;
-      this.$router.push({ path: "/project/poolDetail", query: { id: id } });
+      this.$router.push({ path: "/stage/project/poolDetail", query: { id: id } });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -519,7 +437,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -535,9 +453,31 @@ 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;
@@ -554,6 +494,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/listStage/listDecision.vue

@@ -1,267 +1,183 @@
 <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-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 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-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-button
-          plain
-          type="warning"
-          size="mini"
-          icon="el-icon-document"
-          @click="handleAdd"
-        >投决申请</el-button
-        >
+        <el-button type="warning" 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">
-        <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="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 style="padding: 15px;background-color: #fff;">
+      <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" 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="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="projectDate">
-        <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">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="已发起投决申请"
-        align="center"
-        prop="decisionFlag"
-      >
-        <template slot-scope="scope">
-          <div>
-            {{ scope.row.decisionFlag === "1" ? "是" : "否" }}
-          </div>
-        </template>
-      </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="projectDate">
+          <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">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="已发起投决申请" align="center" prop="decisionFlag">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.decisionFlag === "1" ? "是" : "否" }}
+            </div>
+          </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"
-        width="50px"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-          </div>
-        </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>
+
+      <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>
   </div>
@@ -295,7 +211,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 项目池表格数据
@@ -338,7 +254,7 @@ export default {
   computed: {
     ...mapGetters(["user"]),
   },
-  created() {},
+  created() { },
   mounted() {
     this.getList();
     // 渠道
@@ -489,7 +405,7 @@ export default {
     },
     handleDetail(row) {
       const id = row.id || this.ids;
-      this.$router.push({ path: "/project/poolDetail", query: { id: id } });
+      this.$router.push({ path: "/stage/project/poolDetail", query: { id: id } });
     },
     /**终止按钮操作 */
     handleDelete(row) {
@@ -504,7 +420,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -520,9 +436,31 @@ 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;
@@ -539,6 +477,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/listStage/listInvestOpp.vue

@@ -1,294 +1,207 @@
 <template>
   <div class="app-container">
-    <el-form
-      v-if="type !== '2'"
-      :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-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 v-if="type !== '2'" :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 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-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"
-      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
-          plain
-          type="warning"
-          size="mini"
-          icon="el-icon-document"
-          @click="handleAdd"
-        >项目机会申请</el-button
-        >
+        <el-button type="warning" size="small" icon="el-icon-document" @click="handleAdd">项目机会申请</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          v-if="type === '1' && stage == '0'"
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button
-        >
+        <el-button v-if="type === '1' && stage == '0'" 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"
-      :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 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="{
               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>
+            " :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>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
     <!-- 设置项目状态对话框 -->
     <businessUpdate @getList="getList" ref="businessUpdate"></businessUpdate>
   </div>
@@ -380,7 +293,7 @@ export default {
   computed: {
     ...mapGetters(["user"]),
   },
-  created() {},
+  created() { },
   mounted() {
     this.getList();
     // 渠道
@@ -512,7 +425,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -529,9 +442,31 @@ 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;
@@ -548,13 +483,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/listInvestigate.vue

@@ -1,180 +1,118 @@
 <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-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 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-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-button
-          plain
-          type="warning"
-          size="mini"
-          icon="el-icon-tickets"
-          @click="handleAdd"
-        >尽调申请</el-button
-        >
+        <el-button type="warning" size="small" icon="el-icon-tickets" @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">
-        <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="projectState">
+    <div style="padding: 15px;background-color: #fff;">
+      <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" 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="projectState">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.project_state"
@@ -182,109 +120,80 @@
           />
         </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
-        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">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="已发起尽调申请"
-        align="center"
-        prop="investigateFlag"
-      >
-        <template slot-scope="scope">
-          <div>
-            {{ scope.row.investigateFlag === "1" ? "是" : "否" }}
-          </div>
-        </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="
+            }[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">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="已发起尽调申请" align="center" prop="investigateFlag">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.investigateFlag === "1" ? "是" : "否" }}
+            </div>
+          </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="
               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>
+            " :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>
+
+      <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>
   </div>
@@ -319,7 +228,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 项目池表格数据
@@ -361,7 +270,7 @@ export default {
   computed: {
     ...mapGetters(["user"]),
   },
-  created() {},
+  created() { },
   mounted() {
     this.getList();
     // 渠道
@@ -513,7 +422,7 @@ export default {
     },
     handleDetail(row) {
       const id = row.id || this.ids;
-      this.$router.push({ path: "/project/poolDetail", query: { id: id } });
+      this.$router.push({ path: "/stage/project/poolDetail", query: { id: id } });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -533,7 +442,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -549,9 +458,31 @@ 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;
@@ -568,6 +499,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/listStage/listSign.vue

@@ -1,274 +1,187 @@
 <template>
   <div class="app-container">
-    <el-form
-      v-if="type !== '2'"
-      :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-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 v-if="type !== '2'" :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 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-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"
-      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
-          v-if="type === '1' && stage == '0'"
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button
-        >
+        <el-button v-if="type === '1' && stage == '0'" 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"
-      :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 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="{
               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>
-      <!-- fixed="right" -->
-    </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">
+          <template slot-scope="scope">
+            <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+              {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+            </div>
+          </template>
+        </el-table-column>
+        <!-- fixed="right" -->
+      </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"
-    />
     <!-- 设置项目状态对话框 -->
     <businessUpdate @getList="getList" ref="businessUpdate"></businessUpdate>
   </div>
@@ -318,7 +231,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 项目池表格数据
@@ -360,7 +273,7 @@ export default {
   computed: {
     ...mapGetters(["user"]),
   },
-  created() {},
+  created() { },
   mounted() {
     this.getList();
     // 渠道
@@ -471,7 +384,7 @@ export default {
     },
     handleDetail(row) {
       const id = row.id || this.ids;
-      this.$router.push({ path: "/project/poolDetail", query: { id: id } });
+      this.$router.push({ path: "/stage/project/poolDetail", query: { id: id } });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -491,7 +404,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -508,9 +421,31 @@ 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;
@@ -527,12 +462,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/terminationList.vue

@@ -8,88 +8,77 @@
       :inline="true"
       v-show="showSearch"
       label-width="90px"
-      style="margin-left: -22px"
+      label-position="top"
     >
-      <el-form-item label="项目名称" prop="projectName">
-        <el-input
-          v-model.trim="queryParams.projectName"
-          placeholder="请输入项目名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目负责人" prop="investHead">
-        <el-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-select>
-      </el-form-item>
-      <el-form-item label="所属组别" prop="projectGroup">
-        <el-select
-          v-model="queryParams.projectGroup"
-          placeholder="全部"
-          clearable
-        >
-          <el-option
-            v-for="dict in dict.type.project_group"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="项目名称" prop="projectName">
+            <el-input v-model.trim="queryParams.projectName" placeholder="请输入项目名称" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="项目负责人" prop="investHead">
+            <el-input v-model.trim="queryParams.investHead" placeholder="请输入项目负责人" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="公司联系人" prop="projectContacts">
+            <el-input v-model.trim="queryParams.projectContacts" placeholder="请输入公司联系人" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="渠道" prop="channel">
+            <el-select v-model="queryParams.channel" placeholder="全部" clearable style="width: 100%;">
+              <el-option v-for="item in channelList" :key="item.id" :label="item.channelName" :value="item.id" />
+              <el-option label="直接触达" value="1" />
+              <el-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 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-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-button
           type="warning"
-          plain
           icon="el-icon-download"
-          size="mini"
+          size="small"
           @click="handleExport"
         >导出</el-button>
       </el-col>
@@ -98,7 +87,9 @@
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
-    <el-table
+    <div style="padding: 15px;background-color: #fff;">
+      <el-table
+    height="450"
       ref="dataTable"
       @row-click="clickRow"
       class="tableWrapper"
@@ -200,6 +191,8 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+    </div>
+    
     <!-- 尽调组件 -->
     <dueDiligenceList
       ref="dueDiligenceLists"
@@ -250,7 +243,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 项目池表格数据
@@ -461,7 +454,7 @@ export default {
     },
     handleDetail(row) {
       const id = row.id || this.ids;
-      this.$router.push({ path: "/project/poolDetail", query: { id: id } });
+      this.$router.push({ path: "/stage/project/poolDetail", query: { id: id } });
     },
     /**终止按钮操作 */
     handleDelete(row) {
@@ -492,6 +485,26 @@ 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

@@ -1,264 +1,176 @@
 <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-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 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-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-button
-          plain
-          type="warning"
-          size="mini"
-          icon="el-icon-document"
-          @click="handleAdd(1)"
-          >立项申请</el-button
-        >
+        <el-button type="warning" size="small" icon="el-icon-document" @click="handleAdd(1)">立项申请</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          plain
-          type="warning"
-          size="mini"
-          icon="el-icon-tickets"
-          @click="handleAdd(2)"
-          >尽调申请</el-button
-        >
+        <el-button type="warning" size="small" icon="el-icon-tickets" @click="handleAdd(2)">尽调申请</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          plain
-          type="warning"
-          size="mini"
-          icon="el-icon-document"
-          @click="handleAdd(3)"
-          >投决申请</el-button
-        >
+        <el-button type="warning" size="small" icon="el-icon-document" @click="handleAdd(3)">投决申请</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          plain
-          type="warning"
-          size="mini"
-          icon="el-icon-document"
-          @click="handleAdd(4)"
-        >终止申请</el-button>
+        <el-button type="warning" size="small" icon="el-icon-document" @click="handleAdd(4)">终止申请</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">
-        <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="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="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">
+    <div style="padding: 15px;background-color: #fff;">
+      <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" 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="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="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="projectStatus">
-        <template slot-scope="scope">
-          <!-- 定义状态文本映射对象 -->
-          <el-tag
-            :type="{
+        <!-- delFlag -->
+        <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="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="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>
+            }[scope.row.projectStatus] || 'info'">
+              {{ {
+                0: '正常',
+                1: '终止',
+                2: '观望'
+              }[scope.row.projectStatus] || '未知状态' }}
+            </el-tag>
+          </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="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>
 
-    <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>
     <!-- 会议管理组件 -->
-    <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>
   </div>
@@ -299,7 +211,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 项目池表格数据
@@ -342,7 +254,7 @@ export default {
   computed: {
     ...mapGetters(["user"]),
   },
-  created() {},
+  created() { },
   mounted() {
     this.getList();
     // 渠道
@@ -398,19 +310,19 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(val) {
-      if(val==1){
+      if (val == 1) {
         // 立项申请
         this.$refs.meetingList.showLXApplyPop(1);
       }
-      if(val==2){
+      if (val == 2) {
         // 尽调申请
         this.$refs.dueDiligenceLists.handleShowApplyPop(1);
       }
-      if(val==3){
+      if (val == 3) {
         // 投决申请
         this.$refs.meetingList.showTJApplyPop(1);
       }
-      if(val==4){
+      if (val == 4) {
         // 终止申请
         this.$refs.meetingList.showZZApplyPop(1);
       }
@@ -510,7 +422,7 @@ export default {
     },
     handleDetail(row) {
       const id = row.id || this.ids;
-      this.$router.push({ path: "/project/poolDetail", query: { id: id } });
+      this.$router.push({ path: "/stage/project/poolDetail", query: { id: id } });
     },
     /**终止按钮操作 */
     handleDelete(row) {
@@ -525,7 +437,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -541,9 +453,31 @@ 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;
@@ -560,6 +494,7 @@ export default {
     -webkit-box-orient: vertical;
   }
 }
+
 /**找到表头那一行，然后把里面的复选框隐藏掉**/
 .tableWrapper::v-deep .el-table__header-wrapper .el-table__header .el-checkbox {
   display: none;