ruoyi-ui/src/App.vue

@@ -32,4 +32,47 @@ export default {
 #app .theme-picker {
   display: none;
 }
+
+::v-deep .el-form-item {
+  width: 100%;
+  margin-right: 0px;
+  margin-bottom: 10px;
+}
+::v-deep .el-form--label-top {
+  background-color: #fff;
+  padding: 10px;
+  margin-bottom: 15px;
+}
+
+::v-deep .el-form--label-top .el-form-item__label {
+  padding: 0;
+  line-height: 26px;
+}
+
+
+::v-deep .el-card__body{
+  background-color: #f3f3f4;
+}
+::v-deep .el-tabs--border-card{
+  border:none;
+  box-shadow:none;
+}
+::v-deep .el-tabs--border-card>.el-tabs__header{
+  background-color: #f3f3f4;
+}
+::v-deep .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active {
+  border-radius: 4px 4px 0 0;
+}
+</style>
+<style>
+.app-container {
+  background-color: #f3f3f4;
+}
+.border-card {
+  padding: 15px;background-color: #fff;
+}
+.editButton{
+  background-color: #23c6c8 !important;
+  border-color: #23c6c8 !important;
+}
 </style>

ruoyi-ui/src/api/project/investOpp/pool.js

@@ -63,7 +63,7 @@ export function getInvestInfo(pInstId) {
   })
 }
 
-// 项目池-编辑项目机会信息（不涉及流程）
+// 项目池-修改项目机会信息（不涉及流程）
 export function investmentOpportunityEdit(data) {
   return request({
     url:'/project/investmentOpportunity/edit',

ruoyi-ui/src/assets/styles/variables.scss

@@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
 $base-sub-menu-hover:#001528;
 */
 
-$base-sidebar-width: 200px;
+$base-sidebar-width: 250px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

ruoyi-ui/src/components/Editor/index.vue

@@ -27,7 +27,7 @@ import { getToken } from "@/utils/auth";
 export default {
   name: "Editor",
   props: {
-    /* 编辑器的内容 */
+    /* 修改器的内容 */
     value: {
       type: String,
       default: "",

ruoyi-ui/src/components/Process/components/nodePanel/gateway.vue

@@ -3,7 +3,7 @@
     <x-form ref="xForm" v-model="formData" :config="formConfig">
       <template #executionListener>
         <el-badge :value="executionListenerLength">
-          <el-button size="small" @click="dialogName = 'executionListenerDialog'">编辑</el-button>
+          <el-button size="small" @click="dialogName = 'executionListenerDialog'">修改</el-button>
         </el-badge>
       </template>
     </x-form>

ruoyi-ui/src/components/Process/components/nodePanel/process.vue

@@ -3,12 +3,12 @@
     <x-form ref="xForm" v-model="formData" :config="formConfig">
       <template #executionListener>
         <el-badge :value="executionListenerLength">
-          <el-button size="small" @click="dialogName = 'executionListenerDialog'">编辑</el-button>
+          <el-button size="small" @click="dialogName = 'executionListenerDialog'">修改</el-button>
         </el-badge>
       </template>
       <template #signal>
         <el-badge :value="signalLength">
-          <el-button size="small" @click="dialogName = 'signalDialog'">编辑</el-button>
+          <el-button size="small" @click="dialogName = 'signalDialog'">修改</el-button>
         </el-badge>
       </template>
     </x-form>

ruoyi-ui/src/components/Process/components/nodePanel/sequenceFlow.vue

@@ -3,7 +3,7 @@
     <x-form ref="xForm" v-model="formData" :config="formConfig">
       <template #executionListener>
         <el-badge :value="executionListenerLength">
-          <el-button size="small" @click="dialogName = 'executionListenerDialog'">编辑</el-button>
+          <el-button size="small" @click="dialogName = 'executionListenerDialog'">修改</el-button>
         </el-badge>
       </template>
     </x-form>

ruoyi-ui/src/components/Process/components/nodePanel/startEnd.vue

@@ -3,7 +3,7 @@
     <x-form ref="xForm" v-model="formData" :config="formConfig">
       <template #executionListener>
         <el-badge :value="executionListenerLength">
-          <el-button size="small" @click="dialogName = 'executionListenerDialog'">编辑</el-button>
+          <el-button size="small" @click="dialogName = 'executionListenerDialog'">修改</el-button>
         </el-badge>
       </template>
     </x-form>

ruoyi-ui/src/components/Process/components/nodePanel/task.vue

@@ -3,17 +3,17 @@
     <x-form ref="xForm" v-model="formData" :config="formConfig">
       <template #executionListener>
         <el-badge :value="executionListenerLength">
-          <el-button size="small" @click="dialogName = 'executionListenerDialog'">编辑</el-button>
+          <el-button size="small" @click="dialogName = 'executionListenerDialog'">修改</el-button>
         </el-badge>
       </template>
       <template #taskListener>
         <el-badge :value="taskListenerLength">
-          <el-button size="small" @click="dialogName = 'taskListenerDialog'">编辑</el-button>
+          <el-button size="small" @click="dialogName = 'taskListenerDialog'">修改</el-button>
         </el-badge>
       </template>
       <template #multiInstance>
         <el-badge :is-dot="hasMultiInstance">
-          <el-button size="small" @click="dialogName = 'multiInstanceDialog'">编辑</el-button>
+          <el-button size="small" @click="dialogName = 'multiInstanceDialog'">修改</el-button>
         </el-badge>
       </template>
       <template #checkSingleUser>

ruoyi-ui/src/components/Process/index.vue

@@ -252,7 +252,7 @@ export default {
 </script>
 
 <style lang="scss">
-/*左边工具栏以及编辑节点的样式*/
+/*左边工具栏以及修改节点的样式*/
 @import "~bpmn-js/dist/assets/diagram-js.css";
 @import "~bpmn-js/dist/assets/bpmn-font/css/bpmn.css";
 @import "~bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css";

ruoyi-ui/src/components/Process/index1.vue

@@ -288,7 +288,7 @@ export default {
 </script>
 
 <style lang="scss">
-/*左边工具栏以及编辑节点的样式*/
+/*左边工具栏以及修改节点的样式*/
 @import "~bpmn-js/dist/assets/diagram-js.css";
 @import "~bpmn-js/dist/assets/bpmn-font/css/bpmn.css";
 @import "~bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css";

ruoyi-ui/src/components/Process/panel/ButtonsPanel.vue

@@ -7,7 +7,7 @@
       <el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip />
       <el-table-column label="操作" width="90px">
         <template slot-scope="{ row, $index }">
-          <el-button size="mini" type="text" @click="openAttributesForm(row, $index)">编辑</el-button>
+          <el-button size="mini" type="text" @click="openAttributesForm(row, $index)">修改</el-button>
           <el-divider direction="vertical" />
           <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeAttributes(row, $index)">移除</el-button>
         </template>

ruoyi-ui/src/components/Process/panel/PropertiesPanel2.vue

@@ -6,7 +6,7 @@
       <el-table-column label="属性值" prop="value" min-width="100px" show-overflow-tooltip />
       <el-table-column label="操作" width="90px">
         <template slot-scope="{ row, $index }">
-          <el-button size="mini" type="text" @click="openAttributesForm(row, $index)">编辑</el-button>
+          <el-button size="mini" type="text" @click="openAttributesForm(row, $index)">修改</el-button>
           <el-divider direction="vertical" />
           <el-button size="mini" type="text" style="color: #ff4d4f" @click="removeAttributes(row, $index)">移除</el-button>
         </template>

ruoyi-ui/src/components/Process/panel/executionListener.vue

@@ -6,7 +6,7 @@
       <el-table-column label="监听类型" width="80px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button size="mini" type="primary" @click="openListenerForm(scope.row, scope.$index)">编辑</el-button>
+          <el-button size="mini" type="primary" @click="openListenerForm(scope.row, scope.$index)">修改</el-button>
           <el-divider direction="vertical" />
           <el-button size="mini" type="danger" @click="removeListener(scope.row, scope.$index)">移除</el-button>
         </template>
@@ -17,7 +17,7 @@
       <el-button type="primary" icon="el-icon-plus" size="small" @click="openListenerForm(null)" >自定义监听器</el-button>
     </div>
 
-    <!-- 监听器 编辑/创建 部分 -->
+    <!-- 监听器 修改/创建 部分 -->
     <el-drawer :visible.sync="listenerFormModelVisible" title="执行监听器" size="480px" append-to-body destroy-on-close>
       <el-form :model="listenerForm" size="small" label-width="96px" ref="listenerFormRef" @submit.native.prevent>
         <el-form-item label="事件类型" prop="event" :rules="{ required: true, trigger: ['blur', 'change'] }">
@@ -110,7 +110,7 @@
         <el-table-column label="值内容" width="80px" show-overflow-tooltip :formatter="row => row.string || row.expression" />
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button size="mini" type="primary" @click="openListenerFieldForm(scope.row, scope.$index)">编辑</el-button>
+            <el-button size="mini" type="primary" @click="openListenerFieldForm(scope.row, scope.$index)">修改</el-button>
             <el-divider direction="vertical" />
             <el-button size="mini" type="danger" @click="removeListenerField(scope.row, scope.$index)">移除</el-button>
           </template>
@@ -123,7 +123,7 @@
       </div>
     </el-drawer>
 
-    <!-- 注入西段 编辑/创建 部分 -->
+    <!-- 注入西段 修改/创建 部分 -->
     <el-dialog title="字段配置" :visible.sync="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close>
       <el-form :model="listenerFieldForm" label-width="96px" ref="listenerFieldFormRef" style="height: 136px" @submit.native.prevent>
         <el-form-item label="字段名称：" prop="name" :rules="{ required: true, trigger: ['blur', 'change'] }">
@@ -217,7 +217,7 @@ export default {
     return {
       elementListenersList: [], // 监听器列表
       listenerForm: {},// 监听器详情表单
-      listenerFormModelVisible: false, // 监听器 编辑 侧边栏显示状态
+      listenerFormModelVisible: false, // 监听器 修改 侧边栏显示状态
       fieldsListOfListener: [],
       bpmnElementListeners: [],
       otherExtensionList: [],
@@ -306,7 +306,7 @@ export default {
       });
     },
 
-    // 打开监听器字段编辑弹窗
+    // 打开监听器字段修改弹窗
     openListenerFieldForm(field, index) {
       this.listenerFieldForm = field ? JSON.parse(JSON.stringify(field)) : {};
       this.editingListenerFieldIndex = field ? index : -1;

ruoyi-ui/src/components/Process/panel/taskListener.vue

@@ -7,7 +7,7 @@
       <el-table-column label="监听类型" width="85px" show-overflow-tooltip :formatter="row => listenerTypeObject[row.listenerType]" />
       <el-table-column label="操作" >
         <template  slot-scope="scope">
-          <el-button size="mini" type="primary" @click="openListenerForm(scope.row, scope.$index)">编辑</el-button>
+          <el-button size="mini" type="primary" @click="openListenerForm(scope.row, scope.$index)">修改</el-button>
           <el-divider direction="vertical" />
           <el-button size="mini" type="danger" @click="removeListener(scope.row, scope.$index)">移除</el-button>
         </template>
@@ -18,7 +18,7 @@
       <el-button type="primary" icon="el-icon-plus" size="small" @click="openListenerForm(null)">自定义监听器</el-button>
     </div>
 
-    <!-- 监听器 编辑/创建 部分 -->
+    <!-- 监听器 修改/创建 部分 -->
     <el-drawer :visible.sync="listenerFormModelVisible" title="任务监听器" size="480px" append-to-body destroy-on-close>
       <el-form :model="listenerForm" size="small" label-width="110px" ref="listenerFormRef" @submit.native.prevent>
         <el-form-item prop="event" :rules="{ required: true, trigger: ['blur', 'change'] }">
@@ -170,7 +170,7 @@
         <el-table-column label="值内容" width="80px" show-overflow-tooltip :formatter="row => row.string || row.expression" />
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button size="mini" type="primary"  @click="openListenerFieldForm(scope.row, scope.$index)">编辑</el-button>
+            <el-button size="mini" type="primary"  @click="openListenerFieldForm(scope.row, scope.$index)">修改</el-button>
             <el-divider direction="vertical" />
             <el-button size="mini" type="danger" @click="removeListenerField(scope.row, scope.$index)">移除</el-button>
           </template>
@@ -183,7 +183,7 @@
       </div>
     </el-drawer>
 
-    <!-- 注入西段 编辑/创建 部分 -->
+    <!-- 注入西段 修改/创建 部分 -->
     <el-dialog title="字段配置" :visible.sync="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close>
       <el-form :model="listenerFieldForm"  label-width="96px" ref="listenerFieldFormRef" style="height: 136px" @submit.native.prevent>
         <el-form-item label="字段名称：" prop="name" :rules="{ required: true, trigger: ['blur', 'change'] }">
@@ -275,7 +275,7 @@ export default {
     return {
       elementListenersList: [], // 监听器列表
       listenerForm: {},// 监听器详情表单
-      listenerFormModelVisible: false, // 监听器 编辑 侧边栏显示状态
+      listenerFormModelVisible: false, // 监听器 修改 侧边栏显示状态
       fieldsListOfListener: [],
       bpmnElementListeners: [],
       otherExtensionList: [],
@@ -364,7 +364,7 @@ export default {
       });
     },
 
-    // 打开监听器字段编辑弹窗
+    // 打开监听器字段修改弹窗
     openListenerFieldForm(field, index) {
       this.listenerFieldForm = field ? JSON.parse(JSON.stringify(field)) : {};
       this.editingListenerFieldIndex = field ? index : -1;

ruoyi-ui/src/components/tinymce/README.md

@@ -1,3 +1,3 @@
 ## 简介
-富文本编辑器tinymce的一个vue版本封装。使用cdn动态脚本引入的方式加载。
+富文本修改器tinymce的一个vue版本封装。使用cdn动态脚本引入的方式加载。
 

ruoyi-ui/src/components/tinymce/package.json

@@ -1,7 +1,7 @@
 {
   "name": "form-gen-tinymce",
   "version": "1.0.0",
-  "description": "富文本编辑器tinymce的一个vue版本封装。使用cdn动态脚本引入的方式加载。",
+  "description": "富文本修改器tinymce的一个vue版本封装。使用cdn动态脚本引入的方式加载。",
   "main": "lib/form-gen-tinymce.umd.js",
   "directories": {
     "example": "example"

ruoyi-ui/src/layout/components/Sidebar/Item.vue

@@ -21,10 +21,12 @@ export default {
     const { icon, title, path } = context.props;
     const vnodes = [];
 
-    if (icon) {
+    if (icon != "#") {
       vnodes.push(<svg-icon icon-class={icon} />);
+    }else {
+      vnodes.push(<span style="margin-left:15px"></span>);
     }
-
+    
     if (title) {
       if (title.length > 5) {
         vnodes.push(

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

@@ -67,7 +67,8 @@ export default {
   height: 50px;
   line-height: 50px;
   background: #2b2f3a;
-  text-align: center;
+  margin-left: 10px;
+  // text-align: center;
   overflow: hidden;
 
   & .sidebar-logo-link {
@@ -75,8 +76,8 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
-      height: 32px;
+      width: 28px;
+      height: 28px;
       vertical-align: middle;
       margin-right: 12px;
     }
@@ -87,7 +88,7 @@ export default {
       color: #fff;
       font-weight: 600;
       line-height: 50px;
-      font-size: 14px;
+      font-size: 13px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       vertical-align: middle;
     }

ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue

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

ruoyi-ui/src/layout/index.vue

@@ -5,7 +5,7 @@
     <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
       <div :class="{'fixed-header':fixedHeader}">
         <navbar/>
-        <tags-view v-if="needTagsView"/>
+        <!-- <tags-view v-if="needTagsView"/> -->
       </div>
       <app-main/>
       <right-panel>

ruoyi-ui/src/router/index.js

@@ -9,7 +9,7 @@ import Layout from '@/layout'
 /**
  * Note: 路由配置项
  *
- * hidden: true                     // 当设置 true 的时候该路由不会再侧边栏出现 如401，login等页面，或者如一些编辑页面/edit/1
+ * hidden: true                     // 当设置 true 的时候该路由不会再侧边栏出现 如401，login等页面，或者如一些修改页面/edit/1
  * alwaysShow: true                 // 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
  *                                  // 只有一个时，会将那个子路由当做根路由显示在侧边栏--如引导页面
  *                                  // 若你想不管路由下面的 children 声明的个数都显示你的根路由
@@ -68,155 +68,133 @@ export const constantRoutes = [
   //   hidden: true
   // },
   {
-    path: '/project',
+    path: '/myTask/project',
     component: Layout,
     hidden: true,
     // redirect: 'noredirect',
     children: [
-      {
-        path: 'poolEdit',
-        name: 'poolEdit',
-        component: () => import('@/views/project/poolEdit'),
-        meta: { title: '项目编辑' }
-      },
-      {
-        path: 'poolDetail',
-        name: 'poolDetail',
-        component: () => import('@/views/project/poolDetail'),
-        meta: { title: '项目详情' }
-      },
       //项目机会
-      {
-        path: 'investOpp/apply',
-        name: 'investOppApply',
-        component: () => import('@/views/project/investOpp/apply'),
-        meta: { title: '申请项目机会' }
-      },
       {
         path: 'investOpp/edit',
         name: 'investOppEdit',
         component: () => import('@/views/project/investOpp/edit'),
-        meta: { title: '修改项目机会' }
+        meta: { title: '修改项目机会', activeMenu: '/myTask/project/investOpp/myTask' }
       },
       {
         path: "investOpp/audit",
         name: 'investOppAudit',
         component: () => import('@/views/project/investOpp/audit'),
-        meta: { title: '审批项目机会' }
+        meta: { title: '审批项目机会', activeMenu: '/myTask/project/investOpp/myTask' }
       },
       {
         path: 'investOpp/detail',
         name: 'investOppDetail',
         component: () => import('@/views/project/investOpp/detail'),
-        meta: { title: '项目机会详情' }
+        meta: { title: '项目机会详情', activeMenu: '/myTask/project/investOpp/myTask' }
       },
       //项目立项
       {
         path: "approval/edit",
         name: 'approvalEdit',
         component: () => import('@/views/project/approval/edit'),
-        meta: { title: '修改项目立项' }
+        meta: { title: '修改项目立项', activeMenu: '/myTask/project/approval/myTask' }
       },
       {
         path: "approval/audit",
         name: 'approvalAudit',
         component: () => import('@/views/project/approval/audit'),
-        meta: { title: '审批项目立项' }
+        meta: { title: '审批项目立项', activeMenu: '/myTask/project/approval/myTask' }
       },
       {
         path: "approval/detail",
         name: 'approvalDetail',
         component: () => import('@/views/project/approval/detail'),
-        meta: { title: '项目立项详情' }
+        meta: { title: '项目立项详情', activeMenu: '/myTask/project/approval/myTask' }
       },
       //尽职背调
       {
         path: "investigate/edit",
         name: 'investigateEdit',
         component: () => import('@/views/project/investigate/edit'),
-        meta: { title: '修改尽职背调' }
+        meta: { title: '修改尽职背调', activeMenu: '/myTask/project/investigate/myTask' }
       },
       {
         path: "investigate/audit",
         name: 'investigateAudit',
         component: () => import('@/views/project/investigate/audit'),
-        meta: { title: '审批尽职背调' }
+        meta: { title: '审批尽职背调', activeMenu: '/myTask/project/investigate/myTask' }
       },
       {
         path: "investigate/detail",
         name: 'investigateDetail',
         component: () => import('@/views/project/investigate/detail'),
-        meta: { title: '尽职背调详情' }
+        meta: { title: '尽职背调详情', activeMenu: '/myTask/project/investigate/myTask' }
       },
       //项目投决
       {
         path: "decision/edit",
         name: 'decisionEdit',
         component: () => import('@/views/project/decision/edit'),
-        meta: { title: '修改项目投决' }
+        meta: { title: '修改项目投决', activeMenu: '/myTask/project/decision/myTask' }
       },
       {
         path: "decision/audit",
         name: 'decisionAudit',
         component: () => import('@/views/project/decision/audit'),
-        meta: { title: '审批项目投决' }
+        meta: { title: '审批项目投决', activeMenu: '/myTask/project/decision/myTask' }
       },
       {
         path: "decision/detail",
         name: 'decisionDetail',
         component: () => import('@/views/project/decision/detail'),
-        meta: { title: '项目投决详情' }
+        meta: { title: '项目投决详情', activeMenu: '/myTask/project/decision/myTask' }
       },
       //项目终止
       {
         path: "termination/edit",
         name: 'terminationEdit',
         component: () => import('@/views/project/termination/edit'),
-        meta: { title: '修改项目终止' }
+        meta: { title: '修改项目终止', activeMenu: '/myTask/project/termination/myTask' }
       },
       {
         path: "termination/audit",
         name: 'terminationAudit',
         component: () => import('@/views/project/termination/audit'),
-        meta: { title: '审批项目终止' }
+        meta: { title: '审批项目终止', activeMenu: '/myTask/project/termination/myTask' }
       },
       {
         path: "termination/detail",
         name: 'terminationDetail',
         component: () => import('@/views/project/termination/detail'),
-        meta: { title: '项目终止详情' }
+        meta: { title: '项目终止详情', activeMenu: '/myTask/project/termination/myTask' }
+      },
+    ]
+  },
+  {
+    path: '/stage/project',
+    component: Layout,
+    hidden: true,
+    // redirect: 'noredirect',
+    children: [
+      {
+        path: 'poolEdit',
+        name: 'poolEdit',
+        component: () => import('@/views/project/poolEdit'),
+        meta: { title: '项目修改', activeMenu: '/stage/project/listStage/listPool' }
+      },
+      {
+        path: 'poolDetail',
+        name: 'poolDetail',
+        component: () => import('@/views/project/poolDetail'),
+        meta: { title: '项目详情', activeMenu: '/stage/project/listStage/listPool' }
+      },
+      //项目机会
+      {
+        path: 'investOpp/apply',
+        name: 'investOppApply',
+        component: () => import('@/views/project/investOpp/apply'),
+        meta: { title: '申请项目机会', activeMenu: '/stage/project/listStage/listInvestOpp' }
       },
-      // {
-      //   path: "record/index",
-      //   name: 'investRecordIndex',
-      //   component: () => import('@/views/invest/record/index')
-      // },
-      // {
-      //   path: "channel/index",
-      //   name: 'investChannelIndex',
-      //   component: () => import('@/views/invest/channel/index')
-      // },
-      // {
-      //   path: "contract/index",
-      //   name: 'investContractIndex',
-      //   component: () => import('@/views/invest/contract/index')
-      // },
-      // {
-      //   path: "meeting/index",
-      //   name: 'investMeetingmpanyctsIndex',
-      //   component: () => import('@/views/invest/meeting/index')
-      // },
-      // {
-      //   path: "meeting/mark",
-      //   name: 'investMeetingmpanyctsMark',
-      //   component: () => import('@/views/invest/meeting/mark'),
-      //   meta: { title: '会议数据' }
-      // },
-      // {
-      //   path: 'information/index',
-      //   component: () => import('@/views/invest/information/index'),
-      //   name: 'investInformationIndex',
-      // }
     ]
   },
   {

ruoyi-ui/src/utils/generator/config.js

@@ -130,7 +130,7 @@ export const inputComponents = [
   },
   {
     __config__: {
-      label: '编辑器',
+      label: '修改器',
       showLabel: true,
       changeTag: true,
       labelWidth: null,
@@ -144,7 +144,7 @@ export const inputComponents = [
       document: 'http://tinymce.ax-z.cn'
     },
     placeholder: '请输入',
-    height: 300, // 编辑器高度
+    height: 300, // 修改器高度
     branding: false // 隐藏右下角品牌烙印
   }
 ]

ruoyi-ui/src/utils/loadMonaco.js

@@ -21,7 +21,7 @@ export default function loadMonaco(cb) {
   const loading = ELEMENT.Loading.service({
     fullscreen: true,
     lock: true,
-    text: '编辑器资源初始化中...',
+    text: '修改器资源初始化中...',
     spinner: 'el-icon-loading',
     background: 'rgba(255, 255, 255, 0.5)'
   })

ruoyi-ui/src/views/file/businessPlan/index.vue

@@ -1,276 +1,149 @@
 <template>
   <div class="app-container">
-    <el-form
-      v-if="type !== '2'"
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="70px"
-    >
-      <el-form-item label="文件名称" prop="fileName">
-        <el-input
-          v-model.trim="queryParams.fileName"
-          placeholder="请输入文件名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="文件类别" prop="fileType">
-        <el-select v-model="queryParams.fileType" placeholder="全部" clearable>
-          <el-option
-            v-for="dict in dict.type.file_type"
-            :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-position="top">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="文件名称" prop="fileName">
+            <el-input v-model.trim="queryParams.fileName" placeholder="请输入文件名称" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件类别" prop="fileType">
+            <el-select v-model="queryParams.fileType" placeholder="全部" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.file_type" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6"></el-col>
+        <el-col :span="6"></el-col>
+      </el-row>
 
-      <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-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'">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button
-        >
+        <el-button type="success" class="editButton" icon="el-icon-edit" size="small" :disabled="single"
+          @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple"
+          @click="handleDelete">删除</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>
+    <div class="border-card">
+      <el-table height="450" class="tableWrapper" v-loading="loading" border :data="businessPlanList"
+        @selection-change="handleSelectionChange">
+        <el-table-column v-if="type === '1'" type="selection" width="55" align="center" />
+        <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
+        <el-table-column label="文件名称" width="300" align="center" prop="fileName">
+          <template slot-scope="scope">
+            <div :title="scope.row.fileName">
+              {{ scope.row.fileName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="文件类别" width="160" align="center" prop="fileType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.file_type" :value="scope.row.fileType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目名称" width="200" align="center" prop="tProjectPool.projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectPool.projectName">
+              {{ scope.row.tProjectPool.projectName }}
+            </div>
+          </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
-      class="tableWrapper"
-      v-loading="loading"
-      border
-      :data="businessPlanList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column
-        v-if="type === '1'"
-        type="selection"
-        width="55"
-        align="center"
-      />
-      <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
-      <el-table-column
-        label="文件名称"
-        width="300"
-        align="center"
-        prop="fileName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.fileName">
-            {{ scope.row.fileName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="文件类别"
-        width="160"
-        align="center"
-        prop="fileType"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.file_type"
-            :value="scope.row.fileType"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="项目名称"
-        width="200"
-        align="center"
-        prop="tProjectPool.projectName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectPool.projectName">
-            {{ scope.row.tProjectPool.projectName }}
-          </div>
-        </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="备注" width="120" align="center" prop="remark">
+          <template slot-scope="scope">
+            <div :title="scope.row.remark">
+              {{ scope.row.remark }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" width="120" align="center" prop="createBy">
+          <template slot-scope="scope">
+            <div :title="scope.row.createBy">
+              {{ scope.row.createBy }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" width="160" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <div :title="scope.row.createTime">
+              {{ scope.row.createTime }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column width="120"  label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+            <el-button class="custom-red-color" size="small" type="text" icon="el-icon-delete"
+              @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-      <el-table-column label="备注" width="120" align="center" prop="remark">
-        <template slot-scope="scope">
-          <div :title="scope.row.remark">
-            {{ scope.row.remark }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建人"
-        width="120"
-        align="center"
-        prop="createBy"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.createBy">
-            {{ scope.row.createBy }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建时间"
-        width="160"
-        align="center"
-        prop="createTime"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.createTime">
-            {{ scope.row.createTime }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        width="120"
-        fixed="right"
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button
-          >
-          <el-button
-            class="custom-red-color"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改文件资料对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-    >
-      <el-form
-        class="special-el-form"
-        ref="fileForm"
-        :model="form"
-        :rules="rules"
-        label-width="90px"
-      >
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form class="special-el-form" ref="fileForm" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="文件名称" prop="fileName">
-          <el-input
-            maxlength="100"
-            v-model="form.fileName"
-            placeholder="请输入文件名称"
-          />
+          <el-input maxlength="100" v-model="form.fileName" placeholder="请输入文件名称" />
         </el-form-item>
 
         <el-form-item label="文件类别" prop="fileType">
           <el-select v-model="form.fileType" placeholder="请选择文件类别" disabled>
-            <el-option
-              v-for="dict in dict.type.file_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.file_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
-          <div
-            class="el-input__inner inputSimulation yichu1"
-            @click="handleProjectItem"
-            :class="{ show_disabled: pageType === '1' }"
-            :title="form.projectName"
-          >
+          <div class="el-input__inner inputSimulation yichu1" @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">
           <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="fileBusinessId">
@@ -286,26 +159,14 @@
           ></meetingItem>
         </el-form-item> -->
         <el-form-item label="文件" prop="listFile" 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="remark" class="special-el-form-item">
-          <el-input
-            maxlength="200"
-            rows="4"
-            type="textarea"
-            v-model="form.remark"
-            placeholder="请输入备注"
-          />
+          <el-input maxlength="200" rows="4" type="textarea" v-model="form.remark" 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>
@@ -444,7 +305,7 @@ export default {
       this.fileList = fileList;
       if (fileList && fileList.length > 0) {
         this.$refs.fileForm.clearValidate(["listFile"]);
-      }else{
+      } else {
         this.fileList = [];
       }
     },
@@ -544,10 +405,10 @@ export default {
         this.title = "修改文件资料";
         setTimeout(() => {
           this.$refs.fileItems.fileList = [];
-          if(row.fileId){
-            id=row.fileId;
+          if (row.fileId) {
+            id = row.fileId;
             this.$refs.fileItems.getListFileById(id);
-          }else{
+          } else {
             this.$refs.fileItems.getListFileBusinessId(id);
           }
 
@@ -590,7 +451,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

ruoyi-ui/src/views/file/decisionReport/index.vue

@@ -1,276 +1,149 @@
 <template>
   <div class="app-container">
-    <el-form
-      v-if="type !== '2'"
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="70px"
-    >
-      <el-form-item label="文件名称" prop="fileName">
-        <el-input
-          v-model.trim="queryParams.fileName"
-          placeholder="请输入文件名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="文件类别" prop="fileType">
-        <el-select v-model="queryParams.fileType" placeholder="全部" clearable>
-          <el-option
-            v-for="dict in dict.type.file_type"
-            :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-position="top">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="文件名称" prop="fileName">
+            <el-input v-model.trim="queryParams.fileName" placeholder="请输入文件名称" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件类别" prop="fileType">
+            <el-select v-model="queryParams.fileType" placeholder="全部" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.file_type" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6"></el-col>
+        <el-col :span="6"></el-col>
+      </el-row>
 
-      <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-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'">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button
-        >
+        <el-button type="success" class="editButton" icon="el-icon-edit" size="small" :disabled="single"
+          @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple"
+          @click="handleDelete">删除</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>
+    <div class="border-card">
+      <el-table height="450" class="tableWrapper" v-loading="loading" border :data="decisionReportList"
+        @selection-change="handleSelectionChange">
+        <el-table-column v-if="type === '1'" type="selection" width="55" align="center" />
+        <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
+        <el-table-column label="文件名称" width="300" align="center" prop="fileName">
+          <template slot-scope="scope">
+            <div :title="scope.row.fileName">
+              {{ scope.row.fileName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="文件类别" width="160" align="center" prop="fileType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.file_type" :value="scope.row.fileType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目名称" width="200" align="center" prop="tProjectPool.projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectPool.projectName">
+              {{ scope.row.tProjectPool.projectName }}
+            </div>
+          </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
-      class="tableWrapper"
-      v-loading="loading"
-      border
-      :data="decisionReportList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column
-        v-if="type === '1'"
-        type="selection"
-        width="55"
-        align="center"
-      />
-      <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
-      <el-table-column
-        label="文件名称"
-        width="300"
-        align="center"
-        prop="fileName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.fileName">
-            {{ scope.row.fileName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="文件类别"
-        width="160"
-        align="center"
-        prop="fileType"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.file_type"
-            :value="scope.row.fileType"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="项目名称"
-        width="200"
-        align="center"
-        prop="tProjectPool.projectName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectPool.projectName">
-            {{ scope.row.tProjectPool.projectName }}
-          </div>
-        </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="备注" width="120" align="center" prop="remark">
+          <template slot-scope="scope">
+            <div :title="scope.row.remark">
+              {{ scope.row.remark }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" width="120" align="center" prop="createBy">
+          <template slot-scope="scope">
+            <div :title="scope.row.createBy">
+              {{ scope.row.createBy }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" width="160" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <div :title="scope.row.createTime">
+              {{ scope.row.createTime }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column width="120"  label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+            <el-button class="custom-red-color" size="small" type="text" icon="el-icon-delete"
+              @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-      <el-table-column label="备注" width="120" align="center" prop="remark">
-        <template slot-scope="scope">
-          <div :title="scope.row.remark">
-            {{ scope.row.remark }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建人"
-        width="120"
-        align="center"
-        prop="createBy"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.createBy">
-            {{ scope.row.createBy }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建时间"
-        width="160"
-        align="center"
-        prop="createTime"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.createTime">
-            {{ scope.row.createTime }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        width="120"
-        fixed="right"
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button
-          >
-          <el-button
-            class="custom-red-color"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改文件资料对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-    >
-      <el-form
-        class="special-el-form"
-        ref="fileForm"
-        :model="form"
-        :rules="rules"
-        label-width="90px"
-      >
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form class="special-el-form" ref="fileForm" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="文件名称" prop="fileName">
-          <el-input
-            maxlength="100"
-            v-model="form.fileName"
-            placeholder="请输入文件名称"
-          />
+          <el-input maxlength="100" v-model="form.fileName" placeholder="请输入文件名称" />
         </el-form-item>
 
         <el-form-item label="文件类别" prop="fileType">
           <el-select v-model="form.fileType" placeholder="请选择文件类别" disabled>
-            <el-option
-              v-for="dict in dict.type.file_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.file_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
-          <div
-            class="el-input__inner inputSimulation yichu1"
-            @click="handleProjectItem"
-            :class="{ show_disabled: pageType === '1' }"
-            :title="form.projectName"
-          >
+          <div class="el-input__inner inputSimulation yichu1" @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">
           <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="fileBusinessId">
@@ -286,26 +159,14 @@
           ></meetingItem>
         </el-form-item> -->
         <el-form-item label="文件" prop="listFile" 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="remark" class="special-el-form-item">
-          <el-input
-            maxlength="200"
-            rows="4"
-            type="textarea"
-            v-model="form.remark"
-            placeholder="请输入备注"
-          />
+          <el-input maxlength="200" rows="4" type="textarea" v-model="form.remark" 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>
@@ -443,7 +304,7 @@ export default {
       this.fileList = fileList;
       if (fileList && fileList.length > 0) {
         this.$refs.fileForm.clearValidate(["listFile"]);
-      }else{
+      } else {
         this.fileList = [];
       }
     },
@@ -543,10 +404,10 @@ export default {
         this.title = "修改文件资料";
         setTimeout(() => {
           this.$refs.fileItems.fileList = [];
-          if(row.fileId){
-            id=row.fileId;
+          if (row.fileId) {
+            id = row.fileId;
             this.$refs.fileItems.getListFileById(id);
-          }else {
+          } else {
             this.$refs.fileItems.getListFileBusinessId(id);
           }
         }, 300);
@@ -588,7 +449,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

ruoyi-ui/src/views/file/financialEvaluation/index.vue

@@ -1,276 +1,149 @@
 <template>
   <div class="app-container">
-    <el-form
-      v-if="type !== '2'"
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="70px"
-    >
-      <el-form-item label="文件名称" prop="fileName">
-        <el-input
-          v-model.trim="queryParams.fileName"
-          placeholder="请输入文件名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="文件类别" prop="fileType">
-        <el-select v-model="queryParams.fileType" placeholder="全部" clearable>
-          <el-option
-            v-for="dict in dict.type.file_type"
-            :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-position="top">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="文件名称" prop="fileName">
+            <el-input v-model.trim="queryParams.fileName" placeholder="请输入文件名称" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件类别" prop="fileType">
+            <el-select v-model="queryParams.fileType" placeholder="全部" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.file_type" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6"></el-col>
+        <el-col :span="6"></el-col>
+      </el-row>
 
-      <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-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'">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button
-        >
+        <el-button type="success" class="editButton" icon="el-icon-edit" size="small" :disabled="single"
+          @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple"
+          @click="handleDelete">删除</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>
+    <div class="border-card">
+      <el-table height="450" class="tableWrapper" v-loading="loading" border :data="financialEvaluationList"
+        @selection-change="handleSelectionChange">
+        <el-table-column v-if="type === '1'" type="selection" width="55" align="center" />
+        <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
+        <el-table-column label="文件名称" width="300" align="center" prop="fileName">
+          <template slot-scope="scope">
+            <div :title="scope.row.fileName">
+              {{ scope.row.fileName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="文件类别" width="160" align="center" prop="fileType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.file_type" :value="scope.row.fileType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目名称" width="200" align="center" prop="tProjectPool.projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectPool.projectName">
+              {{ scope.row.tProjectPool.projectName }}
+            </div>
+          </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
-      class="tableWrapper"
-      v-loading="loading"
-      border
-      :data="financialEvaluationList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column
-        v-if="type === '1'"
-        type="selection"
-        width="55"
-        align="center"
-      />
-      <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
-      <el-table-column
-        label="文件名称"
-        width="300"
-        align="center"
-        prop="fileName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.fileName">
-            {{ scope.row.fileName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="文件类别"
-        width="160"
-        align="center"
-        prop="fileType"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.file_type"
-            :value="scope.row.fileType"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="项目名称"
-        width="200"
-        align="center"
-        prop="tProjectPool.projectName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectPool.projectName">
-            {{ scope.row.tProjectPool.projectName }}
-          </div>
-        </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="备注" width="120" align="center" prop="remark">
+          <template slot-scope="scope">
+            <div :title="scope.row.remark">
+              {{ scope.row.remark }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" width="120" align="center" prop="createBy">
+          <template slot-scope="scope">
+            <div :title="scope.row.createBy">
+              {{ scope.row.createBy }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" width="160" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <div :title="scope.row.createTime">
+              {{ scope.row.createTime }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column width="120"  label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+            <el-button class="custom-red-color" size="small" type="text" icon="el-icon-delete"
+              @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-      <el-table-column label="备注" width="120" align="center" prop="remark">
-        <template slot-scope="scope">
-          <div :title="scope.row.remark">
-            {{ scope.row.remark }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建人"
-        width="120"
-        align="center"
-        prop="createBy"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.createBy">
-            {{ scope.row.createBy }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建时间"
-        width="160"
-        align="center"
-        prop="createTime"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.createTime">
-            {{ scope.row.createTime }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        width="120"
-        fixed="right"
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button
-          >
-          <el-button
-            class="custom-red-color"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改文件资料对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-    >
-      <el-form
-        class="special-el-form"
-        ref="fileForm"
-        :model="form"
-        :rules="rules"
-        label-width="90px"
-      >
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form class="special-el-form" ref="fileForm" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="文件名称" prop="fileName">
-          <el-input
-            maxlength="100"
-            v-model="form.fileName"
-            placeholder="请输入文件名称"
-          />
+          <el-input maxlength="100" v-model="form.fileName" placeholder="请输入文件名称" />
         </el-form-item>
 
         <el-form-item label="文件类别" prop="fileType">
           <el-select v-model="form.fileType" placeholder="请选择文件类别">
-            <el-option
-              v-for="dict in dict.type.file_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.file_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
-          <div
-            class="el-input__inner inputSimulation yichu1"
-            @click="handleProjectItem"
-            :class="{ show_disabled: pageType === '1' }"
-            :title="form.projectName"
-          >
+          <div class="el-input__inner inputSimulation yichu1" @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">
           <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="fileBusinessId">
@@ -286,26 +159,14 @@
           ></meetingItem>
         </el-form-item> -->
         <el-form-item label="文件" prop="listFile" 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="remark" class="special-el-form-item">
-          <el-input
-            maxlength="200"
-            rows="4"
-            type="textarea"
-            v-model="form.remark"
-            placeholder="请输入备注"
-          />
+          <el-input maxlength="200" rows="4" type="textarea" v-model="form.remark" 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>
@@ -443,7 +304,7 @@ export default {
       this.fileList = fileList;
       if (fileList && fileList.length > 0) {
         this.$refs.fileForm.clearValidate(["listFile"]);
-      }else{
+      } else {
         this.fileList = [];
       }
     },
@@ -543,10 +404,10 @@ export default {
         this.title = "修改文件资料";
         setTimeout(() => {
           this.$refs.fileItems.fileList = [];
-          if(row.fileId){
-            id=row.fileId;
+          if (row.fileId) {
+            id = row.fileId;
             this.$refs.fileItems.getListFileById(id);
-          }else {
+          } else {
             this.$refs.fileItems.getListFileBusinessId(id);
           }
         }, 300);
@@ -588,7 +449,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

ruoyi-ui/src/views/file/initiationReport/index.vue

@@ -1,276 +1,149 @@
 <template>
   <div class="app-container">
-    <el-form
-      v-if="type !== '2'"
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="70px"
-    >
-      <el-form-item label="文件名称" prop="fileName">
-        <el-input
-          v-model.trim="queryParams.fileName"
-          placeholder="请输入文件名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="文件类别" prop="fileType">
-        <el-select v-model="queryParams.fileType" placeholder="全部" clearable>
-          <el-option
-            v-for="dict in dict.type.file_type"
-            :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-position="top">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="文件名称" prop="fileName">
+            <el-input v-model.trim="queryParams.fileName" placeholder="请输入文件名称" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件类别" prop="fileType">
+            <el-select v-model="queryParams.fileType" placeholder="全部" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.file_type" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6"></el-col>
+        <el-col :span="6"></el-col>
+      </el-row>
 
-      <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-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'">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button
-        >
+        <el-button type="success" class="editButton" icon="el-icon-edit" size="small" :disabled="single"
+          @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple"
+          @click="handleDelete">删除</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>
+    <div class="border-card">
+      <el-table height="450" class="tableWrapper" v-loading="loading" border :data="initiationReportList"
+        @selection-change="handleSelectionChange">
+        <el-table-column v-if="type === '1'" type="selection" width="55" align="center" />
+        <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
+        <el-table-column label="文件名称" width="300" align="center" prop="fileName">
+          <template slot-scope="scope">
+            <div :title="scope.row.fileName">
+              {{ scope.row.fileName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="文件类别" width="160" align="center" prop="fileType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.file_type" :value="scope.row.fileType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目名称" width="200" align="center" prop="tProjectPool.projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectPool.projectName">
+              {{ scope.row.tProjectPool.projectName }}
+            </div>
+          </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
-      class="tableWrapper"
-      v-loading="loading"
-      border
-      :data="initiationReportList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column
-        v-if="type === '1'"
-        type="selection"
-        width="55"
-        align="center"
-      />
-      <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
-      <el-table-column
-        label="文件名称"
-        width="300"
-        align="center"
-        prop="fileName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.fileName">
-            {{ scope.row.fileName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="文件类别"
-        width="160"
-        align="center"
-        prop="fileType"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.file_type"
-            :value="scope.row.fileType"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="项目名称"
-        width="200"
-        align="center"
-        prop="tProjectPool.projectName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectPool.projectName">
-            {{ scope.row.tProjectPool.projectName }}
-          </div>
-        </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="备注" width="120" align="center" prop="remark">
+          <template slot-scope="scope">
+            <div :title="scope.row.remark">
+              {{ scope.row.remark }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" width="120" align="center" prop="createBy">
+          <template slot-scope="scope">
+            <div :title="scope.row.createBy">
+              {{ scope.row.createBy }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" width="160" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <div :title="scope.row.createTime">
+              {{ scope.row.createTime }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column width="120"  label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+            <el-button class="custom-red-color" size="small" type="text" icon="el-icon-delete"
+              @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-      <el-table-column label="备注" width="120" align="center" prop="remark">
-        <template slot-scope="scope">
-          <div :title="scope.row.remark">
-            {{ scope.row.remark }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建人"
-        width="120"
-        align="center"
-        prop="createBy"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.createBy">
-            {{ scope.row.createBy }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建时间"
-        width="160"
-        align="center"
-        prop="createTime"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.createTime">
-            {{ scope.row.createTime }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        width="120"
-        fixed="right"
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button
-          >
-          <el-button
-            class="custom-red-color"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改文件资料对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-    >
-      <el-form
-        class="special-el-form"
-        ref="fileForm"
-        :model="form"
-        :rules="rules"
-        label-width="90px"
-      >
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form class="special-el-form" ref="fileForm" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="文件名称" prop="fileName">
-          <el-input
-            maxlength="100"
-            v-model="form.fileName"
-            placeholder="请输入文件名称"
-          />
+          <el-input maxlength="100" v-model="form.fileName" placeholder="请输入文件名称" />
         </el-form-item>
 
         <el-form-item label="文件类别" prop="fileType">
           <el-select v-model="form.fileType" placeholder="请选择文件类别">
-            <el-option
-              v-for="dict in dict.type.file_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.file_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
-          <div
-            class="el-input__inner inputSimulation yichu1"
-            @click="handleProjectItem"
-            :class="{ show_disabled: pageType === '1' }"
-            :title="form.projectName"
-          >
+          <div class="el-input__inner inputSimulation yichu1" @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">
           <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="fileBusinessId">
@@ -286,26 +159,14 @@
           ></meetingItem>
         </el-form-item> -->
         <el-form-item label="文件" prop="listFile" 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="remark" class="special-el-form-item">
-          <el-input
-            maxlength="200"
-            rows="4"
-            type="textarea"
-            v-model="form.remark"
-            placeholder="请输入备注"
-          />
+          <el-input maxlength="200" rows="4" type="textarea" v-model="form.remark" 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>
@@ -443,7 +304,7 @@ export default {
       this.fileList = fileList;
       if (fileList && fileList.length > 0) {
         this.$refs.fileForm.clearValidate(["listFile"]);
-      }else{
+      } else {
         this.fileList = [];
       }
     },
@@ -543,10 +404,10 @@ export default {
         this.title = "修改文件资料";
         setTimeout(() => {
           this.$refs.fileItems.fileList = [];
-          if(row.fileId){
-            id=row.fileId;
+          if (row.fileId) {
+            id = row.fileId;
             this.$refs.fileItems.getListFileById(id);
-          }else {
+          } else {
             this.$refs.fileItems.getListFileBusinessId(id);
           }
         }, 300);
@@ -588,7 +449,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

ruoyi-ui/src/views/file/legalDueDiligence/index.vue

@@ -1,276 +1,149 @@
 <template>
   <div class="app-container">
-    <el-form
-      v-if="type !== '2'"
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="70px"
-    >
-      <el-form-item label="文件名称" prop="fileName">
-        <el-input
-          v-model.trim="queryParams.fileName"
-          placeholder="请输入文件名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="文件类别" prop="fileType">
-        <el-select v-model="queryParams.fileType" placeholder="全部" clearable>
-          <el-option
-            v-for="dict in dict.type.file_type"
-            :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-position="top">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="文件名称" prop="fileName">
+            <el-input v-model.trim="queryParams.fileName" placeholder="请输入文件名称" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件类别" prop="fileType">
+            <el-select v-model="queryParams.fileType" placeholder="全部" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.file_type" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6"></el-col>
+        <el-col :span="6"></el-col>
+      </el-row>
 
-      <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-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'">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button
-        >
+        <el-button type="success" class="editButton" icon="el-icon-edit" size="small" :disabled="single"
+          @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple"
+          @click="handleDelete">删除</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>
+    <div class="border-card">
+      <el-table height="450" class="tableWrapper" v-loading="loading" border :data="legalDueDiligenceList"
+        @selection-change="handleSelectionChange">
+        <el-table-column v-if="type === '1'" type="selection" width="55" align="center" />
+        <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
+        <el-table-column label="文件名称" width="300" align="center" prop="fileName">
+          <template slot-scope="scope">
+            <div :title="scope.row.fileName">
+              {{ scope.row.fileName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="文件类别" width="160" align="center" prop="fileType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.file_type" :value="scope.row.fileType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目名称" width="200" align="center" prop="tProjectPool.projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectPool.projectName">
+              {{ scope.row.tProjectPool.projectName }}
+            </div>
+          </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
-      class="tableWrapper"
-      v-loading="loading"
-      border
-      :data="legalDueDiligenceList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column
-        v-if="type === '1'"
-        type="selection"
-        width="55"
-        align="center"
-      />
-      <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
-      <el-table-column
-        label="文件名称"
-        width="300"
-        align="center"
-        prop="fileName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.fileName">
-            {{ scope.row.fileName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="文件类别"
-        width="160"
-        align="center"
-        prop="fileType"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.file_type"
-            :value="scope.row.fileType"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="项目名称"
-        width="200"
-        align="center"
-        prop="tProjectPool.projectName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectPool.projectName">
-            {{ scope.row.tProjectPool.projectName }}
-          </div>
-        </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="备注" width="120" align="center" prop="remark">
+          <template slot-scope="scope">
+            <div :title="scope.row.remark">
+              {{ scope.row.remark }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" width="120" align="center" prop="createBy">
+          <template slot-scope="scope">
+            <div :title="scope.row.createBy">
+              {{ scope.row.createBy }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" width="160" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <div :title="scope.row.createTime">
+              {{ scope.row.createTime }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column width="120"  label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+            <el-button class="custom-red-color" size="small" type="text" icon="el-icon-delete"
+              @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-      <el-table-column label="备注" width="120" align="center" prop="remark">
-        <template slot-scope="scope">
-          <div :title="scope.row.remark">
-            {{ scope.row.remark }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建人"
-        width="120"
-        align="center"
-        prop="createBy"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.createBy">
-            {{ scope.row.createBy }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建时间"
-        width="160"
-        align="center"
-        prop="createTime"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.createTime">
-            {{ scope.row.createTime }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        width="120"
-        fixed="right"
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button
-          >
-          <el-button
-            class="custom-red-color"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改文件资料对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-    >
-      <el-form
-        class="special-el-form"
-        ref="fileForm"
-        :model="form"
-        :rules="rules"
-        label-width="90px"
-      >
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form class="special-el-form" ref="fileForm" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="文件名称" prop="fileName">
-          <el-input
-            maxlength="100"
-            v-model="form.fileName"
-            placeholder="请输入文件名称"
-          />
+          <el-input maxlength="100" v-model="form.fileName" placeholder="请输入文件名称" />
         </el-form-item>
 
         <el-form-item label="文件类别" prop="fileType">
           <el-select v-model="form.fileType" placeholder="请选择文件类别">
-            <el-option
-              v-for="dict in dict.type.file_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.file_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
-          <div
-            class="el-input__inner inputSimulation yichu1"
-            @click="handleProjectItem"
-            :class="{ show_disabled: pageType === '1' }"
-            :title="form.projectName"
-          >
+          <div class="el-input__inner inputSimulation yichu1" @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">
           <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="fileBusinessId">
@@ -286,26 +159,14 @@
           ></meetingItem>
         </el-form-item> -->
         <el-form-item label="文件" prop="listFile" 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="remark" class="special-el-form-item">
-          <el-input
-            maxlength="200"
-            rows="4"
-            type="textarea"
-            v-model="form.remark"
-            placeholder="请输入备注"
-          />
+          <el-input maxlength="200" rows="4" type="textarea" v-model="form.remark" 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>
@@ -443,7 +304,7 @@ export default {
       this.fileList = fileList;
       if (fileList && fileList.length > 0) {
         this.$refs.fileForm.clearValidate(["listFile"]);
-      }else{
+      } else {
         this.fileList = [];
       }
     },
@@ -543,10 +404,10 @@ export default {
         this.title = "修改文件资料";
         setTimeout(() => {
           this.$refs.fileItems.fileList = [];
-          if(row.fileId){
-            id=row.fileId;
+          if (row.fileId) {
+            id = row.fileId;
             this.$refs.fileItems.getListFileById(id);
-          }else {
+          } else {
             this.$refs.fileItems.getListFileBusinessId(id);
           }
         }, 300);
@@ -588,7 +449,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

ruoyi-ui/src/views/file/marketResearch/index.vue

@@ -1,276 +1,149 @@
 <template>
   <div class="app-container">
-    <el-form
-      v-if="type !== '2'"
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="70px"
-    >
-      <el-form-item label="文件名称" prop="fileName">
-        <el-input
-          v-model.trim="queryParams.fileName"
-          placeholder="请输入文件名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="文件类别" prop="fileType">
-        <el-select v-model="queryParams.fileType" placeholder="全部" clearable>
-          <el-option
-            v-for="dict in dict.type.file_type"
-            :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-position="top">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="文件名称" prop="fileName">
+            <el-input v-model.trim="queryParams.fileName" placeholder="请输入文件名称" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件类别" prop="fileType">
+            <el-select v-model="queryParams.fileType" placeholder="全部" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.file_type" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6"></el-col>
+        <el-col :span="6"></el-col>
+      </el-row>
 
-      <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-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'">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button
-        >
+        <el-button type="success" class="editButton" icon="el-icon-edit" size="small" :disabled="single"
+          @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple"
+          @click="handleDelete">删除</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>
+    <div class="border-card">
+      <el-table height="450" class="tableWrapper" v-loading="loading" border :data="marketResearchList"
+        @selection-change="handleSelectionChange">
+        <el-table-column v-if="type === '1'" type="selection" width="55" align="center" />
+        <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
+        <el-table-column label="文件名称" width="300" align="center" prop="fileName">
+          <template slot-scope="scope">
+            <div :title="scope.row.fileName">
+              {{ scope.row.fileName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="文件类别" width="160" align="center" prop="fileType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.file_type" :value="scope.row.fileType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目名称" width="200" align="center" prop="tProjectPool.projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectPool.projectName">
+              {{ scope.row.tProjectPool.projectName }}
+            </div>
+          </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
-      class="tableWrapper"
-      v-loading="loading"
-      border
-      :data="marketResearchList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column
-        v-if="type === '1'"
-        type="selection"
-        width="55"
-        align="center"
-      />
-      <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
-      <el-table-column
-        label="文件名称"
-        width="300"
-        align="center"
-        prop="fileName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.fileName">
-            {{ scope.row.fileName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="文件类别"
-        width="160"
-        align="center"
-        prop="fileType"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.file_type"
-            :value="scope.row.fileType"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="项目名称"
-        width="200"
-        align="center"
-        prop="tProjectPool.projectName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectPool.projectName">
-            {{ scope.row.tProjectPool.projectName }}
-          </div>
-        </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="备注" width="120" align="center" prop="remark">
+          <template slot-scope="scope">
+            <div :title="scope.row.remark">
+              {{ scope.row.remark }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" width="120" align="center" prop="createBy">
+          <template slot-scope="scope">
+            <div :title="scope.row.createBy">
+              {{ scope.row.createBy }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" width="160" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <div :title="scope.row.createTime">
+              {{ scope.row.createTime }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column width="120"  label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+            <el-button class="custom-red-color" size="small" type="text" icon="el-icon-delete"
+              @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-      <el-table-column label="备注" width="120" align="center" prop="remark">
-        <template slot-scope="scope">
-          <div :title="scope.row.remark">
-            {{ scope.row.remark }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建人"
-        width="120"
-        align="center"
-        prop="createBy"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.createBy">
-            {{ scope.row.createBy }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建时间"
-        width="160"
-        align="center"
-        prop="createTime"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.createTime">
-            {{ scope.row.createTime }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        width="120"
-        fixed="right"
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button
-          >
-          <el-button
-            class="custom-red-color"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改文件资料对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-    >
-      <el-form
-        class="special-el-form"
-        ref="fileForm"
-        :model="form"
-        :rules="rules"
-        label-width="90px"
-      >
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form class="special-el-form" ref="fileForm" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="文件名称" prop="fileName">
-          <el-input
-            maxlength="100"
-            v-model="form.fileName"
-            placeholder="请输入文件名称"
-          />
+          <el-input maxlength="100" v-model="form.fileName" placeholder="请输入文件名称" />
         </el-form-item>
 
         <el-form-item label="文件类别" prop="fileType">
           <el-select v-model="form.fileType" placeholder="请选择文件类别">
-            <el-option
-              v-for="dict in dict.type.file_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.file_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
-          <div
-            class="el-input__inner inputSimulation yichu1"
-            @click="handleProjectItem"
-            :class="{ show_disabled: pageType === '1' }"
-            :title="form.projectName"
-          >
+          <div class="el-input__inner inputSimulation yichu1" @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">
           <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="fileBusinessId">
@@ -286,26 +159,14 @@
           ></meetingItem>
         </el-form-item> -->
         <el-form-item label="文件" prop="listFile" 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="remark" class="special-el-form-item">
-          <el-input
-            maxlength="200"
-            rows="4"
-            type="textarea"
-            v-model="form.remark"
-            placeholder="请输入备注"
-          />
+          <el-input maxlength="200" rows="4" type="textarea" v-model="form.remark" 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>
@@ -443,7 +304,7 @@ export default {
       this.fileList = fileList;
       if (fileList && fileList.length > 0) {
         this.$refs.fileForm.clearValidate(["listFile"]);
-      }else{
+      } else {
         this.fileList = [];
       }
     },
@@ -543,10 +404,10 @@ export default {
         this.title = "修改文件资料";
         setTimeout(() => {
           this.$refs.fileItems.fileList = [];
-          if(row.fileId){
-            id=row.fileId;
+          if (row.fileId) {
+            id = row.fileId;
             this.$refs.fileItems.getListFileById(id);
-          }else {
+          } else {
             this.$refs.fileItems.getListFileBusinessId(id);
           }
         }, 300);
@@ -588,7 +449,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

ruoyi-ui/src/views/file/projectTechnology/index.vue

@@ -1,276 +1,149 @@
 <template>
   <div class="app-container">
-    <el-form
-      v-if="type !== '2'"
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="70px"
-    >
-      <el-form-item label="文件名称" prop="fileName">
-        <el-input
-          v-model.trim="queryParams.fileName"
-          placeholder="请输入文件名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="文件类别" prop="fileType">
-        <el-select v-model="queryParams.fileType" placeholder="全部" clearable>
-          <el-option
-            v-for="dict in dict.type.file_type"
-            :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-position="top">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="文件名称" prop="fileName">
+            <el-input v-model.trim="queryParams.fileName" placeholder="请输入文件名称" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="文件类别" prop="fileType">
+            <el-select v-model="queryParams.fileType" placeholder="全部" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.file_type" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6"></el-col>
+        <el-col :span="6"></el-col>
+      </el-row>
 
-      <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-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'">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button
-        >
+        <el-button type="success" class="editButton" icon="el-icon-edit" size="small" :disabled="single"
+          @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple"
+          @click="handleDelete">删除</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>
+    <div class="border-card">
+      <el-table height="450" class="tableWrapper" v-loading="loading" border :data="projectTechnologyList"
+        @selection-change="handleSelectionChange">
+        <el-table-column v-if="type === '1'" type="selection" width="55" align="center" />
+        <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
+        <el-table-column label="文件名称" width="300" align="center" prop="fileName">
+          <template slot-scope="scope">
+            <div :title="scope.row.fileName">
+              {{ scope.row.fileName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="文件类别" width="160" align="center" prop="fileType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.file_type" :value="scope.row.fileType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目名称" width="200" align="center" prop="tProjectPool.projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectPool.projectName">
+              {{ scope.row.tProjectPool.projectName }}
+            </div>
+          </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
-      class="tableWrapper"
-      v-loading="loading"
-      border
-      :data="projectTechnologyList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column
-        v-if="type === '1'"
-        type="selection"
-        width="55"
-        align="center"
-      />
-      <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
-      <el-table-column
-        label="文件名称"
-        width="300"
-        align="center"
-        prop="fileName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.fileName">
-            {{ scope.row.fileName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="文件类别"
-        width="160"
-        align="center"
-        prop="fileType"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.file_type"
-            :value="scope.row.fileType"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="项目名称"
-        width="200"
-        align="center"
-        prop="tProjectPool.projectName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectPool.projectName">
-            {{ scope.row.tProjectPool.projectName }}
-          </div>
-        </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="备注" width="120" align="center" prop="remark">
+          <template slot-scope="scope">
+            <div :title="scope.row.remark">
+              {{ scope.row.remark }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" width="120" align="center" prop="createBy">
+          <template slot-scope="scope">
+            <div :title="scope.row.createBy">
+              {{ scope.row.createBy }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" width="160" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <div :title="scope.row.createTime">
+              {{ scope.row.createTime }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column width="120"  label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+            <el-button class="custom-red-color" size="small" type="text" icon="el-icon-delete"
+              @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-      <el-table-column label="备注" width="120" align="center" prop="remark">
-        <template slot-scope="scope">
-          <div :title="scope.row.remark">
-            {{ scope.row.remark }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建人"
-        width="120"
-        align="center"
-        prop="createBy"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.createBy">
-            {{ scope.row.createBy }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建时间"
-        width="160"
-        align="center"
-        prop="createTime"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.createTime">
-            {{ scope.row.createTime }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        width="120"
-        fixed="right"
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button
-          >
-          <el-button
-            class="custom-red-color"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改文件资料对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-    >
-      <el-form
-        class="special-el-form"
-        ref="fileForm"
-        :model="form"
-        :rules="rules"
-        label-width="90px"
-      >
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form class="special-el-form" ref="fileForm" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="文件名称" prop="fileName">
-          <el-input
-            maxlength="100"
-            v-model="form.fileName"
-            placeholder="请输入文件名称"
-          />
+          <el-input maxlength="100" v-model="form.fileName" placeholder="请输入文件名称" />
         </el-form-item>
 
         <el-form-item label="文件类别" prop="fileType">
           <el-select v-model="form.fileType" placeholder="请选择文件类别">
-            <el-option
-              v-for="dict in dict.type.file_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.file_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName">
-          <div
-            class="el-input__inner inputSimulation yichu1"
-            @click="handleProjectItem"
-            :class="{ show_disabled: pageType === '1' }"
-            :title="form.projectName"
-          >
+          <div class="el-input__inner inputSimulation yichu1" @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">
           <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="fileBusinessId">
@@ -286,26 +159,14 @@
           ></meetingItem>
         </el-form-item> -->
         <el-form-item label="文件" prop="listFile" 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="remark" class="special-el-form-item">
-          <el-input
-            maxlength="200"
-            rows="4"
-            type="textarea"
-            v-model="form.remark"
-            placeholder="请输入备注"
-          />
+          <el-input maxlength="200" rows="4" type="textarea" v-model="form.remark" 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>
@@ -443,7 +304,7 @@ export default {
       this.fileList = fileList;
       if (fileList && fileList.length > 0) {
         this.$refs.fileForm.clearValidate(["listFile"]);
-      }else{
+      } else {
         this.fileList = [];
       }
     },
@@ -543,10 +404,10 @@ export default {
         this.title = "修改文件资料";
         setTimeout(() => {
           this.$refs.fileItems.fileList = [];
-          if(row.fileId){
-            id=row.fileId;
+          if (row.fileId) {
+            id = row.fileId;
             this.$refs.fileItems.getListFileById(id);
-          }else {
+          } else {
             this.$refs.fileItems.getListFileBusinessId(id);
           }
         }, 300);
@@ -588,7 +449,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

ruoyi-ui/src/views/flowable/definition/index.vue

@@ -1,120 +1,122 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="deployTime">
-        <el-date-picker clearable size="small"
-                        v-model="queryParams.deployTime"
-                        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 :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-position="top">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="queryParams.name" placeholder="请输入名称" clearable size="small"
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="开始时间" prop="deployTime">
+            <el-date-picker clearable size="small" v-model="queryParams.deployTime" type="date"
+              value-format="yyyy-MM-dd" placeholder="选择时间" style="width: 100%;">
+            </el-date-picker>
+          </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="primary"-->
-      <!--          plain-->
       <!--          icon="el-icon-upload"-->
-      <!--          size="mini"-->
+      <!--          size="small"-->
       <!--          @click="handleImport"-->
       <!--        >导入</el-button>-->
       <!--      </el-col>-->
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleLoadXml"
-        >新增</el-button>
+        <el-button type="success" class="editButton" icon="el-icon-plus" size="small" @click="handleLoadXml">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:deployment:remove']"
-        >删除</el-button>
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['system:deployment:remove']">删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-alert title="流程设计说明" type="success">
+    <el-alert title="流程设计说明" type="success" class="editButton">
       <template slot='title'>
         <p>流程设计说明:</p>
         <div>1、XML文件中的流程定义id属性用作流程定义的key参数。</div>
         <div>2、XML文件中的流程定义name属性用作流程定义的name参数。如果未给定name属性，会使用id作为name。</div>
         <div>3、当每个唯一key的流程第一次部署时，指定版本为1。对其后所有使用相同key的流程定义，部署时版本会在该key当前已部署的最高版本号基础上加1。key参数用于区分流程定义。</div>
-        <div>4、id参数设置为{processDefinitionKey}:{processDefinitionVersion}:{generated-id}，其中generated-id是一个唯一数字，用以保证在集群环境下，流程定义缓存中，流程id的唯一性。</div>
+        <div>
+          4、id参数设置为{processDefinitionKey}:{processDefinitionVersion}:{generated-id}，其中generated-id是一个唯一数字，用以保证在集群环境下，流程定义缓存中，流程id的唯一性。
+        </div>
       </template>
     </el-alert>
-    <el-table v-loading="loading" fit :data="definitionList" border   @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="流程编号" align="center" prop="deploymentId" :show-overflow-tooltip="true"/>
-      <el-table-column label="流程标识" align="center" prop="flowKey" :show-overflow-tooltip="true" />
-      <el-table-column label="流程分类" align="center" prop="category" />
-      <el-table-column label="流程名称" align="center" width="120" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <el-button type="text" @click="handleReadImage(scope.row.deploymentId)">
-            <span>{{ scope.row.name }}</span>
-          </el-button>
-        </template>
-      </el-table-column>
-      <el-table-column label="业务表单" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <el-button v-if="scope.row.formId" type="text" @click="handleForm(scope.row.formId)">
-            <span>{{ scope.row.formName }}</span>
-          </el-button>
-          <label v-else>暂无表单</label>
-        </template>
-      </el-table-column>
-      <el-table-column label="流程版本" align="center">
-        <template slot-scope="scope">
-          <el-tag size="medium" >v{{ scope.row.version }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center">
-        <template slot-scope="scope">
-          <el-tag type="success" v-if="scope.row.suspensionState === 1">激活</el-tag>
-          <el-tag type="warning" v-if="scope.row.suspensionState === 2">挂起</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="部署时间" align="center" prop="deploymentTime" width="180"/>
-      <el-table-column label="操作" width="250" fixed="right"class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button @click="handleLoadXml(scope.row)" icon="el-icon-edit-outline" type="text" size="small">设计</el-button>
-          <el-button @click="handleAddForm(scope.row)" icon="el-icon-edit-el-icon-s-promotion" type="text" size="small" v-if="scope.row.formId == null">配置主表单</el-button>
-          <el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-pause" type="text" size="small" v-if="scope.row.suspensionState === 1">挂起</el-button>
-          <el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-play" type="text" size="small" v-if="scope.row.suspensionState === 2">激活</el-button>
-          <el-button @click="handleDelete(scope.row)" icon="el-icon-delete" type="text" size="small" v-hasPermi="['system:deployment:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="border-card">
+      <el-table height="450" v-loading="loading" fit :data="definitionList" border
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="流程编号" align="center" prop="deploymentId" :show-overflow-tooltip="true" />
+        <el-table-column label="流程标识" align="center" prop="flowKey" :show-overflow-tooltip="true" />
+        <el-table-column label="流程分类" align="center" prop="category" />
+        <el-table-column label="流程名称" align="center" width="120" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <el-button type="text" @click="handleReadImage(scope.row.deploymentId)">
+              <span>{{ scope.row.name }}</span>
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="业务表单" align="center" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.formId" type="text" @click="handleForm(scope.row.formId)">
+              <span>{{ scope.row.formName }}</span>
+            </el-button>
+            <label v-else>暂无表单</label>
+          </template>
+        </el-table-column>
+        <el-table-column label="流程版本" align="center">
+          <template slot-scope="scope">
+            <el-tag size="medium">v{{ scope.row.version }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center">
+          <template slot-scope="scope">
+            <el-tag type="success" class="editButton" v-if="scope.row.suspensionState === 1">激活</el-tag>
+            <el-tag type="warning" v-if="scope.row.suspensionState === 2">挂起</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="部署时间" align="center" prop="deploymentTime" width="180" />
+        <el-table-column label="操作" width="250"  class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button @click="handleLoadXml(scope.row)" icon="el-icon-edit-outline" type="text"
+              size="small">设计</el-button>
+            <el-button @click="handleAddForm(scope.row)" icon="el-icon-edit-el-icon-s-promotion" type="text"
+              size="small" v-if="scope.row.formId == null">配置主表单</el-button>
+            <el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-pause" type="text"
+              size="small" v-if="scope.row.suspensionState === 1">挂起</el-button>
+            <el-button @click="handleUpdateSuspensionState(scope.row)" icon="el-icon-video-play" type="text"
+              size="small" v-if="scope.row.suspensionState === 2">激活</el-button>
+            <el-button class="custom-red-color" @click="handleDelete(scope.row)" icon="el-icon-delete" type="text"
+              size="small" v-hasPermi="['system:deployment:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改流程定义对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -131,35 +133,22 @@
 
     <!-- bpmn20.xml导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xml"
-        :headers="upload.headers"
-        :action="upload.url + '?name=' + upload.name+'&category='+ upload.category"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
+      <el-upload ref="upload" :limit="1" accept=".xml" :headers="upload.headers"
+        :action="upload.url + '?name=' + upload.name + '&category=' + upload.category" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">
           将文件拖到此处，或
           <em>点击上传</em>
         </div>
         <div class="el-upload__tip" slot="tip">
-          流程名称：<el-input v-model="upload.name"/>
+          流程名称：<el-input v-model="upload.name" />
           流程分类：
           <div>
             <!--          <el-input v-model="upload.category"/>-->
             <el-select v-model="upload.category" placeholder="请选择流程分类">
-              <el-option
-                v-for="dict in dict.type.sys_process_category"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
+              <el-option v-for="dict in dict.type.sys_process_category" :key="dict.value" :label="dict.label"
+                :value="dict.value"></el-option>
             </el-select>
           </div>
         </div>
@@ -174,18 +163,18 @@
     <!-- 流程图 -->
     <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body>
       <!-- <el-image :src="readImage.src"></el-image> -->
-      <flow :flowData="flowData"/>
+      <flow :flowData="flowData" />
     </el-dialog>
 
     <!--表单配置详情-->
-<!--    <el-dialog :title="formTitle" :visible.sync="formConfOpen" width="50%" append-to-body>
+    <!--    <el-dialog :title="formTitle" :visible.sync="formConfOpen" width="50%" append-to-body>
       <div class="test-form">
         <parser :key="new Date().getTime()"  :form-conf="formConf" />
       </div>
     </el-dialog>-->
     <el-dialog :title="formTitle" :visible.sync="formConfOpen" width="50%" append-to-body>
       <div class="test-form">
-        <v-form-render :form-data="formData" ref="vFormRef"/>
+        <v-form-render :form-data="formData" ref="vFormRef" />
       </div>
     </el-dialog>
 
@@ -193,40 +182,28 @@
     <el-dialog :title="formDeployTitle" :visible.sync="formDeployOpen" width="60%" append-to-body>
       <el-row :gutter="24">
         <el-col :span="10" :xs="24">
-          <el-table
-            ref="singleTable"
-            :data="formList"
-            border
-            highlight-current-row
-            @current-change="handleCurrentChange"
-            style="width: 100%">
+          <el-table ref="singleTable" :data="formList" border highlight-current-row
+            @current-change="handleCurrentChange" style="width: 100%">
             <el-table-column label="表单编号" align="center" prop="formId" />
             <el-table-column label="表单名称" align="center" prop="formName" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button size="mini" type="text" @click="submitFormDeploy(scope.row)">确定</el-button>
+                <el-button size="small" type="text" @click="submitFormDeploy(scope.row)">确定</el-button>
               </template>
             </el-table-column>
           </el-table>
 
-          <pagination
-            small
-            layout="prev, pager, next"
-            v-show="formTotal>0"
-            :total="formTotal"
-            :page.sync="formQueryParams.pageNum"
-            :limit.sync="formQueryParams.pageSize"
-            @pagination="ListFormDeploy"
-          />
+          <pagination small layout="prev, pager, next" v-show="formTotal > 0" :total="formTotal"
+            :page.sync="formQueryParams.pageNum" :limit.sync="formQueryParams.pageSize" @pagination="ListFormDeploy" />
         </el-col>
-<!--        <el-col :span="14" :xs="24">
+        <!--        <el-col :span="14" :xs="24">
           <div v-if="currentRow">
             <parser :key="new Date().getTime()" :form-conf="currentRow" />
           </div>
         </el-col>-->
         <el-col :span="14" :xs="24">
           <div class="test-form">
-            <v-form-render :form-data="formData" ref="vFormCurrentRowRef"/>
+            <v-form-render :form-data="formData" ref="vFormCurrentRowRef" />
           </div>
         </el-col>
       </el-row>
@@ -257,7 +234,7 @@ import {
   flowXmlAndNode
 } from "@/api/flowable/definition";
 import { getToken } from "@/utils/auth";
-import { getForm, addDeployForm ,listForm } from "@/api/flowable/form";
+import { getForm, addDeployForm, listForm } from "@/api/flowable/form";
 import Parser from '@/components/parser/Parser'
 import flow from '@/views/flowable/task/myProcess/send/flow'
 import Model from './model';
@@ -296,10 +273,10 @@ export default {
       formDeployOpen: false,
       formDeployTitle: "",
       formList: [],
-      formTotal:0,
+      formTotal: 0,
       formConf: {}, // 默认表单数据
       formData: {}, // 默认表单数据
-      readImage:{
+      readImage: {
         open: false,
         src: "",
       },
@@ -332,12 +309,12 @@ export default {
         parentDeploymentId: null,
         engineVersion: null
       },
-      formQueryParams:{
+      formQueryParams: {
         pageNum: 1,
         pageSize: 10,
       },
       // 挂载表单到流程实例
-      formDeployParam:{
+      formDeployParam: {
         formId: null,
         deployId: null
       },
@@ -378,7 +355,7 @@ export default {
         type: 'warning'
       }).then(() => {
         done();
-      }).catch(() => {});
+      }).catch(() => { });
     },
     // 取消按钮
     cancel() {
@@ -414,7 +391,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.deploymentId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -424,17 +401,17 @@ export default {
       this.title = "添加流程定义";
     },
     /** 跳转到流程设计页面 */
-    handleLoadXml(row){
+    handleLoadXml(row) {
       // this.dialogVisible = true;
       // this.deployId = row.deploymentId;
-      this.$router.push({ path: '/flowable/definition/model',query: { deployId: row.deploymentId }})
+      this.$router.push({ path: '/flowable/definition/model', query: { deployId: row.deploymentId } })
     },
     /** 流程图查看 */
-    handleReadImage(deployId){
+    handleReadImage(deployId) {
       this.readImage.title = "流程图";
       this.readImage.open = true;
       // this.readImage.src = process.env.VUE_APP_BASE_API + "/flowable/definition/readImage/" + deploymentId;
-      flowXmlAndNode({deployId:deployId}).then(res => {
+      flowXmlAndNode({ deployId: deployId }).then(res => {
         this.flowData = res.data;
       })
     },
@@ -446,8 +423,8 @@ export default {
         this.formConf = JSON.parse(res.data.formContent)
       })
     },*/
-    handleForm(formId){
-      getForm(formId).then(res =>{
+    handleForm(formId) {
+      getForm(formId).then(res => {
         this.formTitle = "表单详情";
         this.formConfOpen = true;
         this.$nextTick(() => {
@@ -461,19 +438,19 @@ export default {
       })
     },
     /** 启动流程 */
-    handleDefinitionStart(row){
-      definitionStart(row.id).then(res =>{
+    handleDefinitionStart(row) {
+      definitionStart(row.id).then(res => {
         this.$modal.msgSuccess(res.msg);
       })
     },
     /** 挂载表单弹框 */
-    handleAddForm(row){
+    handleAddForm(row) {
       this.formDeployParam.deployId = row.deploymentId
       this.ListFormDeploy()
     },
     /** 挂载表单列表 */
-    ListFormDeploy(){
-      listForm(this.formQueryParams).then(res =>{
+    ListFormDeploy() {
+      listForm(this.formQueryParams).then(res => {
         this.formList = res.rows;
         this.formTotal = res.total;
         this.formDeployOpen = true;
@@ -494,19 +471,19 @@ export default {
     //   })
     // },
     /** 挂载表单 */
-    submitFormDeploy(row){
+    submitFormDeploy(row) {
       this.formDeployParam.formId = row.formId;
-      addDeployForm(this.formDeployParam).then(res =>{
+      addDeployForm(this.formDeployParam).then(res => {
         this.$modal.msgSuccess(res.msg);
         this.formDeployOpen = false;
         this.getList();
       })
     },
-   /* handleCurrentChange(data) {
-      if (data) {
-        this.currentRow = JSON.parse(data.formContent);
-      }
-    },*/
+    /* handleCurrentChange(data) {
+       if (data) {
+         this.currentRow = JSON.parse(data.formContent);
+       }
+     },*/
     handleCurrentChange(data) {
       if (data) {
         this.$nextTick(() => {
@@ -520,7 +497,7 @@ export default {
       }
     },
     /** 挂起/激活流程 */
-    handleUpdateSuspensionState(row){
+    handleUpdateSuspensionState(row) {
       let state = 1;
       if (row.suspensionState === 1) {
         state = 2
@@ -571,7 +548,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
+      }).then(function () {
         return delDeployment(deploymentIds);
       }).then(() => {
         this.getList();
@@ -585,14 +562,14 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
+      }).then(function () {
         return exportDeployment(queryParams);
       }).then(response => {
         this.download(response.msg);
       })
     },
     /** 导入bpmn.xml文件 */
-    handleImport(){
+    handleImport() {
       this.upload.title = "bpmn20.xml文件导入";
       this.upload.open = true;
     },

ruoyi-ui/src/views/flowable/expression/index.vue

@@ -1,113 +1,84 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入表达式名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_common_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </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 :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="name">
+            <el-input v-model="queryParams.name" placeholder="请输入表达式名称" clearable @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="状态" prop="status">
+            <el-select v-model="queryParams.status" placeholder="请选择状态" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.sys_common_status" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
+          </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="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:expression:add']"
-        >新增</el-button>
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd"
+          v-hasPermi="['system:expression:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:expression:edit']"
-        >修改</el-button>
+        <el-button type="success" class="editButton" icon="el-icon-edit" size="small" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['system:expression:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:expression:remove']"
-        >删除</el-button>
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['system:expression: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="['system:expression:export']"
-        >导出</el-button>
+        <el-button type="warning" icon="el-icon-download" size="small" @click="handleExport"
+          v-hasPermi="['system:expression:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+    <div class="border-card">
+      <el-table height="450" v-loading="loading" border :data="expressionList"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键" align="center" prop="id" />
+        <el-table-column label="名称" align="center" prop="name" />
+        <el-table-column label="表达式内容" align="center" prop="expression" />
+        <el-table-column label="指定类型" align="center" prop="dataType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.exp_data_type" :value="scope.row.dataType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:expression:edit']">修改</el-button>
+            <el-button class="custom-red-color" size="small" type="text" icon="el-icon-delete"
+              @click="handleDelete(scope.row)" v-hasPermi="['system:expression:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <el-table v-loading="loading" :data="expressionList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
-      <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column label="表达式内容" align="center" prop="expression" />
-      <el-table-column label="指定类型" align="center" prop="dataType" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.exp_data_type" :value="scope.row.dataType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:expression:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:expression:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改流程达式对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -120,20 +91,14 @@
         </el-form-item>
         <el-form-item label="指定类型" prop="dataType">
           <el-radio-group v-model="form.dataType">
-            <el-radio
-              v-for="dict in dict.type.exp_data_type"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
+            <el-radio v-for="dict in dict.type.exp_data_type" :key="dict.value"
+              :label="dict.value">{{ dict.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in dict.type.sys_common_status"
-              :key="dict.value"
-              :label="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
+            <el-radio v-for="dict in dict.type.sys_common_status" :key="dict.value"
+              :label="parseInt(dict.value)">{{ dict.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -153,7 +118,7 @@ import { listExpression, getExpression, delExpression, addExpression, updateExpr
 
 export default {
   name: "FlowExp",
-  dicts: ['sys_common_status','exp_data_type'],
+  dicts: ['sys_common_status', 'exp_data_type'],
   data() {
     return {
       // 遮罩层
@@ -237,7 +202,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -279,12 +244,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除流程达式编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除流程达式编号为"' + ids + '"的数据项？').then(function () {
         return delExpression(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

ruoyi-ui/src/views/flowable/task/finished/detail/flowview.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="containers main-box">
-    <el-button type="success"
+    <el-button type="success" class="editButton"
                size="small"
                icon="el-icon-zoom-in"
                @click="zoomViewport(true)">放大</el-button>

ruoyi-ui/src/views/flowable/task/finished/index.vue

@@ -1,83 +1,75 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="deployTime">
-        <el-date-picker clearable size="small"
-                        v-model="queryParams.deployTime"
-                        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 :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="name">
+            <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="开始时间" prop="deployTime">
+            <el-date-picker style="width: 100%;" clearable v-model="queryParams.deployTime" 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-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="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:deployment:remove']"
-        >删除</el-button>
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['system:deployment:remove']">删除
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+    <div class="border-card">
+      <el-table height="450" v-loading="loading" :data="finishedList" border @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true" />
+        <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true" />
+        <el-table-column label="任务节点" align="center" prop="taskName" />
+        <el-table-column label="流程发起人" align="center">
+          <template slot-scope="scope">
+            <label>{{ scope.row.startUserName }} <el-tag type="info"
+                size="small">{{ scope.row.startDeptName }}</el-tag></label>
+          </template>
+        </el-table-column>
+        <el-table-column label="接收时间" align="center" prop="createTime" width="180" />
+        <el-table-column label="审批时间" align="center" prop="finishTime" width="180" />
+        <el-table-column label="耗时" align="center" prop="duration" width="180" />
+        <el-table-column label="操作" align="center" width="150"  class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button style="color:#1890ff" size="small" type="text" icon="el-icon-tickets"
+              @click="handleFlowRecord(scope.row)">流转记录</el-button>
+            <el-button size="small" type="text" icon="el-icon-refresh-left" @click="handleRevoke(scope.row)">撤回
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <el-table v-loading="loading" :data="finishedList" border @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true"/>
-      <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true"/>
-      <el-table-column label="任务节点" align="center" prop="taskName" />
-      <el-table-column label="流程发起人" align="center">
-        <template slot-scope="scope">
-          <label>{{scope.row.startUserName}} <el-tag type="info" size="mini">{{scope.row.startDeptName}}</el-tag></label>
-        </template>
-      </el-table-column>
-      <el-table-column label="接收时间" align="center" prop="createTime" width="180"/>
-      <el-table-column label="审批时间" align="center" prop="finishTime" width="180"/>
-      <el-table-column label="耗时" align="center" prop="duration" width="180"/>
-      <el-table-column label="操作" width="150" fixed="right" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-tickets"
-            @click="handleFlowRecord(scope.row)"
-          >流转记录</el-button>
-           <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-refresh-left"
-            @click="handleRevoke(scope.row)"
-          >撤回
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
   </div>
 </template>
 
@@ -164,18 +156,18 @@ export default {
       };
       this.resetForm("form");
     },
-    setIcon(val){
-      if (val){
+    setIcon(val) {
+      if (val) {
         return "el-icon-check";
-      }else {
+      } else {
         return "el-icon-time";
       }
 
     },
-    setColor(val){
-      if (val){
+    setColor(val) {
+      if (val) {
         return "#2bc418";
-      }else {
+      } else {
         return "#b3bdbb";
       }
 
@@ -193,7 +185,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -203,21 +195,23 @@ export default {
       this.title = "添加流程定义";
     },
     /** 流程流转记录 */
-    handleFlowRecord(row){
-      this.$router.push({ path: '/flowable/task/finished/detail/index',
+    handleFlowRecord(row) {
+      this.$router.push({
+        path: '/flowable/task/finished/detail/index',
         query: {
           procInsId: row.procInsId,
           deployId: row.deployId,
           taskId: row.taskId,
-      }})
+        }
+      })
     },
     /** 撤回任务 */
-    handleRevoke(row){
+    handleRevoke(row) {
       const params = {
         instanceId: row.procInsId
       }
-      revokeProcess(params).then( res => {
-       this.$modal.msgSuccess(res.msg);
+      revokeProcess(params).then(res => {
+        this.$modal.msgSuccess(res.msg);
         this.getList();
       });
     },
@@ -258,11 +252,11 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
+      }).then(function () {
         return delDeployment(ids);
       }).then(() => {
         this.getList();
-       this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess("删除成功");
       })
     },
     /** 导出按钮操作 */
@@ -272,7 +266,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
+      }).then(function () {
         return exportDeployment(queryParams);
       }).then(response => {
         this.download(response.msg);
@@ -281,4 +275,3 @@ export default {
   }
 };
 </script>
-

ruoyi-ui/src/views/flowable/task/form/index.vue

@@ -1,330 +1,301 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="表单名称" prop="formName">
-        <el-input
-          v-model="queryParams.formName"
-          placeholder="请输入表单名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </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 :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-position="top">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="表单名称" prop="formName">
+            <el-input v-model="queryParams.formName" placeholder="请输入表单名称" clearable size="small"
+              @keyup.enter.native="handleQuery" />
+          </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">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['flowable:form:add']"
-        >新增</el-button>
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd"
+          v-hasPermi="['flowable:form:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['flowable:form:edit']"
-        >修改</el-button>
+        <el-button type="success" class="editButton" icon="el-icon-edit" size="small" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['flowable:form:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['flowable:form:remove']"
-        >删除</el-button>
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['flowable:form: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="['flowable:form:export']"
-        >导出</el-button>
+        <el-button type="warning" icon="el-icon-download" size="small" @click="handleExport"
+          v-hasPermi="['flowable:form:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+    <div class="border-card">
+      <el-table height="450" v-loading="loading" border :data="formList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="表单主键" align="center" prop="formId" />
+        <el-table-column label="表单名称" align="center" prop="formName" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">详情</el-button>
+            <el-button size="small" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['flowable:form:edit']">修改</el-button>
+            <el-button class="custom-red-color" size="small" type="text" icon="el-icon-delete"
+              @click="handleDelete(scope.row)" v-hasPermi="['flowable:form:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <el-table v-loading="loading" :data="formList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="表单主键" align="center" prop="formId" />
-      <el-table-column label="表单名称" align="center" prop="formName" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleDetail(scope.row)"
-          >详情</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['flowable:form:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['flowable:form:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
+    < <!-- 添加或修改流程表单对话框 -->
+      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-form-item label="表单名称" prop="formName">
+            <el-input v-model="form.formName" placeholder="请输入表单名称" />
+          </el-form-item>
+          <el-form-item label="表单内容">
+            <editor v-model="form.formContent" :min-height="192" />
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" placeholder="请输入备注" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
 
-    <!-- 添加或修改流程表单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="表单名称" prop="formName">
-          <el-input v-model="form.formName" placeholder="请输入表单名称" />
-        </el-form-item>
-        <el-form-item label="表单内容">
-          <editor v-model="form.formContent" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!--表单配置详情-->
-<!--    <el-dialog :title="formTitle" :visible.sync="formConfOpen" width="60%" append-to-body>
+      <!--表单配置详情-->
+      <!--    <el-dialog :title="formTitle" :visible.sync="formConfOpen" width="60%" append-to-body>
       <div class="test-form">
         <parser :key="new Date().getTime()"  :form-conf="formConf" />
       </div>
     </el-dialog>-->
-    <!--表单详情-->
-    <el-dialog :title="formTitle" :visible.sync="formRenderOpen" width="60%" append-to-body>
-      <v-form-render :form-data="formData" ref="vFormRef"/>
-    </el-dialog>
+      <!--表单详情-->
+      <el-dialog :title="formTitle" :visible.sync="formRenderOpen" width="60%" append-to-body>
+        <v-form-render :form-data="formData" ref="vFormRef" />
+      </el-dialog>
   </div>
 </template>
 
-<script>
-import { listForm, getForm, delForm, addForm, updateForm, exportForm } from "@/api/flowable/form";
-import Editor from '@/components/Editor';
-import Parser from '@/components/parser/Parser'
-export default {
-  name: "Form",
-  components: {
-    Editor,
-    Parser
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 流程表单表格数据
-      formList: [],
-      // 弹出层标题
-      title: "",
-      formConf: {}, // 默认表单数据
-      formConfOpen: false,
-      formTitle: "",// 对话框标题，用于绑定到 el-dialog 的 :title
-      formRenderOpen: false,// 控制对话框的显示与隐藏，绑定到 el-dialog 的 :visible.sync
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        formName: null,
-        formContent: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      },
-      formData: {}// 表单数据，用于传递给 v-form-render 的 :form-data，存储表单的配置信息等
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询流程表单列表 */
-    getList() {
-      this.loading = true;
-      listForm(this.queryParams).then(response => {
-        this.formList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+  <script>
+  import { listForm, getForm, delForm, addForm, updateForm, exportForm } from "@/api/flowable/form";
+  import Editor from '@/components/Editor';
+  import Parser from '@/components/parser/Parser'
+  export default {
+    name: "Form",
+    components: {
+      Editor,
+      Parser
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        formId: null,
-        formName: null,
-        formContent: null,
-        createTime: null,
-        updateTime: null,
-        createBy: null,
-        updateBy: null,
-        remark: null
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 流程表单表格数据
+        formList: [],
+        // 弹出层标题
+        title: "",
+        formConf: {}, // 默认表单数据
+        formConfOpen: false,
+        formTitle: "",// 对话框标题，用于绑定到 el-dialog 的 :title
+        formRenderOpen: false,// 控制对话框的显示与隐藏，绑定到 el-dialog 的 :visible.sync
+        // 是否显示弹出层
+        open: false,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          formName: null,
+          formContent: null,
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+        },
+        formData: {}// 表单数据，用于传递给 v-form-render 的 :form-data，存储表单的配置信息等
       };
-      this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
+    created() {
       this.getList();
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.formId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 表单配置信息 */
-   /* handleDetail(row){
-      this.formConfOpen = true;
-      this.formTitle = "流程表单配置详细";
-      this.formConf = JSON.parse(row.formContent)
-    },*/
-    /** 表单配置信息 */
-    handleDetail(row) {
-      this.formRenderOpen = true;
-      this.formTitle = "表单详情";
+    methods: {
+      /** 查询流程表单列表 */
+      getList() {
+        this.loading = true;
+        listForm(this.queryParams).then(response => {
+          this.formList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          formId: null,
+          formName: null,
+          formContent: null,
+          createTime: null,
+          updateTime: null,
+          createBy: null,
+          updateBy: null,
+          remark: null
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.formId)
+        this.single = selection.length !== 1
+        this.multiple = !selection.length
+      },
+      /** 表单配置信息 */
+      /* handleDetail(row){
+         this.formConfOpen = true;
+         this.formTitle = "流程表单配置详细";
+         this.formConf = JSON.parse(row.formContent)
+       },*/
+      /** 表单配置信息 */
+      handleDetail(row) {
+        this.formRenderOpen = true;
+        this.formTitle = "表单详情";
 
-      this.$nextTick(() => {
-        // 回显数据
-        this.$refs.vFormRef.setFormJson(JSON.parse(row.formContent))
         this.$nextTick(() => {
-          // 表单禁用
-          this.$refs.vFormRef.disableForm();
+          // 回显数据
+          this.$refs.vFormRef.setFormJson(JSON.parse(row.formContent))
+          this.$nextTick(() => {
+            // 表单禁用
+            this.$refs.vFormRef.disableForm();
+          })
         })
-      })
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      // this.reset();
-      // this.open = true;
-      // this.title = "添加流程表单";
-      /*this.$router.push({ path: '/tool/build/index', query: {formId: null }})*/
-      this.$router.push({ path: '/flowable/task/flowForm/index'})
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      // this.reset();
-      // const formId = row.formId || this.ids
-      // getForm(formId).then(response => {
-      //   this.form = response.data;
-      //   this.open = true;
-      //   this.title = "修改流程表单";
-      // });
-      //this.$router.push({ path: '/tool/build/index', query: {formId: row.formId }})
-      this.$router.push({ path: '/flowable/task/flowForm/index', query: {formId: row.formId }})
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.formId != null) {
-            updateForm(this.form).then(response => {
-             this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addForm(this.form).then(response => {
-             this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        // this.reset();
+        // this.open = true;
+        // this.title = "添加流程表单";
+        /*this.$router.push({ path: '/tool/build/index', query: {formId: null }})*/
+        this.$router.push({ path: '/flowable/task/flowForm/index' })
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        // this.reset();
+        // const formId = row.formId || this.ids
+        // getForm(formId).then(response => {
+        //   this.form = response.data;
+        //   this.open = true;
+        //   this.title = "修改流程表单";
+        // });
+        //this.$router.push({ path: '/tool/build/index', query: {formId: row.formId }})
+        this.$router.push({ path: '/flowable/task/flowForm/index', query: { formId: row.formId } })
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            if (this.form.formId != null) {
+              updateForm(this.form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addForm(this.form).then(response => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
           }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const formIds = row.formId || this.ids;
-      this.$confirm('是否确认删除流程表单编号为"' + formIds + '"的数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-        return delForm(formIds);
-      }).then(() => {
-        this.getList();
-       this.$modal.msgSuccess("删除成功");
-      })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有流程表单数据项?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-        return exportForm(queryParams);
-      }).then(response => {
-        this.download(response.msg);
-      })
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const formIds = row.formId || this.ids;
+        this.$confirm('是否确认删除流程表单编号为"' + formIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function () {
+          return delForm(formIds);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        const queryParams = this.queryParams;
+        this.$confirm('是否确认导出所有流程表单数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function () {
+          return exportForm(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+      }
     }
-  }
-};
+  };
 </script>
 
-<style lang="scss" scoped>
-.test-form {
-  margin: 15px auto;
-  width: 800px;
-  padding: 15px;
-}
-</style>
+  <style lang="scss" scoped>
+  .test-form {
+    margin: 15px auto;
+    width: 800px;
+    padding: 15px;
+  }
+</style>

ruoyi-ui/src/views/flowable/task/myProcess/detail/flowview.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="containers main-box">
-    <el-button type="success"
+    <el-button type="success" class="editButton"
                size="small"
                icon="el-icon-zoom-in"
                @click="zoomViewport(true)">放大</el-button>

ruoyi-ui/src/views/flowable/task/myProcess/index.vue

@@ -1,139 +1,120 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="deployTime">
-        <el-date-picker clearable size="small"
-                        v-model="queryParams.deployTime"
-                        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 :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="name">
+            <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="开始时间" prop="deployTime">
+            <el-date-picker style="width: 100%;" clearable v-model="queryParams.deployTime" 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-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="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:deployment:add']"
-        >新增流程</el-button>
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd"
+          v-hasPermi="['system:deployment:add']">新增流程</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:deployment:remove']"
-        >删除</el-button>
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['system:deployment:remove']">删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+    <div class="border-card">
+      <el-table height="450" v-loading="loading" :data="myProcessList" border @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true" />
+        <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true" />
+        <el-table-column label="流程类别" align="center" prop="category" width="100px" />
+        <el-table-column label="流程版本" align="center" width="80px">
+          <template slot-scope="scope">
+            <el-tag size="medium">v{{ scope.row.procDefVersion }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="提交时间" align="center" prop="createTime" width="180" />
+        <el-table-column label="流程状态" align="center" width="100">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.finishTime == null" size="small">进行中</el-tag>
+            <el-tag type="success" class="editButton" v-if="scope.row.finishTime != null" size="small">已完成</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="耗时" align="center" prop="duration" width="180" />
+        <el-table-column label="当前节点" align="center" prop="taskName" />
+        <el-table-column label="办理人" align="center">
+          <template slot-scope="scope">
+            <label v-if="scope.row.assigneeName">{{ scope.row.assigneeName }} <el-tag type="info"
+                size="small">{{ scope.row.assigneeDeptName }}</el-tag></label>
+            <!--          <label v-if="scope.row.candidate">{{scope.row.candidate}}</label>-->
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="150"  class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button style="color:#1890ff" @click="handleFlowRecord(scope.row)" type="text" size="small">详情</el-button>
+            <el-button @click="handleStop(scope.row)" type="text" size="small">取消申请</el-button>
+            <el-button class="custom-red-color" @click="handleDelete(scope.row)" type="text" size="small"
+              v-hasPermi="['system:deployment:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <el-table v-loading="loading" :data="myProcessList" border @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true"/>
-      <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true"/>
-      <el-table-column label="流程类别" align="center" prop="category" width="100px" />
-      <el-table-column label="流程版本" align="center" width="80px">
-        <template slot-scope="scope">
-          <el-tag size="medium" >v{{ scope.row.procDefVersion }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="提交时间" align="center" prop="createTime" width="180"/>
-      <el-table-column label="流程状态" align="center" width="100">
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.finishTime == null" size="mini">进行中</el-tag>
-          <el-tag type="success" v-if="scope.row.finishTime != null" size="mini">已完成</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="耗时" align="center" prop="duration" width="180"/>
-      <el-table-column label="当前节点" align="center" prop="taskName"/>
-      <el-table-column label="办理人" align="center">
-        <template slot-scope="scope">
-          <label v-if="scope.row.assigneeName">{{scope.row.assigneeName}} <el-tag type="info" size="mini">{{scope.row.assigneeDeptName}}</el-tag></label>
-<!--          <label v-if="scope.row.candidate">{{scope.row.candidate}}</label>-->
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="150" fixed="right" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button @click="handleFlowRecord(scope.row)" type="text" size="small">详情</el-button>
-          <el-button @click="handleStop(scope.row)" type="text" size="small">取消申请</el-button>
-          <el-button @click="handleDelete(scope.row)" type="text" size="small" v-hasPermi="['system:deployment:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 发起流程 -->
     <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
       <el-form :model="queryProcessParams" ref="queryProcessForm" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="名称" prop="name">
-          <el-input
-            v-model="queryProcessParams.name"
-            placeholder="请输入名称"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="queryProcessParams.name" placeholder="请输入名称" clearable size="small"
+            @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleProcessQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetProcessQuery">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" size="small" @click="handleProcessQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="small" @click="resetProcessQuery">重置</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="processLoading" fit :data="definitionList" border >
+      <el-table v-loading="processLoading" fit :data="definitionList" border>
         <el-table-column label="流程名称" align="center" prop="name" />
         <el-table-column label="流程版本" align="center">
           <template slot-scope="scope">
-            <el-tag size="medium" >v{{ scope.row.version }}</el-tag>
+            <el-tag size="medium">v{{ scope.row.version }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="流程分类" align="center" prop="category" />
         <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
           <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit-outline"
-              @click="handleStartProcess(scope.row)"
-            >发起流程</el-button>
+            <el-button size="small" type="text" icon="el-icon-edit-outline"
+              @click="handleStartProcess(scope.row)">发起流程</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        v-show="processTotal>0"
-        :total="processTotal"
-        :page.sync="queryProcessParams.pageNum"
-        :limit.sync="queryProcessParams.pageSize"
-        @pagination="listDefinition"
-      />
+      <pagination v-show="processTotal > 0" :total="processTotal" :page.sync="queryProcessParams.pageNum"
+        :limit.sync="queryProcessParams.pageSize" @pagination="listDefinition" />
     </el-dialog>
 
   </div>
@@ -148,8 +129,8 @@ import {
   exportDeployment,
   flowRecord
 } from "@/api/flowable/finished";
-import { myProcessList,stopProcess } from "@/api/flowable/process";
-import {listDefinition} from "@/api/flowable/definition";
+import { myProcessList, stopProcess } from "@/api/flowable/process";
+import { listDefinition } from "@/api/flowable/definition";
 export default {
   name: "Deploy",
   components: {
@@ -169,7 +150,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      processTotal:0,
+      processTotal: 0,
       // 我发起的流程列表数据
       myProcessList: [],
       // 弹出层标题
@@ -177,7 +158,7 @@ export default {
       // 是否显示弹出层
       open: false,
       src: "",
-      definitionList:[],
+      definitionList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -270,7 +251,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.procInsId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -279,7 +260,7 @@ export default {
       this.title = "发起流程";
       this.listDefinition();
     },
-    listDefinition(){
+    listDefinition() {
       listDefinition(this.queryProcessParams).then(response => {
         this.definitionList = response.data.records;
         this.processTotal = response.data.total;
@@ -287,32 +268,35 @@ export default {
       });
     },
     /**  发起流程申请 */
-    handleStartProcess(row){
-      this.$router.push({ path: '/flowable/task/myProcess/send/index',
+    handleStartProcess(row) {
+      this.$router.push({
+        path: '/flowable/task/myProcess/send/index',
         query: {
           deployId: row.deploymentId,
           procDefId: row.id
-          }
+        }
       })
     },
     /**  取消流程申请 */
-    handleStop(row){
+    handleStop(row) {
       const params = {
         instanceId: row.procInsId
       }
-      stopProcess(params).then( res => {
-       this.$modal.msgSuccess(res.msg);
+      stopProcess(params).then(res => {
+        this.$modal.msgSuccess(res.msg);
         this.getList();
       });
     },
     /** 流程流转记录 */
-    handleFlowRecord(row){
-      this.$router.push({ path: '/flowable/task/myProcess/detail/index',
+    handleFlowRecord(row) {
+      this.$router.push({
+        path: '/flowable/task/myProcess/detail/index',
         query: {
           procInsId: row.procInsId,
           deployId: row.deployId,
           taskId: row.taskId
-      }})
+        }
+      })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -330,13 +314,13 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateDeployment(this.form).then(response => {
-             this.$modal.msgSuccess("修改成功");
+              this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
             addDeployment(this.form).then(response => {
-             this.$modal.msgSuccess("新增成功");
+              this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
@@ -355,7 +339,7 @@ export default {
         return delDeployment(ids);
       }).then(() => {
         this.getList();
-       this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess("删除成功");
       })
     },
     /** 导出按钮操作 */
@@ -374,4 +358,3 @@ export default {
   }
 };
 </script>
-

ruoyi-ui/src/views/flowable/task/myProcess/send/flowview.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="containers main-box">
-    <el-button type="success"
+    <el-button type="success" class="editButton"
                size="small"
                icon="el-icon-zoom-in"
                @click="zoomViewport(true)">放大</el-button>

ruoyi-ui/src/views/flowable/task/record/flowview.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="containers main-box">
-    <el-button type="success"
+    <el-button type="success" class="editButton"
                size="small"
                icon="el-icon-zoom-in"
                @click="zoomViewport(true)">放大</el-button>

ruoyi-ui/src/views/flowable/task/record/index.vue

@@ -13,7 +13,7 @@
           </div>
           <!-- v-if="finished === 'true'" -->
           <div style="margin-left:10%;margin-bottom: 20px;font-size: 14px;" > 
-            <el-button  icon="el-icon-edit-outline" type="success" size="mini" @click="handleComplete">审批</el-button>
+            <el-button  icon="el-icon-edit-outline" type="success" class="editButton" size="mini" @click="handleComplete">审批</el-button>
 <!--                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">委派</el-button>-->
 <!--                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleAssign">转办</el-button>-->
 <!--                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">签收</el-button>-->
@@ -75,7 +75,7 @@
                     </el-descriptions>
 
 <!--                    <p  v-if="item.comment">-->
-<!--                      <el-tag type="success" v-if="item.comment.type === '1'">  {{item.comment.comment}}</el-tag>-->
+<!--                      <el-tag type="success" class="editButton" v-if="item.comment.type === '1'">  {{item.comment.comment}}</el-tag>-->
 <!--                      <el-tag type="warning" v-if="item.comment.type === '2'">  {{item.comment.comment}}</el-tag>-->
 <!--                      <el-tag type="danger" v-if="item.comment.type === '3'">  {{item.comment.comment}}</el-tag>-->
 <!--                    </p>-->

ruoyi-ui/src/views/flowable/task/todo/detail/flowview.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="containers main-box">
-    <el-button type="success"
+    <el-button type="success" class="editButton"
                size="small"
                icon="el-icon-zoom-in"
                @click="zoomViewport(true)">放大</el-button>

ruoyi-ui/src/views/flowable/task/todo/detail/index.vue

@@ -17,7 +17,7 @@
 
             </div>
             <div style="margin-left:15%;margin-bottom: 20px;font-size: 14px;">
-              <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
+              <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" class="editButton" size="mini"
                          @click="handleComplete">审批
               </el-button>
               &lt;!&ndash;                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">委派</el-button>&ndash;&gt;

ruoyi-ui/src/views/flowable/task/todo/index.vue

@@ -1,86 +1,81 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="deployTime">
-        <el-date-picker clearable size="small"
-                        v-model="queryParams.deployTime"
-                        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 :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="name">
+            <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="开始时间" prop="deployTime">
+            <el-date-picker style="width: 100%;" clearable v-model="queryParams.deployTime" 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-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="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:deployment:remove']"
-        >删除
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['system:deployment:remove']">删除
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+    <div class="border-card">
+      <el-table height="450" v-loading="loading" :data="todoList" border @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true" />
+        <el-table-column label="流程名称" align="center" prop="procDefName" />
+        <el-table-column label="当前节点" align="center" prop="taskName" />
+        <el-table-column label="流程版本" align="center">
+          <template slot-scope="scope">
+            <el-tag size="medium">v{{ scope.row.procDefVersion }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="流程发起人" align="center">
+          <template slot-scope="scope">
+            <label>{{ scope.row.startUserName }} <el-tag type="info"
+                size="small">{{ scope.row.startDeptName }}</el-tag></label>
+          </template>
+        </el-table-column>
+        <el-table-column label="接收时间" align="center" prop="createTime" width="180" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <!-- 1. 签收按钮：无签收人时显示 -->
+            <el-button v-if="!scope.row.assigneeId" icon="el-icon-edit-outline" size="small" type="text"
+              @click="handleSign(scope.row)">签收</el-button>
+            <!-- 2. 处理按钮：有签收人时显示 -->
+            <!--          <el-button v-else size="small" type="text" icon="el-icon-edit-outline" @click="handleProcess(scope.row)">处理</el-button>-->
+            <el-button v-else size="small" type="text" icon="el-icon-edit-outline" @click="handleProcess(scope.row)">处理
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <el-table v-loading="loading" :data="todoList" border @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true"/>
-      <el-table-column label="流程名称" align="center" prop="procDefName"/>
-      <el-table-column label="当前节点" align="center" prop="taskName"/>
-      <el-table-column label="流程版本" align="center">
-        <template slot-scope="scope">
-          <el-tag size="medium" >v{{scope.row.procDefVersion}}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="流程发起人" align="center">
-        <template slot-scope="scope">
-          <label>{{scope.row.startUserName}} <el-tag type="info" size="mini">{{scope.row.startDeptName}}</el-tag></label>
-        </template>
-      </el-table-column>
-      <el-table-column label="接收时间" align="center" prop="createTime" width="180"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <!-- 1. 签收按钮：无签收人时显示 -->
-          <el-button v-if="!scope.row.assigneeId" icon="el-icon-edit-outline" type="primary" size="mini" @click="handleSign(scope.row)">签收</el-button>
-          <!-- 2. 处理按钮：有签收人时显示 -->
-<!--          <el-button v-else size="mini" type="text" icon="el-icon-edit-outline" @click="handleProcess(scope.row)">处理</el-button>-->
-          <el-button
-            v-else
-            size="mini"
-            type="text"
-            icon="el-icon-edit-outline"
-            @click="handleProcess(scope.row)"
-          >处理
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
   </div>
 </template>
 
@@ -147,17 +142,19 @@ export default {
       });
     },
     // 跳转到处理页面
-    handleProcess(row){
-      this.$router.push({ path: '/flowable/task/todo/detail/index',
+    handleProcess(row) {
+      this.$router.push({
+        path: '/flowable/task/todo/detail/index',
         query: {
           procInsId: row.procInsId,
           executionId: row.executionId,
           deployId: row.deployId,
           taskId: row.taskId,
           taskName: row.taskName,
-          taskDefKey:row.taskDefKey,
+          taskDefKey: row.taskDefKey,
           startUser: row.startUserName + '-' + row.startDeptName,
-        }})
+        }
+      })
     },
     // 取消按钮
     cancel() {
@@ -207,7 +204,7 @@ export default {
         return delDeployment(ids);
       }).then(() => {
         this.getList();
-       this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess("删除成功");
       })
     },
     handleSign(row) {
@@ -220,4 +217,3 @@ export default {
   }
 };
 </script>
-

ruoyi-ui/src/views/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container home">
+  <div class="home">
     <!-- <el-divider /> -->
     <el-row :gutter="20">
       <el-col :xs="24" :sm="24" :md="12" :lg="8">
@@ -44,7 +44,11 @@ export default {
 </script>
 
 <style scoped lang="scss">
+::v-deep .el-card__body{
+  background-color: #fff;
+}
 .home {
+  padding: 20px;
   blockquote {
     padding: 10px 20px;
     margin: 0 0 20px;

ruoyi-ui/src/views/invest/channel/index.vue

@@ -1,431 +1,250 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="70px"
-    >
-      <!-- style="margin-left: -22px" -->
-      <el-form-item label="渠道名称" prop="channelName">
-        <el-input
-          v-model.trim="queryParams.channelName"
-          placeholder="请输入渠道名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="渠道编号" prop="channelCode">
-        <el-input
-          v-model.trim="queryParams.channelCode"
-          placeholder="请输入渠道编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="渠道类别" prop="channelType">
-        <el-select v-model="queryParams.channelType" placeholder="全部">
-          <el-option
-            v-for="dict in dict.type.channel_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="联系人" prop="contacts">
-        <el-input
-          v-model.trim="queryParams.contacts"
-          placeholder="请输入联系人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="联系电话" prop="telephone">
-        <el-input
-          v-model.trim="queryParams.telephone"
-          placeholder="请输入联系电话"
-          clearable
-          maxlength="11"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item
-        label="渠道负责人"
-        prop="channelHead"
-        style="white-space: nowrap"
-      >
-        <el-input
-          v-model="queryParams.channelHead"
-          placeholder="请输入渠道负责人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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 :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="channelName">
+            <el-input v-model.trim="queryParams.channelName" placeholder="请输入渠道名称" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="渠道编号" prop="channelCode">
+            <el-input v-model.trim="queryParams.channelCode" placeholder="请输入渠道编号" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="渠道类别" prop="channelType">
+            <el-select v-model="queryParams.channelType" placeholder="全部" style="width: 100%;">
+              <el-option v-for="dict in dict.type.channel_type" :key="dict.value" :label="dict.label"
+                :value="dict.value"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="联系人" prop="contacts">
+            <el-input v-model.trim="queryParams.contacts" placeholder="请输入联系人" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="联系电话" prop="telephone">
+            <el-input v-model.trim="queryParams.telephone" placeholder="请输入联系电话" clearable maxlength="11"
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="渠道负责人" prop="channelHead" style="white-space: nowrap">
+            <el-input v-model="queryParams.channelHead" 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="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['invest:channel:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd"
+          v-hasPermi="['invest:channel: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:channel:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" class="editButton" icon="el-icon-edit" size="small" :disabled="single" @click="handleSelectData(1)"
+          v-hasPermi="['invest:channel:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleSelectData(2)"
-          v-hasPermi="['invest:channel:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple" @click="handleSelectData(2)"
+          v-hasPermi="['invest:channel: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:channel:export']"
-          >导出</el-button
-        >
+        <el-button type="warning" icon="el-icon-download" size="small" @click="handleExport"
+          v-hasPermi="['invest:channel: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>
+    <div class="border-card">
+      <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+        :data="channelList" @selection-change="handleSelectionChange">
+        <el-table-column 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="channelCode">
+          <template slot-scope="scope">
+            <div :title="scope.row.channelCode">
+              {{ scope.row.channelCode }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="渠道名称" align="center" prop="channelName">
+          <template slot-scope="scope">
+            <div :title="scope.row.channelName" class="public-text-blue public-cursor"
+              @click.stop="handleDetail(scope.row)">
+              {{ scope.row.channelName }}
+            </div>
+          </template>
+        </el-table-column>
 
-    <el-table
-      ref="dataTable"
-      @row-click="clickRow"
-      class="tableWrapper"
-      v-loading="loading"
-      border
-      :data="channelList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column 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="channelCode">
-        <template slot-scope="scope">
-          <div :title="scope.row.channelCode">
-            {{ scope.row.channelCode }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="渠道名称" align="center" prop="channelName">
-        <template slot-scope="scope">
-          <div
-            :title="scope.row.channelName"
-            class="public-text-blue public-cursor"
-            @click.stop="handleDetail(scope.row)"
-          >
-            {{ scope.row.channelName }}
-          </div>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="渠道类别" align="center" prop="channelType">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.channel_type"
-            :value="scope.row.channelType"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="联系人" align="center" prop="contacts">
-        <template slot-scope="scope">
-          <div :title="scope.row.contacts">
-            {{ scope.row.contacts }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="联系电话" align="center" prop="telephone">
-        <template slot-scope="scope">
-          <div :title="scope.row.telephone">
-            {{ scope.row.telephone }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="渠道负责人" align="center" prop="channelHead">
-        <template slot-scope="scope">
-          <div :title="scope.row.channelHead">
-            {{ scope.row.channelHead }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.channel_status"
-            :value="scope.row.status"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createBy">
-        <template slot-scope="scope">
-          <div :title="scope.row.createBy">
-            {{ scope.row.createBy }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
-        <template slot-scope="scope">
-          <div :title="scope.row.createTime">
-            {{ scope.row.createTime }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-if="false"
-        label="操作"
-        align="center"
-        width="120"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
-          <el-button
-            v-if="user.nickName === scope.row.createBy"
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['invest:channel:edit']"
-            >修改</el-button
-          >
-          <!-- <el-button
+        <el-table-column label="渠道类别" align="center" prop="channelType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.channel_type" :value="scope.row.channelType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="联系人" align="center" prop="contacts">
+          <template slot-scope="scope">
+            <div :title="scope.row.contacts">
+              {{ scope.row.contacts }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="联系电话" align="center" prop="telephone">
+          <template slot-scope="scope">
+            <div :title="scope.row.telephone">
+              {{ scope.row.telephone }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="渠道负责人" align="center" prop="channelHead">
+          <template slot-scope="scope">
+            <div :title="scope.row.channelHead">
+              {{ scope.row.channelHead }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.channel_status" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" align="center" prop="createBy">
+          <template slot-scope="scope">
+            <div :title="scope.row.createBy">
+              {{ scope.row.createBy }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <div :title="scope.row.createTime">
+              {{ scope.row.createTime }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="false" label="操作" align="center" width="120" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button v-if="user.nickName === scope.row.createBy" size="small" type="text" icon="el-icon-edit"
+              @click="handleUpdate(scope.row)" v-hasPermi="['invest:channel:edit']">修改</el-button>
+            <!-- <el-button
             v-if="user.nickName !== scope.row.createBy"
             class="custom-blue-color"
-            size="mini"
+            size="small"
             type="text"
             icon="el-icon-search"
             @click="handleDetail(scope.row)"
             >详情</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:channel:remove']"
-            >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+            <el-button v-if="user.nickName === scope.row.createBy" class="custom-red-color" size="small" type="text"
+              icon="el-icon-delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['invest:channel:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改渠道信息对话框 -->
-    <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="100px"
-      >
+    <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="100px">
         <el-form-item label="渠道名称" prop="channelName">
-          <el-input
-            maxlength="100"
-            v-model="form.channelName"
-            placeholder="请输入渠道名称"
-          />
+          <el-input maxlength="100" v-model="form.channelName" placeholder="请输入渠道名称" />
         </el-form-item>
         <el-form-item label="组别" prop="channelGroup">
           <el-select v-model="form.channelGroup" placeholder="请选择组别">
-            <el-option
-              v-for="dict in dict.type.project_group"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.project_group" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="类别" prop="channelType">
           <el-select v-model="form.channelType" placeholder="请选择类别">
-            <el-option
-              v-for="dict in dict.type.channel_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.channel_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="联系人" prop="contacts">
-          <el-input
-            maxlength="25"
-            v-model="form.contacts"
-            placeholder="请输入联系人"
-          />
+          <el-input maxlength="25" v-model="form.contacts" placeholder="请输入联系人" />
         </el-form-item>
         <el-form-item label="联系电话" prop="telephone">
-          <el-input
-            maxlength="20"
-            v-model="form.telephone"
-            placeholder="请输入联系电话"
-          />
+          <el-input maxlength="20" v-model="form.telephone" placeholder="请输入联系电话" />
         </el-form-item>
         <el-form-item label="城市" prop="channelCity">
-          <el-input
-            maxlength="100"
-            v-model="form.channelCity"
-            placeholder="请输入城市"
-          />
+          <el-input maxlength="100" v-model="form.channelCity" placeholder="请输入城市" />
         </el-form-item>
         <el-form-item label="地址" prop="address">
-          <el-input
-            maxlength="100"
-            v-model="form.address"
-            placeholder="请输入地址"
-          />
+          <el-input maxlength="100" v-model="form.address" placeholder="请输入地址" />
         </el-form-item>
         <el-form-item label="渠道负责人" prop="channelHead">
           <div class="el-input__inner inputSimulation" @click="openSelectDept">
             {{ form.channelHead ? form.channelHead : "请选择渠道负责人" }}
           </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="status">
           <el-select v-model="form.status" placeholder="请选择状态">
-            <el-option
-              v-for="dict in dict.type.channel_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.channel_status" :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="channelBlurb"
-          class="special-el-form-item"
-        >
-          <el-input
-            maxlength="200"
-            rows="4"
-            type="textarea"
-            v-model="form.channelBlurb"
-            placeholder="请输入简介"
-          />
+        <el-form-item label="简介" prop="channelBlurb" class="special-el-form-item">
+          <el-input maxlength="200" rows="4" type="textarea" v-model="form.channelBlurb" 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="100px"
-      >
+    <el-dialog title="渠道详情" :visible.sync="openDetail" width="1000px" append-to-body>
+      <el-form class="special-el-form" ref="form" :model="form" label-width="100px">
         <el-form-item label="渠道名称" prop="channelName">
           <el-input maxlength="100" v-model="form.channelName" disabled />
         </el-form-item>
         <el-form-item label="组别" prop="channelGroup">
           <el-select v-model="form.channelGroup" disabled>
-            <el-option
-              v-for="dict in dict.type.project_group"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.project_group" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="类别" prop="channelType">
           <el-select v-model="form.channelType" disabled>
-            <el-option
-              v-for="dict in dict.type.channel_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.channel_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="联系人" prop="contacts">
@@ -445,42 +264,18 @@
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" disabled>
-            <el-option
-              v-for="dict in dict.type.channel_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+            <el-option v-for="dict in dict.type.channel_status" :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="channelBlurb"
-          class="special-el-form-item"
-        >
-          <el-input
-            maxlength="200"
-            rows="4"
-            type="textarea"
-            v-model="form.channelBlurb"
-            disabled
-          />
+        <el-form-item label="简介" prop="channelBlurb" class="special-el-form-item">
+          <el-input maxlength="200" rows="4" type="textarea" v-model="form.channelBlurb" 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">
@@ -521,7 +316,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 渠道信息表格数据
@@ -555,7 +350,7 @@ export default {
         channelBlurb: null,
         contacts: null,
         telephone: null,
-        channelCity:null,
+        channelCity: null,
         address: null,
         channelHead: null,
         status: null,
@@ -747,7 +542,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -794,5 +589,4 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

ruoyi-ui/src/views/invest/company/index.vue

@@ -60,7 +60,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
+          type="success" class="editButton"
           plain
           icon="el-icon-edit"
           size="mini"

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

@@ -1,22 +1,25 @@
 <template>
   <div class="app-container">
-    <el-form
-      v-if="type !== '2'"
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
-      <el-form-item label="合同名称" prop="contractName">
-        <el-input
-          v-model.trim="queryParams.contractName"
-          placeholder="请输入合同名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <el-form v-if="type !== '2'" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+      label-position="top">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="合同名称" prop="contractName">
+            <el-input v-model.trim="queryParams.contractName" placeholder="请输入合同名称" clearable
+              @keyup.enter.native="handleQuery" />
+          </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-form-item label="项目ID" prop="projectPoolId">
         <el-input
           v-model="queryParams.projectPoolId"
@@ -41,274 +44,143 @@
           @keyup.enter.native="handleQuery"
         />
       </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-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'">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['invest:contract:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd"
+          v-hasPermi="['invest:contract: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:contract:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" class="editButton" icon="el-icon-edit" size="small" :disabled="single" @click="handleSelectData(1)"
+          v-hasPermi="['invest:contract: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:contract:remove']"
-          >删除</el-button
-        >
-      </el-col> 
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="single" @click="handleSelectData(2)"
+          v-hasPermi="['invest:contract: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:contract:export']"
-          >导出</el-button
-        >
+        <el-button type="warning" icon="el-icon-download" size="small" @click="handleExport"
+          v-hasPermi="['invest:contract: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>
+    <div class="border-card">
+      <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+        :data="contractList" @selection-change="handleSelectionChange">
+        <el-table-column v-if="type === '1'" type="selection" width="55" align="center" />
 
-    <el-table
-      ref="dataTable"
-      @row-click="clickRow"
-      class="tableWrapper"
-      v-loading="loading"
-      border
-      :data="contractList"
-      @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="contractName">
-        <template slot-scope="scope">
-          <div :title="scope.row.contractName" class="public-text-blue public-cursor" @click.stop="handleDetail(scope.row)">
-            {{ scope.row.contractName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="合同类别" align="center" prop="contractType">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.contract_type"
-            :value="scope.row.contractType"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="项目名称"
-        align="center"
-        prop="tProjectPool.projectName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectPool.projectName">
-            {{ scope.row.tProjectPool.projectName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="项目阶段"
-        width="150"
-        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 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="contractName">
+          <template slot-scope="scope">
+            <div :title="scope.row.contractName" class="public-text-blue public-cursor"
+              @click.stop="handleDetail(scope.row)">
+              {{ scope.row.contractName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="合同类别" align="center" prop="contractType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.contract_type" :value="scope.row.contractType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目名称" align="center" prop="tProjectPool.projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectPool.projectName">
+              {{ scope.row.tProjectPool.projectName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目阶段" width="150" 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="remark">
-        <template slot-scope="scope">
-          <div :title="scope.row.remark">
-            {{ scope.row.remark }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建人"
-        width="120"
-        align="center"
-        prop="createBy"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.createBy">
-            {{ scope.row.createBy }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="创建时间"
-        width="160"
-        align="center"
-        prop="createTime"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.createTime">
-            {{ scope.row.createTime }}
-          </div>
-        </template>
-      </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark">
+          <template slot-scope="scope">
+            <div :title="scope.row.remark">
+              {{ scope.row.remark }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" width="120" align="center" prop="createBy">
+          <template slot-scope="scope">
+            <div :title="scope.row.createBy">
+              {{ scope.row.createBy }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" width="160" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <div :title="scope.row.createTime">
+              {{ scope.row.createTime }}
+            </div>
+          </template>
+        </el-table-column>
 
-      <!-- <el-table-column label="会议编号" align="center" prop="fileBusinessId" /> -->
-      <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"
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['invest:contract:edit']"
-            >修改</el-button
-          >
-          <!-- <el-button
+        <!-- <el-table-column label="会议编号" align="center" prop="fileBusinessId" /> -->
+        <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" size="small" type="text" icon="el-icon-edit"
+              @click="handleUpdate(scope.row)" v-hasPermi="['invest:contract:edit']">修改</el-button>
+            <!-- <el-button
             v-if="user.nickName !== scope.row.createBy"
             class="custom-blue-color"
-            size="mini"
+            size="small"
             type="text"
             icon="el-icon-search"
             @click="handleDetail(scope.row)"
             >详情</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:contract:remove']"
-            >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
+            <el-button v-if="user.nickName === scope.row.createBy" class="custom-red-color" size="small" type="text"
+              icon="el-icon-delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['invest:contract:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改合同管理对话框 -->
-    <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="80px"
-      >
+    <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="80px">
         <el-form-item label="合同名称" prop="contractName" class="special-el-form-item">
-          <el-input
-            maxlength="100"
-            v-model="form.contractName"
-            placeholder="请输入合同名称"
-          />
+          <el-input maxlength="100" v-model="form.contractName" placeholder="请输入合同名称" />
         </el-form-item>
         <el-form-item label="合同类别" prop="contractType" class="special-el-form-item">
           <el-select v-model="form.contractType" placeholder="请选择合同类别">
-            <el-option
-              v-for="dict in dict.type.contract_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
+            <el-option v-for="dict in dict.type.contract_type" :key="dict.value" :label="dict.label"
+              :value="dict.value" />
           </el-select>
         </el-form-item>
         <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"
-          >
+          <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-select
-            v-model="form.projectStage"
-            disabled
-            placeholder=""
-            style="width: 100%"
-          >
-            <el-option
-              v-for="dict in dict.type.project_stage"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
+          <el-select v-model="form.projectStage" disabled placeholder="" style="width: 100%">
+            <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="fileBusinessId">
@@ -324,90 +196,45 @@
           ></meetingItem>
         </el-form-item> -->
         <el-form-item label="文件" prop="listFile" 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="remark" class="special-el-form-item">
-          <el-input
-            maxlength="200"
-            rows="4"
-            type="textarea"
-            v-model="form.remark"
-            placeholder="请输入备注"
-          />
+          <el-input maxlength="200" rows="4" type="textarea" v-model="form.remark" 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="80px"
-      >
+    <el-dialog title="合同详情" :visible.sync="openDetail" width="1000px" append-to-body>
+      <el-form class="special-el-form" ref="form" :model="form" label-width="80px">
         <el-form-item label="合同名称" prop="contractName" class="special-el-form-item">
           <el-input maxlength="100" v-model="form.contractName" disabled />
         </el-form-item>
         <el-form-item label="合同类别" prop="contractType" class="special-el-form-item">
           <el-select v-model="form.contractType" disabled>
-            <el-option
-              v-for="dict in dict.type.contract_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
+            <el-option v-for="dict in dict.type.contract_type" :key="dict.value" :label="dict.label"
+              :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="项目名称" prop="projectName" class="special-el-form-item">
           <el-input type="textarea" rows="2" maxlength="100" v-model="form.projectName" disabled />
         </el-form-item>
         <el-form-item label="项目阶段" prop="projectStage" class="special-el-form-item">
-          <el-select
-            v-model="form.projectStage"
-            disabled
-            placeholder=""
-            style="width: 100%"
-          >
-            <el-option
-              v-for="dict in dict.type.project_stage"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
+          <el-select v-model="form.projectStage" disabled placeholder="" style="width: 100%">
+            <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="listFile" 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="remark" class="special-el-form-item">
-          <el-input
-            maxlength="200"
-            rows="4"
-            type="textarea"
-            v-model="form.remark"
-            disabled
-          />
+          <el-input maxlength="200" rows="4" type="textarea" v-model="form.remark" disabled />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -466,7 +293,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 合同管理表格数据
@@ -704,7 +531,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -716,7 +543,7 @@ export default {
         `contract_${new Date().getTime()}.xlsx`
       );
     },
-    
+
     clickRow(row) {
       this.$refs.dataTable.toggleRowSelection(row);
     },

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

@@ -56,7 +56,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
+          type="success" class="editButton"
           plain
           icon="el-icon-edit"
           size="mini"
@@ -188,7 +188,7 @@
       </el-table-column>
       <el-table-column
         width="120"
-        fixed="right"
+        
         label="操作"
         align="center"
         class-name="small-padding fixed-width"

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" class="editButton" 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 class="border-card">
+       <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-if="type !== '3'" v-loading="loading" border
+      :data="recordList" @selection-change="handleSelectionChange">
+      <el-table-column v-if="type === '1'" type="selection" width="55" align="center" />
+      <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>
@@ -211,14 +144,9 @@
           </div>
         </template>
       </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,5 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.inputSimulation {
-}
+
 </style>

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

@@ -513,7 +513,7 @@ export default {
     },
     type: {
       type: String,
-      default: "1", //1可编辑  2不可编辑
+      default: "1", //1可修改  2不可修改
     },
   },
   components: { fileItem, channelItem, selecDept },

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

@@ -104,7 +104,7 @@
         <el-button
           :disabled="multiple"
           plain
-          type="success"
+          type="success" class="editButton"
           v-if="stage === '1'"
           size="mini"
           icon="el-icon-edit"
@@ -231,7 +231,7 @@
         <el-button
           :disabled="multiple"
           plain
-          type="success"
+          type="success" class="editButton"
           v-if="stage !== '0'"
           size="mini"
           icon="el-icon-setting"
@@ -452,7 +452,7 @@
           </div>
         </template>
       </el-table-column>
-      <!-- fixed="right" -->
+      <!--  -->
       <el-table-column label="操作" align="center" v-if="false">
         <template slot-scope="scope">
           <!-- stage//0=全部 1=项目报备  2=评估考察 3=项目立项 4=尽职背调 5=项目投决 -->

ruoyi-ui/src/views/invest/pool/index2.vue

@@ -102,7 +102,7 @@
         <el-button
           :disabled="multiple"
           plain
-          type="success"
+          type="success" class="editButton"
           size="mini"
           icon="el-icon-setting"
           v-hasPermi="['invest:pool:stage']"

ruoyi-ui/src/views/invest/pool/index3.vue

@@ -126,7 +126,7 @@
         <el-button
           :disabled="multiple"
           plain
-          type="success"
+          type="success" class="editButton"
           size="mini"
           icon="el-icon-setting"
           v-hasPermi="['invest:pool:stage']"

ruoyi-ui/src/views/invest/pool/index4.vue

@@ -113,7 +113,7 @@
 <!--        <el-button-->
 <!--          :disabled="multiple"-->
 <!--          plain-->
-<!--          type="success"-->
+<!--          type="success" class="editButton"-->
 <!--          size="mini"-->
 <!--          icon="el-icon-setting"-->
 <!--          v-hasPermi="['invest:pool:stage']"-->

ruoyi-ui/src/views/invest/pool/index5.vue

@@ -126,7 +126,7 @@
         <el-button
           :disabled="multiple"
           plain
-          type="success"
+          type="success" class="editButton"
           size="mini"
           icon="el-icon-setting"
           v-hasPermi="['invest:pool:stage']"

ruoyi-ui/src/views/monitor/cache/index.vue

@@ -142,3 +142,8 @@ export default {
   }
 };
 </script>
+<style scoped lang="scss">
+::v-deep .el-card__body{
+  background-color: #fff;
+}
+</style>

ruoyi-ui/src/views/monitor/cache/list.vue

@@ -239,3 +239,11 @@ export default {
   },
 };
 </script>
+<style scoped lang="scss">
+::v-deep .el-card__body{
+  background-color: #fff;
+}
+.app-container {
+  height: 100vh;
+}
+</style>

ruoyi-ui/src/views/monitor/job/index.vue

@@ -1,155 +1,116 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="任务名称" prop="jobName">
-        <el-input
-          v-model="queryParams.jobName"
-          placeholder="请输入任务名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="任务组名" prop="jobGroup">
-        <el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_job_group"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="任务状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_job_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </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 :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="jobName">
+            <el-input v-model="queryParams.jobName" placeholder="请输入任务名称" clearable @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="任务组名" prop="jobGroup">
+            <el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.sys_job_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="status">
+            <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.sys_job_status" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+
+        </el-col>
+      </el-row>
+
+
+
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="搜索">
+            <el-button style="width: 100%;" type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="重置">
+            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['monitor:job:add']"
-        >新增</el-button>
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd"
+          v-hasPermi="['monitor:job:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['monitor:job:edit']"
-        >修改</el-button>
+        <el-button type="success" class="editButton" icon="el-icon-edit" size="small" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['monitor:job:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['monitor:job:remove']"
-        >删除</el-button>
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['monitor:job: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="['monitor:job:export']"
-        >导出</el-button>
+        <el-button type="warning" icon="el-icon-download" size="small" @click="handleExport"
+          v-hasPermi="['monitor:job:export']">导出</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-s-operation"
-          size="mini"
-          @click="handleJobLog"
-          v-hasPermi="['monitor:job:query']"
-        >日志</el-button>
+        <el-button type="info" icon="el-icon-s-operation" size="small" @click="handleJobLog"
+          v-hasPermi="['monitor:job:query']">日志</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+    <div class="border-card">
+      <el-table height="450" v-loading="loading" border :data="jobList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="任务编号" width="100" align="center" prop="jobId" />
+        <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
+        <el-table-column label="任务组名" align="center" prop="jobGroup">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup" />
+          </template>
+        </el-table-column>
+        <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
+        <el-table-column label="cron执行表达式" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
+        <el-table-column label="状态" align="center">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+              @change="handleStatusChange(scope.row)"></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['monitor:job:edit']">修改</el-button>
+            <el-button class="custom-red-color" size="small" type="text" icon="el-icon-delete"
+              @click="handleDelete(scope.row)" v-hasPermi="['monitor:job:remove']">删除</el-button>
+            <el-dropdown size="small" @command="(command) => handleCommand(command, scope.row)"
+              v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']">
+              <el-button size="small" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="handleRun" icon="el-icon-caret-right"
+                  v-hasPermi="['monitor:job:changeStatus']">执行一次</el-dropdown-item>
+                <el-dropdown-item command="handleView" icon="el-icon-view"
+                  v-hasPermi="['monitor:job:query']">任务详细</el-dropdown-item>
+                <el-dropdown-item command="handleJobLog" icon="el-icon-s-operation"
+                  v-hasPermi="['monitor:job:query']">调度日志</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务编号" width="100" align="center" prop="jobId" />
-      <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
-      <el-table-column label="任务组名" align="center" prop="jobGroup">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
-      <el-table-column label="cron执行表达式" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
-      <el-table-column label="状态" align="center">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="0"
-            inactive-value="1"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['monitor:job:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['monitor:job:remove']"
-          >删除</el-button>
-          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']">
-            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="handleRun" icon="el-icon-caret-right"
-                v-hasPermi="['monitor:job:changeStatus']">执行一次</el-dropdown-item>
-              <el-dropdown-item command="handleView" icon="el-icon-view"
-                v-hasPermi="['monitor:job:query']">任务详细</el-dropdown-item>
-              <el-dropdown-item command="handleJobLog" icon="el-icon-s-operation"
-                v-hasPermi="['monitor:job:query']">调度日志</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </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"
-    />
 
     <!-- 添加或修改定时任务对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
@@ -163,12 +124,8 @@
           <el-col :span="12">
             <el-form-item label="任务分组" prop="jobGroup">
               <el-select v-model="form.jobGroup" placeholder="请选择任务分组">
-                <el-option
-                  v-for="dict in dict.type.sys_job_group"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
+                <el-option v-for="dict in dict.type.sys_job_group" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -203,11 +160,8 @@
           <el-col :span="24" v-if="form.jobId !== undefined">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in dict.type.sys_job_status"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
+                <el-radio v-for="dict in dict.type.sys_job_status" :key="dict.value"
+                  :label="dict.value">{{ dict.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -237,12 +191,12 @@
     </el-dialog>
 
     <el-dialog title="Cron表达式生成器" :visible.sync="openCron" append-to-body destroy-on-close class="scrollbar">
-      <crontab @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
+      <crontab @hide="openCron = false" @fill="crontabFill" :expression="expression"></crontab>
     </el-dialog>
 
     <!-- 任务日志详细 -->
     <el-dialog title="任务详细" :visible.sync="openView" width="700px" append-to-body>
-      <el-form ref="form" :model="form" label-width="120px" size="mini">
+      <el-form ref="form" :model="form" label-width="120px" size="small">
         <el-row>
           <el-col :span="12">
             <el-form-item label="任务编号：">{{ form.jobId }}</el-form-item>
@@ -419,21 +373,21 @@ export default {
     // 任务状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.jobName + '"任务吗？').then(function() {
+      this.$modal.confirm('确认要"' + text + '""' + row.jobName + '"任务吗？').then(function () {
         return changeJobStatus(row.jobId, row.status);
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
+      }).catch(function () {
         row.status = row.status === "0" ? "1" : "0";
       });
     },
     /* 立即执行一次 */
     handleRun(row) {
-      this.$modal.confirm('确认要立即执行一次"' + row.jobName + '"任务吗？').then(function() {
+      this.$modal.confirm('确认要立即执行一次"' + row.jobName + '"任务吗？').then(function () {
         return runJob(row.jobId, row.jobGroup);
       }).then(() => {
         this.$modal.msgSuccess("执行成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 任务详细信息 */
     handleView(row) {
@@ -473,7 +427,7 @@ export default {
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.jobId != undefined) {
@@ -495,12 +449,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const jobIds = row.jobId || this.ids;
-      this.$modal.confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项？').then(function () {
         return delJob(jobIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

ruoyi-ui/src/views/monitor/job/log.vue

@@ -1,151 +1,110 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="任务名称" prop="jobName">
-        <el-input
-          v-model="queryParams.jobName"
-          placeholder="请输入任务名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="任务组名" prop="jobGroup">
-        <el-select
-          v-model="queryParams.jobGroup"
-          placeholder="请选择任务组名"
-          clearable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in dict.type.sys_job_group"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="执行状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择执行状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in dict.type.sys_common_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="执行时间">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-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 :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="jobName">
+            <el-input v-model="queryParams.jobName" placeholder="请输入任务名称" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="任务组名" prop="jobGroup">
+            <el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.sys_job_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="status">
+            <el-select v-model="queryParams.status" placeholder="请选择执行状态" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.sys_common_status" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="执行时间">
+            <el-date-picker v-model="dateRange" style="width: 100%;" value-format="yyyy-MM-dd" type="daterange"
+              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+
+
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="搜索">
+            <el-button style="width: 100%;" type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="重置">
+            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['monitor:job:remove']"
-        >删除</el-button>
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['monitor:job:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleClean"
-          v-hasPermi="['monitor:job:remove']"
-        >清空</el-button>
+        <el-button type="danger" icon="el-icon-delete" size="small" @click="handleClean"
+          v-hasPermi="['monitor:job: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="['monitor:job:export']"
-        >导出</el-button>
+        <el-button type="warning" icon="el-icon-download" size="small" @click="handleExport"
+          v-hasPermi="['monitor:job:export']">导出</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-close"
-          size="mini"
-          @click="handleClose"
-        >关闭</el-button>
+        <el-button type="warning" icon="el-icon-close" size="small" @click="handleClose">关闭</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+    <div class="border-card">
+      <el-table height="450" v-loading="loading" border :data="jobLogList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="日志编号" width="80" align="center" prop="jobLogId" />
+        <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
+        <el-table-column label="任务组名" align="center" prop="jobGroup" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup" />
+          </template>
+        </el-table-column>
+        <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
+        <el-table-column label="日志信息" align="center" prop="jobMessage" :show-overflow-tooltip="true" />
+        <el-table-column label="执行状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="执行时间" align="center" prop="createTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button style="color:#1890ff" size="small" type="text" icon="el-icon-view" @click="handleView(scope.row)"
+              v-hasPermi="['monitor:job:query']">详细</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="日志编号" width="80" align="center" prop="jobLogId" />
-      <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
-      <el-table-column label="任务组名" align="center" prop="jobGroup" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
-      <el-table-column label="日志信息" align="center" prop="jobMessage" :show-overflow-tooltip="true" />
-      <el-table-column label="执行状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="执行时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleView(scope.row)"
-            v-hasPermi="['monitor:job:query']"
-          >详细</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 调度日志详细 -->
     <el-dialog title="调度日志详细" :visible.sync="open" width="700px" append-to-body>
-      <el-form ref="form" :model="form" label-width="100px" size="mini">
+      <el-form ref="form" :model="form" label-width="100px" size="small">
         <el-row>
           <el-col :span="12">
             <el-form-item label="日志序号：">{{ form.jobLogId }}</el-form-item>
@@ -180,7 +139,7 @@
 </template>
 
 <script>
-import { getJob} from "@/api/monitor/job";
+import { getJob } from "@/api/monitor/job";
 import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog";
 
 export default {
@@ -233,10 +192,10 @@ export default {
     getList() {
       this.loading = true;
       listJobLog(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.jobLogList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
+        this.jobLogList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      }
       );
     },
     // 返回按钮
@@ -268,21 +227,21 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const jobLogIds = this.ids;
-      this.$modal.confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项？').then(function () {
         return delJobLog(jobLogIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 清空按钮操作 */
     handleClean() {
-      this.$modal.confirm('是否确认清空所有调度日志数据项？').then(function() {
+      this.$modal.confirm('是否确认清空所有调度日志数据项？').then(function () {
         return cleanJobLog();
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("清空成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

ruoyi-ui/src/views/monitor/logininfor/index.vue

@@ -1,131 +1,97 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="登录地址" prop="ipaddr">
-        <el-input
-          v-model="queryParams.ipaddr"
-          placeholder="请输入登录地址"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户名称" prop="userName">
-        <el-input
-          v-model="queryParams.userName"
-          placeholder="请输入用户名称"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="登录状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in dict.type.sys_common_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="登录时间">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="['00:00:00', '23:59:59']"
-        ></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 :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="ipaddr">
+            <el-input v-model="queryParams.ipaddr" placeholder="请输入登录地址" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="用户名称" prop="userName">
+            <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="状态" prop="status">
+            <el-select v-model="queryParams.status" placeholder="登录状态" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.sys_common_status" :key="dict.value" :label="dict.label"
+                :value="dict.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="登录时间">
+            <el-date-picker v-model="dateRange" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="搜索">
+            <el-button style="width: 100%;" type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="重置">
+            <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['monitor:logininfor:remove']"
-        >删除</el-button>
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['monitor:logininfor:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleClean"
-          v-hasPermi="['monitor:logininfor:remove']"
-        >清空</el-button>
+        <el-button type="danger" icon="el-icon-delete" size="small" @click="handleClean"
+          v-hasPermi="['monitor:logininfor:remove']">清空</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-unlock"
-          size="mini"
-          :disabled="single"
-          @click="handleUnlock"
-          v-hasPermi="['monitor:logininfor:unlock']"
-        >解锁</el-button>
+        <el-button type="primary" icon="el-icon-unlock" size="small" :disabled="single" @click="handleUnlock"
+          v-hasPermi="['monitor:logininfor:unlock']">解锁</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['monitor:logininfor:export']"
-        >导出</el-button>
+        <el-button type="warning" icon="el-icon-download" size="small" @click="handleExport"
+          v-hasPermi="['monitor:logininfor:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+    <div class="border-card">
+      <el-table height="450" ref="tables" v-loading="loading" border :data="list"
+        @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="访问编号" align="center" prop="infoId" />
+        <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom"
+          :sort-orders="['descending', 'ascending']" />
+        <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
+        <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
+        <el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true" />
+        <el-table-column label="操作系统" align="center" prop="os" />
+        <el-table-column label="登录状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作信息" align="center" prop="msg" :show-overflow-tooltip="true" />
+        <el-table-column label="登录日期" align="center" prop="loginTime" sortable="custom"
+          :sort-orders="['descending', 'ascending']" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.loginTime) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="访问编号" align="center" prop="infoId" />
-      <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
-      <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
-      <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
-      <el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true" />
-      <el-table-column label="操作系统" align="center" prop="os" />
-      <el-table-column label="登录状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作信息" align="center" prop="msg" :show-overflow-tooltip="true" />
-      <el-table-column label="登录日期" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.loginTime) }}</span>
-        </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"
-    />
   </div>
 </template>
 
@@ -156,7 +122,7 @@ export default {
       // 日期范围
       dateRange: [],
       // 默认排序
-      defaultSort: {prop: 'loginTime', order: 'descending'},
+      defaultSort: { prop: 'loginTime', order: 'descending' },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -175,10 +141,10 @@ export default {
     getList() {
       this.loading = true;
       list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.list = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
+        this.list = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      }
       );
     },
     /** 搜索按钮操作 */
@@ -196,7 +162,7 @@ export default {
     /** 多选框选中数据 */
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.infoId)
-      this.single = selection.length!=1
+      this.single = selection.length != 1
       this.multiple = !selection.length
       this.selectName = selection.map(item => item.userName);
     },
@@ -209,30 +175,30 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const infoIds = row.infoId || this.ids;
-      this.$modal.confirm('是否确认删除访问编号为"' + infoIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除访问编号为"' + infoIds + '"的数据项？').then(function () {
         return delLogininfor(infoIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 清空按钮操作 */
     handleClean() {
-      this.$modal.confirm('是否确认清空所有登录日志数据项？').then(function() {
+      this.$modal.confirm('是否确认清空所有登录日志数据项？').then(function () {
         return cleanLogininfor();
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("清空成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 解锁按钮操作 */
     handleUnlock() {
       const username = this.selectName;
-      this.$modal.confirm('是否确认解锁用户"' + username + '"数据项?').then(function() {
+      this.$modal.confirm('是否确认解锁用户"' + username + '"数据项?').then(function () {
         return unlockLogininfor(username);
       }).then(() => {
         this.$modal.msgSuccess("用户" + username + "解锁成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -243,4 +209,3 @@ export default {
   }
 };
 </script>
-

ruoyi-ui/src/views/monitor/online/index.vue

@@ -1,64 +1,68 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-      <el-form-item label="登录地址" prop="ipaddr">
-        <el-input
-          v-model="queryParams.ipaddr"
-          placeholder="请输入登录地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户名称" prop="userName">
-        <el-input
-          v-model="queryParams.userName"
-          placeholder="请输入用户名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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 :model="queryParams" ref="queryForm" size="small" :inline="true" label-position="top">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="登录地址" prop="ipaddr">
+            <el-input v-model="queryParams.ipaddr" placeholder="请输入登录地址" clearable @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="用户名称" prop="userName">
+            <el-input v-model="queryParams.userName" 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-table
-      v-loading="loading"
-      :data="list.slice((pageNum-1)*pageSize,pageNum*pageSize)"
-      style="width: 100%;"
-    >
-      <el-table-column label="序号" type="index" align="center">
-        <template slot-scope="scope">
-          <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
-      <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
-      <el-table-column label="部门名称" align="center" prop="deptName" />
-      <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
-      <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
-      <el-table-column label="浏览器" align="center" prop="browser" />
-      <el-table-column label="操作系统" align="center" prop="os" />
-      <el-table-column label="登录时间" align="center" prop="loginTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.loginTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleForceLogout(scope.row)"
-            v-hasPermi="['monitor:online:forceLogout']"
-          >强退</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="border-card">
+      <el-table height="450" v-loading="loading" :data="list.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
+        style="width: 100%;" border>
+        <el-table-column label="序号" type="index" align="center">
+          <template slot-scope="scope">
+            <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
+        <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
+        <el-table-column label="部门名称" align="center" prop="deptName" />
+        <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
+        <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
+        <el-table-column label="浏览器" align="center" prop="browser" />
+        <el-table-column label="操作系统" align="center" prop="os" />
+        <el-table-column label="登录时间" align="center" prop="loginTime" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.loginTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleForceLogout(scope.row)"
+              v-hasPermi="['monitor:online:forceLogout']">强退</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
+    </div>
 
-    <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
   </div>
 </template>
 
@@ -109,14 +113,13 @@ export default {
     },
     /** 强退按钮操作 */
     handleForceLogout(row) {
-      this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户？').then(function() {
+      this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户？').then(function () {
         return forceLogout(row.tokenId);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("强退成功");
-      }).catch(() => {});
+      }).catch(() => { });
     }
   }
 };
 </script>
-

ruoyi-ui/src/views/monitor/operlog/index.vue

@@ -1,164 +1,137 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="系统模块" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入系统模块"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="操作人员" prop="operName">
-        <el-input
-          v-model="queryParams.operName"
-          placeholder="请输入操作人员"
-          clearable
-          style="width: 240px;"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="类型" prop="businessType">
-        <el-select
-          v-model="queryParams.businessType"
-          placeholder="操作类型"
-          clearable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in dict.type.sys_oper_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="操作状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in dict.type.sys_common_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="操作时间">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="['00:00:00', '23:59:59']"
-        ></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 :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="title">
+            <el-input v-model="queryParams.title" placeholder="请输入系统模块" clearable 
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="操作人员" prop="operName">
+            <el-input v-model="queryParams.operName" placeholder="请输入操作人员" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="类型" prop="businessType">
+            <el-select v-model="queryParams.businessType" placeholder="操作类型" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.sys_oper_type" :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="status">
+            <el-select v-model="queryParams.status" placeholder="操作状态" clearable style="width: 100%;">
+              <el-option v-for="dict in dict.type.sys_common_status" :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="操作时间">
+            <el-date-picker v-model="dateRange" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"></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">
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['monitor:operlog:remove']"
-        >删除</el-button>
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['monitor:operlog:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          @click="handleClean"
-          v-hasPermi="['monitor:operlog:remove']"
-        >清空</el-button>
+        <el-button type="danger" icon="el-icon-delete" size="small" @click="handleClean"
+          v-hasPermi="['monitor:operlog: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="['monitor:operlog:export']"
-        >导出</el-button>
+        <el-button type="warning" icon="el-icon-download" size="small" @click="handleExport"
+          v-hasPermi="['monitor:operlog:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
+    <div class="border-card">
+      <el-table height="450" ref="tables" v-loading="loading" border :data="list"
+        @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+        <el-table-column type="selection" width="50" align="center" />
+        <el-table-column label="日志编号" align="center" prop="operId" />
+        <el-table-column label="系统模块" align="center" prop="title" :show-overflow-tooltip="true" />
+        <el-table-column label="操作类型" align="center" prop="businessType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_oper_type" :value="scope.row.businessType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作人员" align="center" prop="operName" width="110" :show-overflow-tooltip="true"
+          sortable="custom" :sort-orders="['descending', 'ascending']" />
+        <el-table-column label="操作地址" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
+        <el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />
+        <el-table-column label="操作状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作日期" align="center" prop="operTime" width="160" sortable="custom"
+          :sort-orders="['descending', 'ascending']">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.operTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="消耗时间" align="center" prop="costTime" width="110" :show-overflow-tooltip="true"
+          sortable="custom" :sort-orders="['descending', 'ascending']">
+          <template slot-scope="scope">
+            <span>{{ scope.row.costTime }}毫秒</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button style="color:#1890ff" size="small" type="text" icon="el-icon-view"
+              @click="handleView(scope.row, scope.index)" v-hasPermi="['monitor:operlog:query']">详细</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column type="selection" width="50" align="center" />
-      <el-table-column label="日志编号" align="center" prop="operId" />
-      <el-table-column label="系统模块" align="center" prop="title" :show-overflow-tooltip="true" />
-      <el-table-column label="操作类型" align="center" prop="businessType">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_oper_type" :value="scope.row.businessType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作人员" align="center" prop="operName" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
-      <el-table-column label="操作地址" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
-      <el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />
-      <el-table-column label="操作状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作日期" align="center" prop="operTime" width="160" sortable="custom" :sort-orders="['descending', 'ascending']">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.operTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="消耗时间" align="center" prop="costTime" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']">
-        <template slot-scope="scope">
-          <span>{{ scope.row.costTime }}毫秒</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleView(scope.row,scope.index)"
-            v-hasPermi="['monitor:operlog:query']"
-          >详细</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
 
     <!-- 操作日志详细 -->
     <el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
-      <el-form ref="form" :model="form" label-width="100px" size="mini">
+      <el-form ref="form" :model="form" label-width="100px" size="small">
         <el-row>
           <el-col :span="12">
             <el-form-item label="操作模块：">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>
-            <el-form-item
-              label="登录信息："
-            >{{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }}</el-form-item>
+            <el-form-item label="登录信息：">{{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }}</el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="请求地址：">{{ form.operUrl }}</el-form-item>
@@ -222,7 +195,7 @@ export default {
       // 日期范围
       dateRange: [],
       // 默认排序
-      defaultSort: {prop: 'operTime', order: 'descending'},
+      defaultSort: { prop: 'operTime', order: 'descending' },
       // 表单参数
       form: {},
       // 查询参数
@@ -243,11 +216,11 @@ export default {
     /** 查询登录日志 */
     getList() {
       this.loading = true;
-      list(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
-          this.list = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
+      list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.list = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      }
       );
     },
     // 操作日志类型字典翻译
@@ -285,21 +258,21 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const operIds = row.operId || this.ids;
-      this.$modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项？').then(function () {
         return delOperlog(operIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 清空按钮操作 */
     handleClean() {
-      this.$modal.confirm('是否确认清空所有操作日志数据项？').then(function() {
+      this.$modal.confirm('是否确认清空所有操作日志数据项？').then(function () {
         return cleanOperlog();
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("清空成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -310,4 +283,3 @@ export default {
   }
 };
 </script>
-

ruoyi-ui/src/views/monitor/server/index.vue

@@ -205,3 +205,11 @@ export default {
   }
 };
 </script>
+<style scoped lang="scss">
+::v-deep .el-card__body{
+  background-color: #fff;
+}
+.app-container {
+  height: 100vh;
+}
+</style>

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

@@ -1344,7 +1344,7 @@
         <el-form-item class="btnList">
           <!--          <div class="btn-group">-->
           <el-button @click="goBack">返 回</el-button>
-          <el-button type="success" @click="handleComplete(true)">同意</el-button>
+          <el-button type="success" class="editButton" @click="handleComplete(true)">同意</el-button>
           <el-button v-if="formLXApply.taskDefKey!='technicalResearch'&&formLXApply.taskDefKey!='industryResearch'&&formLXApply.taskDefKey!='president'" type="warning" @click="handleComplete(false)">驳回</el-button>
           <el-button v-if="formLXApply.taskDefKey!='decision'&&formLXApply.taskDefKey=='president'" type="warning" @click="handleComplete(false)">驳回（修改）</el-button>
           <el-button v-if="formLXApply.taskDefKey=='president'" type="danger" @click="handleComplete(false,1)">驳回（终止）</el-button>

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

@@ -1,88 +1,90 @@
 <template>
-<!--  <div class="app-container">-->
+  <!--  <div class="app-container">-->
   <div>
     <el-card shadow="hover">
       <!-- 查询表单区域 -->
-      <el-form :model="queryParams" ref="queryForm" inline>
-        <el-form-item label="项目名称" prop="projectName">
-          <el-input
-            v-model.trim="queryParams.projectName"
-            placeholder="请输入项目名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="项目概况" prop="projectOverview">
-          <el-input
-            v-model.trim="queryParams.projectOverview"
-            placeholder="请输入项目概况"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="项目亮点" prop="projectSparkle">
-          <el-input
-            v-model.trim="queryParams.projectSparkle"
-            placeholder="请输入项目亮点"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+      <el-form :model="queryParams" ref="queryForm" size="small" inline label-position="top">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="项目名称" prop="projectName">
+              <el-input v-model.trim="queryParams.projectName" placeholder="请输入项目名称" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目概况" prop="projectOverview">
+              <el-input v-model.trim="queryParams.projectOverview" placeholder="请输入项目概况" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目亮点" prop="projectSparkle">
+              <el-input v-model.trim="queryParams.projectSparkle" placeholder="请输入项目亮点" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="6">
+
+          </el-col>
+          <el-col :span="6">
+
+          </el-col>
+          <el-col :span="6"></el-col>
+          <el-col :span="6"></el-col>
+        </el-row>
         <!-- 可继续扩展其他查询表单项目，比如项目编号、负责人等 -->
-        <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-button type="warning" plain icon="el-icon-download" size="mini" @click="exportQuery">导出</el-button>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="搜索">
+              <el-button style="width: 100%;" type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重置">
+              <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="导出">
+              <el-button style="width: 100%;" type="warning" plain icon="el-icon-download"
+                @click="exportQuery">导出</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <!-- Tab 切换区域 -->
-      <el-tabs v-model="activeTab" type="card" @tab-click="handleTabClick">
+      <el-tabs v-model="activeTab" type="border-card" @tab-click="handleTabClick">
         <el-tab-pane label="待办任务" name="list1">
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myTaskList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myTaskList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
 
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                  class="public-text-blue public-cursor"
-                  @click.stop="handleInvestOppDetail(scope.row)"
-                >
+                <div :title="scope.row.projectName" class="public-text-blue public-cursor"
+                  @click.stop="handleInvestOppDetail(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 label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
             <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
-                <dict-tag
-                  :options="dict.type.project_stage"
-                  :value="scope.row.projectStage"
-                />
+                <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
             </el-table-column>
-<!--            <el-table-column
+            <!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -98,18 +100,16 @@
             <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.projectStatus] || 'info'"
-                >
+                <el-tag :type="{
+                  0: 'success',
+                  1: 'danger',
+                  2: 'warning'
+                }[scope.row.projectStatus] || 'info'">
                   {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.projectStatus] || '未知状态' }}
+                    0: '正常',
+                    1: '终止',
+                    2: '观望'
+                  }[scope.row.projectStatus] || '未知状态' }}
                 </el-tag>
               </template>
             </el-table-column>
@@ -156,15 +156,16 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div :title="scope.row.taskName"  class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -179,84 +180,60 @@
                 </div>
               </template>
             </el-table-column>
-            <!-- fixed="right" -->
+            <!--  -->
             <el-table-column label="操作" align="center" width="90" class-name="small-padding fixed-width">
               <template slot-scope="scope">
 
-                <el-button v-if="scope.row.taskDefKey=='modifyApply'" size="mini" type="text" @click="handleEdit(scope.row)">处理</el-button>
+                <el-button v-if="scope.row.taskDefKey == 'modifyApply'" type="text" size="small"
+                  @click="handleEdit(scope.row)">处理</el-button>
                 <template v-else>
-                <!-- 1. 签收按钮：无签收人时显示 -->
-                  <el-button v-if="!scope.row.assignee" type="primary" size="mini" @click="handleSign(scope.row)">签收</el-button>
+                  <!-- 1. 签收按钮：无签收人时显示 -->
+                  <el-button v-if="!scope.row.assignee" type="text" size="small"
+                    @click="handleSign(scope.row)">签收</el-button>
                   <!-- 2. 处理按钮：有签收人时显示 -->
-                  <el-button v-else size="mini" type="text" @click="handleProcess(scope.row)">处理</el-button>
-                <!-- 3. 撤回按钮：需补充逻辑（比如仅未签收可撤回，可结合 signPerson 判断） -->
-<!--                <el-button v-if="!scope.row.assignee" size="mini" type="text" icon="el-icon-refresh-right" @click="handleWithdraw(scope.row)">撤回</el-button>-->
-                <!-- 4. 详情按钮：一直显示 -->
+                  <el-button v-else type="text" size="small" @click="handleProcess(scope.row)">处理</el-button>
+                  <!-- 3. 撤回按钮：需补充逻辑（比如仅未签收可撤回，可结合 signPerson 判断） -->
+                  <!--                <el-button v-if="!scope.row.assignee" type="text" size="small" icon="el-icon-refresh-right" @click="handleWithdraw(scope.row)">撤回</el-button>-->
+                  <!-- 4. 详情按钮：一直显示 -->
 
                 </template>
-                <el-button type="text" size="mini" @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
 
           <!-- 分页 -->
-          <pagination
-            v-show="myTaskTotal > 0"
-            :total="myTaskTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyTaskList"
-          />
+          <pagination v-show="myTaskTotal > 0" :total="myTaskTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyTaskList" />
         </el-tab-pane>
 
         <el-tab-pane label="已办任务" name="list2">
           <!-- 我的单据表格 -->
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myDoneTaskList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myDoneTaskList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                  class="public-text-blue public-cursor"
-                  @click.stop="handleInvestOppDetail(scope.row)"
-                >
+                <div :title="scope.row.projectName" class="public-text-blue public-cursor"
+                  @click.stop="handleInvestOppDetail(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 label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
             <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
-                <dict-tag
-                  :options="dict.type.project_stage"
-                  :value="scope.row.projectStage"
-                />
+                <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
             </el-table-column>
-<!--            <el-table-column
+            <!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -272,18 +249,16 @@
             <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.projectStatus] || 'info'"
-                >
+                <el-tag :type="{
+                  0: 'success',
+                  1: 'danger',
+                  2: 'warning'
+                }[scope.row.projectStatus] || 'info'">
                   {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.projectStatus] || '未知状态' }}
+                    0: '正常',
+                    1: '终止',
+                    2: '观望'
+                  }[scope.row.projectStatus] || '未知状态' }}
                 </el-tag>
               </template>
             </el-table-column>
@@ -331,18 +306,20 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div  v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"  :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"
+                  :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
                 <div v-else :title="scope.row.taskName">
-                  {{ scope.row.taskName}}
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -357,69 +334,43 @@
                 </div>
               </template>
             </el-table-column>
-            <!-- fixed="right" -->
+            <!--  -->
             <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button type="text" size="mini" @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
           <!-- 分页 -->
-          <pagination
-            v-show="myDoneTaskTotal > 0"
-            :total="myDoneTaskTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyDoneTaskList"
-          />
+          <pagination v-show="myDoneTaskTotal > 0" :total="myDoneTaskTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyDoneTaskList" />
         </el-tab-pane>
-        <el-tab-pane label="我的单据" name="list3">
+        <el-tab-pane  label="我的单据" name="list3">
           <!-- 我的单据表格 -->
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                  class="public-text-blue public-cursor"
-                  @click.stop="handleInvestOppDetail(scope.row)"
-                >
+                <div :title="scope.row.projectName" class="public-text-blue public-cursor"
+                  @click.stop="handleInvestOppDetail(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 label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
             <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
-                <dict-tag
-                  :options="dict.type.project_stage"
-                  :value="scope.row.projectStage"
-                />
+                <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
             </el-table-column>
-<!--            <el-table-column
+            <!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -435,18 +386,16 @@
             <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.projectStatus] || 'info'"
-                >
+                <el-tag :type="{
+                  0: 'success',
+                  1: 'danger',
+                  2: 'warning'
+                }[scope.row.projectStatus] || 'info'">
                   {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.projectStatus] || '未知状态' }}
+                    0: '正常',
+                    1: '终止',
+                    2: '观望'
+                  }[scope.row.projectStatus] || '未知状态' }}
                 </el-tag>
               </template>
             </el-table-column>
@@ -493,15 +442,16 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -516,37 +466,32 @@
                 </div>
               </template>
             </el-table-column>
-            <!-- fixed="right" -->
+            <!--  -->
             <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button type="text" size="mini" @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
           <!-- 分页 -->
-          <pagination
-            v-show="myTotal > 0"
-            :total="myTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyList"
-          />
+          <pagination v-show="myTotal > 0" :total="myTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyList" />
         </el-tab-pane>
       </el-tabs>
     </el-card>
-  <!-- Flowable 流程图弹窗 -->
-  <!-- 流程图 -->
+    <!-- Flowable 流程图弹窗 -->
+    <!-- 流程图 -->
 
-  <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%"  append-to-body>
-    <!-- <el-image :src="readImage.src"></el-image> -->
-    <flow :flowData="flowData"/>
-  </el-dialog>
+    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body>
+      <!-- <el-image :src="readImage.src"></el-image> -->
+      <flow :flowData="flowData" />
+    </el-dialog>
 
   </div>
 </template>
 
 <script>
-import { getMyTaskList,getMyDoneTaskList,getMyList } from "@/api/project/approval/pool";
+import { getMyTaskList, getMyDoneTaskList, getMyList } from "@/api/project/approval/pool";
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { listChannel } from "@/api/invest/channel";
 import dueDiligenceList from "../../invest/components/dueDiligenceList";
@@ -572,7 +517,7 @@ export default {
   data() {
     return {
       // 当前激活的 Tab
-      activeTab:"list1",
+      activeTab: "list1",
       // 遮罩层
       loading: false,
       // 查询参数
@@ -618,7 +563,7 @@ export default {
       myTotal: 0,
       channelList: [], //渠道
       //流程图信息
-      readImage:{
+      readImage: {
         open: false,
         src: "",
       },
@@ -776,18 +721,22 @@ export default {
     handleInvestOppDetail(row) {
       const projectPoolId = row.projectPoolId;
       getPool(projectPoolId).then((response) => {
-        const pInstId=response.data.procInstId;
-        this.$router.push({ path: "/project/investOpp/detail", query: { id:
-            projectPoolId , pInstId: pInstId } });
+        const pInstId = response.data.procInstId;
+        this.$router.push({
+          path: "/myTask/project/investOpp/detail", query: {
+            id:
+              projectPoolId, pInstId: pInstId
+          }
+        });
       });
     },
     // 跳转到处理页面(暂存节点页面）
-    handleEdit(row){
+    handleEdit(row) {
       const id = row.id || this.ids;
-      const poolId=row.projectPoolId;
-      const pInstId=row.procInstId;
-      const taskId=row.taskId;
-      this.$router.push({ path: "/project/approval/edit", query: { id: poolId , pInstId: pInstId , taskId:taskId} });
+      const poolId = row.projectPoolId;
+      const pInstId = row.procInstId;
+      const taskId = row.taskId;
+      this.$router.push({ path: "/myTask/project/approval/edit", query: { id: poolId, pInstId: pInstId, taskId: taskId } });
     },
     // 签收操作
     handleSign(row) {
@@ -796,13 +745,13 @@ export default {
       this.$message.success('签收成功');
     },
     // 跳转到处理页面
-    handleProcess(row){
+    handleProcess(row) {
       const id = row.id || this.ids;
-      const poolId=row.projectPoolId;
-      const pInstId=row.procInstId;
-      const taskId=row.taskId;
+      const poolId = row.projectPoolId;
+      const pInstId = row.procInstId;
+      const taskId = row.taskId;
       this.$store.commit("SET_PROJECTITEMMESSAGE", row);
-      this.$router.push({ path: "/project/approval/audit", query: { id:poolId , pInstId: pInstId ,taskId:taskId} });
+      this.$router.push({ path: "/myTask/project/approval/audit", query: { id: poolId, pInstId: pInstId, taskId: taskId } });
 
     },
     // 撤回操作
@@ -819,9 +768,9 @@ export default {
     /*详情*/
     handleDetail(row) {
       const id = row.id || this.ids;
-      const poolId=row.projectPoolId;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/project/approval/detail", query: { id: poolId , pInstId: pInstId } });
+      const poolId = row.projectPoolId;
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/myTask/project/approval/detail", query: { id: poolId, pInstId: pInstId } });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -841,14 +790,14 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 流程图查看 */
-    handleReadImage(row){
+    handleReadImage(row) {
       this.readImage.title = "流程图";
       this.readImage.open = true;
       // this.readImage.src = process.env.VUE_APP_BASE_API + "/flowable/definition/readImage/" + deploymentId;
-      flowXmlAndNode({procInsId: row.procInstId,deployId:row.deployId}).then(res => {
+      flowXmlAndNode({ procInsId: row.procInstId, deployId: row.deployId }).then(res => {
         this.flowData = res.data;
       })
     },
@@ -860,6 +809,7 @@ export default {
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -876,12 +826,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/approval/processList.vue

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

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

@@ -1329,7 +1329,7 @@
         <el-form-item class="btnList">
           <!--          <div class="btn-group">-->
           <el-button @click="goBack">返 回</el-button>
-          <el-button type="success" @click="handleComplete(true)">同意</el-button>
+          <el-button type="success" class="editButton" @click="handleComplete(true)">同意</el-button>
           <el-button v-if="formTJApply.taskDefKey!='decision'&&formTJApply.taskDefKey!='president'" type="warning" @click="handleComplete(false)">驳回</el-button>
           <el-button v-if="formTJApply.taskDefKey=='president'" type="warning" @click="handleComplete(false)">驳回（修改）</el-button>
           <el-button v-if="formTJApply.taskDefKey=='president'" type="danger" @click="handleComplete(false,1)">驳回（终止）</el-button>

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

@@ -1,80 +1,87 @@
 <template>
-<!--  <div class="app-container">-->
+  <!--  <div class="app-container">-->
   <div>
     <el-card shadow="hover">
       <!-- 查询表单区域 -->
-      <el-form :model="queryParams" ref="queryForm" inline>
-        <el-form-item label="项目名称" prop="projectName">
-          <el-input
-            v-model.trim="queryParams.projectName"
-            placeholder="请输入项目名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="股权/其他合作商务条款" prop="provision">
-          <el-input
-            v-model.trim="queryParams.provision"
-            placeholder="请输入股权/其他合作商务条款"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+      <el-form :model="queryParams" ref="queryForm" size="small" inline label-position="top">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="项目名称" prop="projectName">
+              <el-input v-model.trim="queryParams.projectName" placeholder="请输入项目名称" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="股权/其他合作商务条款" prop="provision">
+              <el-input v-model.trim="queryParams.provision" placeholder="请输入股权/其他合作商务条款" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+
+          </el-col>
+          <el-col :span="6">
+
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="6">
+
+          </el-col>
+          <el-col :span="6">
+
+          </el-col>
+          <el-col :span="6"></el-col>
+          <el-col :span="6"></el-col>
+        </el-row>
         <!-- 可继续扩展其他查询表单项目，比如项目编号、负责人等 -->
-        <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-button type="warning" plain icon="el-icon-download" size="mini" @click="exportQuery">导出</el-button>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="搜索">
+              <el-button style="width: 100%;" type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重置">
+              <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="导出">
+              <el-button style="width: 100%;" type="warning" plain icon="el-icon-download"
+                @click="exportQuery">导出</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <!-- Tab 切换区域 -->
-      <el-tabs v-model="activeTab" type="card" @tab-click="handleTabClick">
+      <el-tabs v-model="activeTab" type="border-card" @tab-click="handleTabClick">
         <el-tab-pane label="待办任务" name="list1">
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myTaskList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myTaskList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                  class="public-text-blue public-cursor"
-                  @click.stop="handleInvestOppDetail(scope.row)"
-                >
+                <div :title="scope.row.projectName" class="public-text-blue public-cursor"
+                  @click.stop="handleInvestOppDetail(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 label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
             <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
-                <dict-tag
-                  :options="dict.type.project_stage"
-                  :value="scope.row.projectStage"
-                />
+                <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
             </el-table-column>
-<!--            <el-table-column
+            <!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -90,18 +97,16 @@
             <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.projectStatus] || 'info'"
-                >
+                <el-tag :type="{
+                  0: 'success',
+                  1: 'danger',
+                  2: 'warning'
+                }[scope.row.projectStatus] || 'info'">
                   {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.projectStatus] || '未知状态' }}
+                    0: '正常',
+                    1: '终止',
+                    2: '观望'
+                  }[scope.row.projectStatus] || '未知状态' }}
                 </el-tag>
               </template>
             </el-table-column>
@@ -141,15 +146,16 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div :title="scope.row.taskName"  class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -164,82 +170,59 @@
                 </div>
               </template>
             </el-table-column>
-            <!-- fixed="right" -->
+            <!--  -->
             <el-table-column label="操作" align="center" width="90" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button v-if="scope.row.taskDefKey=='modifyApply'" type="text" @click="handleEdit(scope.row)">处理</el-button>
+                <el-button v-if="scope.row.taskDefKey == 'modifyApply'" type="text" size="small"
+                  @click="handleEdit(scope.row)">处理</el-button>
                 <template v-else>
-                <!-- 1. 签收按钮：无签收人时显示 -->
-                  <el-button v-if="!scope.row.assignee" type="primary"  @click="handleSign(scope.row)">签收</el-button>
+                  <!-- 1. 签收按钮：无签收人时显示 -->
+                  <el-button v-if="!scope.row.assignee" type="text" size="small"
+                    @click="handleSign(scope.row)">签收</el-button>
                   <!-- 2. 处理按钮：有签收人时显示 -->
-                  <el-button v-else  type="text" @click="handleProcess(scope.row)">处理</el-button>
-                <!-- 3. 撤回按钮：需补充逻辑（比如仅未签收可撤回，可结合 signPerson 判断） -->
-<!--                <el-button v-if="!scope.row.assignee" size="mini" type="text" icon="el-icon-refresh-right" @click="handleWithdraw(scope.row)">撤回</el-button>-->
-                <!-- 4. 详情按钮：一直显示 -->
+                  <el-button v-else type="text" size="small" @click="handleProcess(scope.row)">处理</el-button>
+                  <!-- 3. 撤回按钮：需补充逻辑（比如仅未签收可撤回，可结合 signPerson 判断） -->
+                  <!--                <el-button v-if="!scope.row.assignee" size="mini" type="text" size="small" icon="el-icon-refresh-right" @click="handleWithdraw(scope.row)">撤回</el-button>-->
+                  <!-- 4. 详情按钮：一直显示 -->
 
                 </template>
-                <el-button type="text"  @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small"
+                  @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
 
           <!-- 分页 -->
-          <pagination
-            v-show="myTaskTotal > 0"
-            :total="myTaskTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyTaskList"
-          />
+          <pagination v-show="myTaskTotal > 0" :total="myTaskTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyTaskList" />
         </el-tab-pane>
 
         <el-tab-pane label="已办任务" name="list2">
           <!-- 我的单据表格 -->
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myDoneTaskList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myDoneTaskList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                  class="public-text-blue public-cursor"
-                  @click.stop="handleInvestOppDetail(scope.row)"
-                >
+                <div :title="scope.row.projectName" class="public-text-blue public-cursor"
+                  @click.stop="handleInvestOppDetail(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 label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
             <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
-                <dict-tag
-                  :options="dict.type.project_stage"
-                  :value="scope.row.projectStage"
-                />
+                <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
             </el-table-column>
-<!--            <el-table-column
+            <!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -256,18 +239,16 @@
             <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.projectStatus] || 'info'"
-                >
+                <el-tag :type="{
+                  0: 'success',
+                  1: 'danger',
+                  2: 'warning'
+                }[scope.row.projectStatus] || 'info'">
                   {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.projectStatus] || '未知状态' }}
+                    0: '正常',
+                    1: '终止',
+                    2: '观望'
+                  }[scope.row.projectStatus] || '未知状态' }}
                 </el-tag>
               </template>
             </el-table-column>
@@ -307,18 +288,20 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div  v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"  :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"
+                  :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
                 <div v-else :title="scope.row.taskName">
-                  {{ scope.row.taskName}}
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -333,69 +316,44 @@
                 </div>
               </template>
             </el-table-column>
-            <!-- fixed="right" -->
+            <!--  -->
             <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small"
+                  @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
           <!-- 分页 -->
-          <pagination
-            v-show="myDoneTaskTotal > 0"
-            :total="myDoneTaskTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyDoneTaskList"
-          />
+          <pagination v-show="myDoneTaskTotal > 0" :total="myDoneTaskTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyDoneTaskList" />
         </el-tab-pane>
         <el-tab-pane label="我的单据" name="list3">
           <!-- 我的单据表格 -->
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                  class="public-text-blue public-cursor"
-                  @click.stop="handleInvestOppDetail(scope.row)"
-                >
+                <div :title="scope.row.projectName" class="public-text-blue public-cursor"
+                  @click.stop="handleInvestOppDetail(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 label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
             <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
-                <dict-tag
-                  :options="dict.type.project_stage"
-                  :value="scope.row.projectStage"
-                />
+                <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
             </el-table-column>
-<!--            <el-table-column
+            <!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -412,18 +370,16 @@
             <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.projectStatus] || 'info'"
-                >
+                <el-tag :type="{
+                  0: 'success',
+                  1: 'danger',
+                  2: 'warning'
+                }[scope.row.projectStatus] || 'info'">
                   {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.projectStatus] || '未知状态' }}
+                    0: '正常',
+                    1: '终止',
+                    2: '观望'
+                  }[scope.row.projectStatus] || '未知状态' }}
                 </el-tag>
               </template>
             </el-table-column>
@@ -463,15 +419,16 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -488,34 +445,30 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small"
+                  @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
           <!-- 分页 -->
-          <pagination
-            v-show="myTotal > 0"
-            :total="myTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyList"
-          />
+          <pagination v-show="myTotal > 0" :total="myTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyList" />
         </el-tab-pane>
       </el-tabs>
     </el-card>
-  <!-- Flowable 流程图弹窗 -->
-  <!-- 流程图 -->
+    <!-- Flowable 流程图弹窗 -->
+    <!-- 流程图 -->
 
-  <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%"  append-to-body>
-    <!-- <el-image :src="readImage.src"></el-image> -->
-    <flow :flowData="flowData"/>
-  </el-dialog>
+    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body>
+      <!-- <el-image :src="readImage.src"></el-image> -->
+      <flow :flowData="flowData" />
+    </el-dialog>
 
   </div>
 </template>
 
 <script>
-import { getMyTaskList,getMyDoneTaskList,getMyList } from "@/api/project/decision/pool";
+import { getMyTaskList, getMyDoneTaskList, getMyList } from "@/api/project/decision/pool";
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { listChannel } from "@/api/invest/channel";
 import flow from '@/views/flowable/task/todo/detail/flow';
@@ -527,7 +480,7 @@ export default {
   data() {
     return {
       // 当前激活的 Tab
-      activeTab:"list1",
+      activeTab: "list1",
       // 遮罩层
       loading: false,
       // 查询参数
@@ -573,7 +526,7 @@ export default {
       myTotal: 0,
       channelList: [], //渠道
       //流程图信息
-      readImage:{
+      readImage: {
         open: false,
         src: "",
       },
@@ -732,18 +685,22 @@ export default {
     handleInvestOppDetail(row) {
       const projectPoolId = row.projectPoolId;
       getPool(projectPoolId).then((response) => {
-        const pInstId=response.data.procInstId;
-        this.$router.push({ path: "/project/investOpp/detail", query: { id:
-            projectPoolId , pInstId: pInstId } });
+        const pInstId = response.data.procInstId;
+        this.$router.push({
+          path: "/myTask/project/investOpp/detail", query: {
+            id:
+              projectPoolId, pInstId: pInstId
+          }
+        });
       });
     },
     // 跳转到处理页面(暂存节点页面）
-    handleEdit(row){
+    handleEdit(row) {
       const id = row.id || this.ids;
-      const poolId=row.projectPoolId;
-      const pInstId=row.procInstId; ``
-      const taskId=row.taskId;
-      this.$router.push({ path: "/project/decision/edit", query: { id: poolId , pInstId: pInstId , taskId:taskId} });
+      const poolId = row.projectPoolId;
+      const pInstId = row.procInstId; ``
+      const taskId = row.taskId;
+      this.$router.push({ path: "/myTask/project/decision/edit", query: { id: poolId, pInstId: pInstId, taskId: taskId } });
     },
     // 签收操作
     handleSign(row) {
@@ -752,13 +709,13 @@ export default {
       this.$message.success('签收成功');
     },
     // 跳转到处理页面
-    handleProcess(row){
+    handleProcess(row) {
       const id = row.id || this.ids;
-      const poolId=row.projectPoolId;
-      const pInstId=row.procInstId;
-      const taskId=row.taskId;
+      const poolId = row.projectPoolId;
+      const pInstId = row.procInstId;
+      const taskId = row.taskId;
       this.$store.commit("SET_PROJECTITEMMESSAGE", row);
-      this.$router.push({ path: "/project/decision/audit", query: { id:poolId , pInstId: pInstId ,taskId:taskId} });
+      this.$router.push({ path: "/myTask/project/decision/audit", query: { id: poolId, pInstId: pInstId, taskId: taskId } });
 
     },
     // 撤回操作
@@ -775,9 +732,9 @@ export default {
     /*详情*/
     handleDetail(row) {
       const id = row.id || this.ids;
-      const poolId=row.projectPoolId;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/project/decision/detail", query: { id: poolId , pInstId: pInstId } });
+      const poolId = row.projectPoolId;
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/myTask/project/decision/detail", query: { id: poolId, pInstId: pInstId } });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -797,15 +754,15 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 流程图查看 */
-    handleReadImage(row){
+    handleReadImage(row) {
       this.readImage.title = "流程图";
       this.readImage.open = true;
       //console.log(row)
       // this.readImage.src = process.env.VUE_APP_BASE_API + "/flowable/definition/readImage/" + deploymentId;
-      flowXmlAndNode({procInsId: row.procInstId,deployId:row.deployId}).then(res => {
+      flowXmlAndNode({ procInsId: row.procInstId, deployId: row.deployId }).then(res => {
         this.flowData = res.data;
       })
     },
@@ -817,6 +774,7 @@ export default {
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -833,12 +791,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/decision/processList.vue

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

ruoyi-ui/src/views/project/flowBase.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="approval-table">
     <table border="1" cellpadding="8" cellspacing="0">
-      <thead>
+      <thead style="background-color: #f7f7f7;">
       <tr>
         <th>节点名称</th>
         <th>审批人</th>
-        <th>审批结果</th>
+        <th style="width: 60%;">审批结果</th>
         <th>审批时间</th>
         <th v-if="procDefId && (procDefId.includes('dgt-decision'))">打分表</th>
       </tr>
@@ -127,6 +127,10 @@ export default {
 .approval-table td {
   border: 1px solid #ccc;
   padding: 8px 10px;
+  font-size: 12px;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: bold;
+  color: #333;
 }
 table {
   width: 100%;

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

@@ -501,7 +501,7 @@ export default {
     },
     type: {
       type: String,
-      default: "1", //1可编辑  2不可编辑
+      default: "1", //1可修改  2不可修改
     },
   },
   components: { fileItem, channelItem, selecDept },

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

@@ -599,7 +599,7 @@
         <el-form-item class="btnList">
 <!--          <div class="btn-group">-->
             <el-button @click="goBack">返 回</el-button>
-            <el-button type="success" @click="handleComplete(true)">同意</el-button>
+            <el-button type="success" class="editButton" @click="handleComplete(true)">同意</el-button>
             <el-button v-if="form.taskDefKey!='presidents'" type="warning" @click="handleComplete(false)">驳回</el-button>
             <el-button v-if="form.taskDefKey=='presidents'" type="warning" @click="handleComplete(false)">驳回（修改）</el-button>
             <el-button v-if="form.taskDefKey=='presidents'" type="danger" @click="handleComplete(false,1)">驳回（终止）</el-button>
@@ -621,7 +621,7 @@ export default {
   props: {
     type: {
       type: String,
-      default: "2", //1可编辑  2不可编辑
+      default: "2", //1可修改  2不可修改
     }
   },
   components: { fileItem ,flowBase},

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

@@ -589,7 +589,7 @@ export default {
   props: {
     type: {
       type: String,
-      default: "2", //1可编辑  2不可编辑
+      default: "2", //1可修改  2不可修改
     }
   },
   components: { fileItem ,flowBase},

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

@@ -500,7 +500,7 @@ export default {
     },
     type: {
       type: String,
-      default: "1", //1可编辑  2不可编辑
+      default: "1", //1可修改  2不可修改
     },
   },
   components: { fileItem, channelItem, selecDept },

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

@@ -0,0 +1,60 @@
+<template>
+  <!--  <div class="app-container">-->
+  <div>
+    <el-card shadow="hover">
+      <!-- 查询表单区域 -->
+      <el-form :model="queryParams" ref="queryForm" inline label-position="top">
+        <el-row :gutter="20">
+          <el-col :span="6">
+         
+          </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-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>
+      <!-- Tab 切换区域 -->
+       border-card
+       height="450"
+       type="text" size="small"
+       style="color:#1890ff" type="text" size="small"
+       /myTask
+        style="width: 100%;"
+       <div class="border-card"></div>
+
+       //操作栏
+       详情 style="color:#1890ff"
+       删除 class="custom-red-color"
+    </el-card>
+  </div>
+</template>

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

@@ -1,125 +1,104 @@
 <template>
-<!--  <div class="app-container">-->
+  <!--  <div class="app-container">-->
   <div>
     <el-card shadow="hover">
       <!-- 查询表单区域 -->
-      <el-form :model="queryParams" ref="queryForm" inline>
-        <el-form-item label="项目名称" prop="projectName">
-          <el-input
-            v-model.trim="queryParams.projectName"
-            placeholder="请输入项目名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="项目负责人" prop="investHead">
-          <el-input
-            v-model.trim="queryParams.investHead"
-            placeholder="请输入项目负责人"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="公司联系人" prop="projectContacts">
-          <el-input
-            v-model.trim="queryParams.projectContacts"
-            placeholder="请输入公司联系人"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="渠道" prop="channel">
-          <el-select v-model="queryParams.channel" placeholder="全部" clearable>
-            <el-option
-              v-for="item in channelList"
-              :key="item.id"
-              :label="item.channelName"
-              :value="item.id"
-            />
-            <el-option label="直接触达" value="1" />
-            <el-option label="内部推荐" value="2" />
-<!--            <el-option label="无" value="-1" />-->
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所属组别" prop="projectGroup">
-          <el-select
-            v-model="queryParams.projectGroup"
-            placeholder="全部"
-            clearable
-          >
-            <el-option
-              v-for="dict in dict.type.project_group"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
+      <el-form :model="queryParams" ref="queryForm" size="small" inline 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-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-        <el-form-item label="项目公司" prop="company">
-          <el-input
-            v-model.trim="queryParams.company"
-            placeholder="请输入项目所属公司"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="所属组别" prop="projectGroup">
+              <el-select v-model="queryParams.projectGroup" placeholder="全部" clearable style="width: 100%;">
+                <el-option v-for="dict in dict.type.project_group" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目公司" prop="company">
+              <el-input v-model.trim="queryParams.company" placeholder="请输入项目所属公司" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"></el-col>
+          <el-col :span="6"></el-col>
+        </el-row>
         <!-- 可继续扩展其他查询表单项目，比如项目编号、负责人等 -->
-        <el-form-item>
-          <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-button type="warning" plain icon="el-icon-download" size="mini" @click="exportQuery">导出</el-button>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="搜索">
+              <el-button style="width: 100%;" type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重置">
+              <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="导出">
+              <el-button style="width: 100%;" type="warning" plain icon="el-icon-download"
+                @click="exportQuery">导出</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <!-- Tab 切换区域 -->
-      <el-tabs v-model="activeTab" type="card" @tab-click="handleTabClick">
+      <el-tabs v-model="activeTab" type="border-card" @tab-click="handleTabClick">
         <el-tab-pane label="待办任务" name="list1">
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myTaskList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myTaskList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                >
+                <div :title="scope.row.projectName">
                   {{ scope.row.projectName }}
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              label="公司名称"
-              align="center"
-              prop="tProjectCompany.companyName"
-            >
+            <el-table-column label="公司名称" align="center" prop="tProjectCompany.companyName">
               <template slot-scope="scope">
                 <div :title="scope.row.tProjectCompany.companyName">
                   {{ scope.row.tProjectCompany.companyName }}
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="所属行业" align="center" prop="industry"
-            ><template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.CUSTOMER_TRADE"
-                :value="scope.row.industry"
-              />
-            </template>
+            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
-<!--            <el-table-column label="项目阶段" align="center" prop="projectStage">
+            <!--            <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
                 <dict-tag
                   :options="dict.type.project_stage"
@@ -127,7 +106,7 @@
                 />
               </template>
             </el-table-column>-->
-<!--            <el-table-column
+            <!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -141,7 +120,7 @@
               </template>
             </el-table-column>-->
 
-<!--            <el-table-column
+            <!--            <el-table-column
               label="备案时间"
               align="center"
               prop="tProjectCompany.filingTime"
@@ -152,7 +131,7 @@
             }}</span>
               </template>
             </el-table-column>-->
-<!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+            <!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 &lt;!&ndash; 定义状态文本映射对象 &ndash;&gt;
                 <el-tag
@@ -178,18 +157,11 @@
               </template>
             </el-table-column>
             <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
-            <el-table-column
-              label="渠道"
-              align="center"
-              prop="tProjectChannel.channelName"
-            >
+            <el-table-column label="渠道" align="center" prop="tProjectChannel.channelName">
               <template slot-scope="scope">
-                <div
-                  v-if="
-              scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
-            "
-                  :title="scope.row.tProjectChannel.channelName"
-                >
+                <div v-if="
+                  scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
+                " :title="scope.row.tProjectChannel.channelName">
                   {{ scope.row.tProjectChannel.channelName }}
                 </div>
                 <div v-else-if="scope.row.channel=='1'" >
@@ -215,7 +187,7 @@
                 </div>
               </template>
             </el-table-column>
-<!--            <el-table-column label="申请人" align="center" prop="startUserName">
+            <!--            <el-table-column label="申请人" align="center" prop="startUserName">
               <template slot-scope="scope">
                 <div :title="scope.row.startUserName">
                   {{ scope.row.startUserName }}
@@ -229,15 +201,16 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div :title="scope.row.taskName"  class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -254,80 +227,56 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="90" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button v-if="scope.row.taskDefKey=='modifyApply'" type="text" @click="handleEdit(scope.row)">处理</el-button>
+                <el-button v-if="scope.row.taskDefKey == 'modifyApply'" type="text" size="small"
+                  @click="handleEdit(scope.row)">处理</el-button>
                 <template v-else>
-                <!-- 1. 签收按钮：无签收人时显示 -->
-                  <el-button v-if="!scope.row.assignee" type="primary" size="mini" @click="handleSign(scope.row)">签收</el-button>
+                  <!-- 1. 签收按钮：无签收人时显示 -->
+                  <el-button v-if="!scope.row.assignee" type="text" size="small"
+                    @click="handleSign(scope.row)">签收</el-button>
                   <!-- 2. 处理按钮：有签收人时显示 -->
-                  <el-button v-else size="mini" type="text" @click="handleProcess(scope.row)">处理</el-button>
-                <!-- 3. 撤回按钮：需补充逻辑（比如仅未签收可撤回，可结合 signPerson 判断） -->
-<!--                <el-button v-if="!scope.row.assignee" size="mini" type="text" icon="el-icon-refresh-right" @click="handleWithdraw(scope.row)">撤回</el-button>-->
-                <!-- 4. 详情按钮：一直显示 -->
+                  <el-button v-else type="text" size="small" @click="handleProcess(scope.row)">处理</el-button>
+                  <!-- 3. 撤回按钮：需补充逻辑（比如仅未签收可撤回，可结合 signPerson 判断） -->
+                  <!--                <el-button v-if="!scope.row.assignee" size="mini" type="text" icon="el-icon-refresh-right" @click="handleWithdraw(scope.row)">撤回</el-button>-->
+                  <!-- 4. 详情按钮：一直显示 -->
 
                 </template>
-                <el-button type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
 
           <!-- 分页 -->
-          <pagination
-            v-show="myTaskTotal > 0"
-            :total="myTaskTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyTaskList"
-          />
+          <pagination v-show="myTaskTotal > 0" :total="myTaskTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyTaskList" />
         </el-tab-pane>
 
         <el-tab-pane label="已办任务" name="list2">
           <!-- 我的单据表格 -->
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myDoneTaskList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myDoneTaskList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                >
+                <div :title="scope.row.projectName">
                   {{ scope.row.projectName }}
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              label="公司名称"
-              align="center"
-              prop="tProjectCompany.companyName"
-            >
+            <el-table-column label="公司名称" align="center" prop="tProjectCompany.companyName">
               <template slot-scope="scope">
                 <div :title="scope.row.tProjectCompany.companyName">
                   {{ scope.row.tProjectCompany.companyName }}
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="所属行业" align="center" prop="industry"
-            ><template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.CUSTOMER_TRADE"
-                :value="scope.row.industry"
-              />
-            </template>
+            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
-<!--            <el-table-column label="项目阶段" align="center" prop="projectStage">
+            <!--            <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
                 <dict-tag
                   :options="dict.type.project_stage"
@@ -335,7 +284,7 @@
                 />
               </template>
             </el-table-column>-->
-<!--            <el-table-column
+            <!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -348,7 +297,7 @@
                 />
               </template>
             </el-table-column>-->
-<!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+            <!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 &lt;!&ndash; 定义状态文本映射对象 &ndash;&gt;
                 <el-tag
@@ -366,7 +315,7 @@
                 </el-tag>
               </template>
             </el-table-column>-->
-<!--            <el-table-column
+            <!--            <el-table-column
               label="备案时间"
               align="center"
               prop="tProjectCompany.filingTime"
@@ -384,18 +333,11 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              label="渠道"
-              align="center"
-              prop="tProjectChannel.channelName"
-            >
+            <el-table-column label="渠道" align="center" prop="tProjectChannel.channelName">
               <template slot-scope="scope">
-                <div
-                  v-if="
-              scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
-            "
-                  :title="scope.row.tProjectChannel.channelName"
-                >
+                <div v-if="
+                  scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
+                " :title="scope.row.tProjectChannel.channelName">
                   {{ scope.row.tProjectChannel.channelName }}
                 </div>
                 <div v-else-if="scope.row.channel=='1'" >
@@ -428,18 +370,20 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div  v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"  :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"
+                  :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
                 <div v-else :title="scope.row.taskName">
-                  {{ scope.row.taskName}}
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -456,67 +400,41 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
           <!-- 分页 -->
-          <pagination
-            v-show="myDoneTaskTotal > 0"
-            :total="myDoneTaskTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyDoneTaskList"
-          />
+          <pagination v-show="myDoneTaskTotal > 0" :total="myDoneTaskTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyDoneTaskList" />
         </el-tab-pane>
         <el-tab-pane label="我的单据" name="list3">
           <!-- 我的单据表格 -->
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                >
+                <div :title="scope.row.projectName">
                   {{ scope.row.projectName }}
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              label="公司名称"
-              align="center"
-              prop="tProjectCompany.companyName"
-            >
+            <el-table-column label="公司名称" align="center" prop="tProjectCompany.companyName">
               <template slot-scope="scope">
                 <div :title="scope.row.tProjectCompany.companyName">
                   {{ scope.row.tProjectCompany.companyName }}
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="所属行业" align="center" prop="industry"
-            ><template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.CUSTOMER_TRADE"
-                :value="scope.row.industry"
-              />
-            </template>
+            <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
-<!--            <el-table-column label="项目阶段" align="center" prop="projectStage">
+            <!--            <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
                 <dict-tag
                   :options="dict.type.project_stage"
@@ -524,7 +442,7 @@
                 />
               </template>
             </el-table-column>-->
-<!--            <el-table-column
+            <!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -537,7 +455,7 @@
                 />
               </template>
             </el-table-column>-->
-<!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+            <!--            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 &lt;!&ndash; 定义状态文本映射对象 &ndash;&gt;
                 <el-tag
@@ -555,7 +473,7 @@
                 </el-tag>
               </template>
             </el-table-column>-->
-<!--            <el-table-column
+            <!--            <el-table-column
               label="备案时间"
               align="center"
               prop="tProjectCompany.filingTime"
@@ -573,18 +491,11 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              label="渠道"
-              align="center"
-              prop="tProjectChannel.channelName"
-            >
+            <el-table-column label="渠道" align="center" prop="tProjectChannel.channelName">
               <template slot-scope="scope">
-                <div
-                  v-if="
-              scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
-            "
-                  :title="scope.row.tProjectChannel.channelName"
-                >
+                <div v-if="
+                  scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
+                " :title="scope.row.tProjectChannel.channelName">
                   {{ scope.row.tProjectChannel.channelName }}
                 </div>
                 <div v-else-if="scope.row.channel=='1'" >
@@ -617,15 +528,16 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -642,34 +554,29 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
           <!-- 分页 -->
-          <pagination
-            v-show="myTotal > 0"
-            :total="myTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyList"
-          />
+          <pagination v-show="myTotal > 0" :total="myTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyList" />
         </el-tab-pane>
       </el-tabs>
     </el-card>
-  <!-- Flowable 流程图弹窗 -->
-  <!-- 流程图 -->
+    <!-- Flowable 流程图弹窗 -->
+    <!-- 流程图 -->
 
-  <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%"  append-to-body>
-    <!-- <el-image :src="readImage.src"></el-image> -->
-    <flow :flowData="flowData"/>
-  </el-dialog>
+    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body>
+      <!-- <el-image :src="readImage.src"></el-image> -->
+      <flow :flowData="flowData" />
+    </el-dialog>
 
   </div>
 </template>
 
 <script>
-import { getMyTaskList,getMyDoneTaskList,getMyList } from "@/api/project/investOpp/pool";
+import { getMyTaskList, getMyDoneTaskList, getMyList } from "@/api/project/investOpp/pool";
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { listChannel } from "@/api/invest/channel";
 import dueDiligenceList from "../../invest/components/dueDiligenceList.vue";
@@ -691,7 +598,7 @@ export default {
   data() {
     return {
       // 当前激活的 Tab
-      activeTab:"list1",
+      activeTab: "list1",
       // 遮罩层
       loading: false,
       // 查询参数
@@ -737,7 +644,7 @@ export default {
       myTotal: 0,
       channelList: [], //渠道
       //流程图信息
-      readImage:{
+      readImage: {
         open: false,
         src: "",
       },
@@ -892,10 +799,10 @@ export default {
       this.$refs.dataTable.toggleRowSelection(row);
     },
     // 跳转到处理页面(暂存节点页面）
-    handleEdit(row){
+    handleEdit(row) {
       const id = row.id || this.ids;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/project/investOpp/edit", query: { id: id , pInstId: pInstId} });
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/myTask/project/investOpp/edit", query: { id: id, pInstId: pInstId } });
     },
     // 签收操作
     handleSign(row) {
@@ -904,7 +811,7 @@ export default {
       this.$message.success('签收成功');
     },
     // 跳转到处理页面
-    handleProcess(row){
+    handleProcess(row) {
       /*this.$router.push({ path: '/flowable/task/todo/detail/index',
         query: {
           procInsId: row.procInsId,
@@ -915,8 +822,8 @@ export default {
           startUser: row.startUserName + '-' + row.startDeptName,
         }})*/
       const id = row.id || this.ids;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/project/investOpp/audit", query: { id:id , pInstId: pInstId } });
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/myTask/project/investOpp/audit", query: { id: id, pInstId: pInstId } });
 
     },
     // 撤回操作
@@ -933,8 +840,8 @@ export default {
     /*详情*/
     handleDetail(row) {
       const id = row.id || this.ids;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/project/investOpp/detail", query: { id: id , pInstId: pInstId } });
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/myTask/project/investOpp/detail", query: { id: id, pInstId: pInstId } });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -954,14 +861,14 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 流程图查看 */
-    handleReadImage(row){
+    handleReadImage(row) {
       this.readImage.title = "流程图";
       this.readImage.open = true;
       // this.readImage.src = process.env.VUE_APP_BASE_API + "/flowable/definition/readImage/" + deploymentId;
-      flowXmlAndNode({procInsId: row.procInstId,deployId:row.deployId}).then(res => {
+      flowXmlAndNode({ procInsId: row.procInstId, deployId: row.deployId }).then(res => {
         this.flowData = res.data;
       })
     },
@@ -973,6 +880,7 @@ export default {
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -989,12 +897,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/investOpp/processList.vue

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

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

@@ -288,7 +288,7 @@
         </el-form-item>
         <el-form-item class="btnList">
           <el-button @click="goBack">返 回</el-button>
-          <el-button type="success" @click="handleComplete(true)">同意</el-button>
+          <el-button type="success" class="editButton" @click="handleComplete(true)">同意</el-button>
           <el-button v-if="dueForm.taskDefKey!='upload'&&dueForm.taskDefKey!='approve'&&dueForm.taskDefKey!='president'" type="warning" @click="handleComplete(false)">驳回</el-button>
           <el-button v-if="dueForm.taskDefKey=='president'" type="warning" @click="handleComplete(false)">驳回（修改）</el-button>
           <el-button v-if="dueForm.taskDefKey=='president'" type="danger" @click="handleComplete(false,1)">驳回（终止）</el-button>

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

@@ -1,109 +1,102 @@
 <template>
-<!--  <div class="app-container">-->
+  <!--  <div class="app-container">-->
   <div>
     <el-card shadow="hover">
       <!-- 查询表单区域 -->
-      <el-form :model="queryParams" ref="queryForm" inline>
-        <el-form-item label="项目名称" prop="projectName">
-          <el-input
-            v-model.trim="queryParams.projectName"
-            placeholder="请输入项目名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="尽调名称" prop="investigateName">
-          <el-input
-            v-model.trim="queryParams.investigateName"
-            placeholder="请输入尽调名称"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="尽调地点" prop="investigatePlace">
-          <el-input
-            v-model.trim="queryParams.investigatePlace"
-            placeholder="请输入尽调地址"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-<!--        <el-form-item label="股权/其他合作商务条款" prop="provision">
-          <el-input
-            v-model.trim="queryParams.provision"
-            placeholder="请输入股权/其他合作商务条款"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>-->
+      <el-form :model="queryParams" ref="queryForm" size="small" inline label-position="top">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="项目名称" prop="projectName">
+              <el-input v-model.trim="queryParams.projectName" placeholder="请输入项目名称" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="尽调名称" prop="investigateName">
+              <el-input v-model.trim="queryParams.investigateName" placeholder="请输入尽调名称"
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="尽调地点" prop="investigatePlace">
+              <el-input v-model.trim="queryParams.investigatePlace" placeholder="请输入尽调地址" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="6">
+
+          </el-col>
+          <el-col :span="6">
+
+          </el-col>
+          <el-col :span="6"></el-col>
+          <el-col :span="6"></el-col>
+        </el-row>
         <!-- 可继续扩展其他查询表单项目，比如项目编号、负责人等 -->
-        <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-button type="warning" plain icon="el-icon-download" size="mini" @click="exportQuery">导出</el-button>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="搜索">
+              <el-button style="width: 100%;" type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重置">
+              <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="导出">
+              <el-button style="width: 100%;" type="warning" plain icon="el-icon-download"
+                @click="exportQuery">导出</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <!-- Tab 切换区域 -->
-      <el-tabs v-model="activeTab" type="card" @tab-click="handleTabClick">
+      <el-tabs v-model="activeTab" type="border-card" @tab-click="handleTabClick">
         <el-tab-pane label="待办任务" name="list1">
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myTaskList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myTaskList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                  class="public-text-blue public-cursor"
-                  @click.stop="handleInvestOppDetail(scope.row)"
-                >
+                <div :title="scope.row.projectName" class="public-text-blue public-cursor"
+                  @click.stop="handleInvestOppDetail(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 label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
             <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
-                <dict-tag
-                  :options="dict.type.project_stage"
-                  :value="scope.row.projectStage"
-                />
+                <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
             </el-table-column>
             <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.projectStatus] || 'info'"
-                >
+                <el-tag :type="{
+                  0: 'success',
+                  1: 'danger',
+                  2: 'warning'
+                }[scope.row.projectStatus] || 'info'">
                   {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.projectStatus] || '未知状态' }}
+                    0: '正常',
+                    1: '终止',
+                    2: '观望'
+                  }[scope.row.projectStatus] || '未知状态' }}
                 </el-tag>
               </template>
             </el-table-column>
@@ -150,15 +143,16 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div :title="scope.row.taskName"  class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -173,96 +167,71 @@
                 </div>
               </template>
             </el-table-column>
-            <!-- fixed="right" -->
+            <!--  -->
             <el-table-column label="操作" align="center" width="90" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button v-if="scope.row.taskDefKey=='modifyApply'" type="text" @click="handleEdit(scope.row)">处理</el-button>
+                <el-button v-if="scope.row.taskDefKey == 'modifyApply'" type="text" size="small"
+                  @click="handleEdit(scope.row)">处理</el-button>
                 <template v-else>
                   <!-- 1. 签收按钮：无签收人时显示 -->
-                  <el-button v-if="!scope.row.assignee" type="primary"  @click="handleSign(scope.row)">签收</el-button>
+                  <el-button v-if="!scope.row.assignee" type="text" size="small"
+                    @click="handleSign(scope.row)">签收</el-button>
                   <!-- 2. 处理按钮：有签收人时显示 -->
-                  <el-button v-else  type="text" @click="handleProcess(scope.row)">处理</el-button>
+                  <el-button v-else type="text" size="small" @click="handleProcess(scope.row)">处理</el-button>
                   <!-- 3. 撤回按钮：需补充逻辑（比如仅未签收可撤回，可结合 signPerson 判断） -->
                   <!--                <el-button v-if="!scope.row.assignee" size="mini" type="text" icon="el-icon-refresh-right" @click="handleWithdraw(scope.row)">撤回</el-button>-->
                   <!-- 4. 详情按钮：一直显示 -->
 
                 </template>
-                <el-button type="text"  @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small"
+                  @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
 
           <!-- 分页 -->
-          <pagination
-            v-show="myTaskTotal > 0"
-            :total="myTaskTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyTaskList"
-          />
+          <pagination v-show="myTaskTotal > 0" :total="myTaskTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyTaskList" />
         </el-tab-pane>
 
         <el-tab-pane label="已办任务" name="list2">
           <!-- 我的单据表格 -->
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myDoneTaskList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myDoneTaskList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                  class="public-text-blue public-cursor"
-                  @click.stop="handleInvestOppDetail(scope.row)"
-                >
+                <div :title="scope.row.projectName" class="public-text-blue public-cursor"
+                  @click.stop="handleInvestOppDetail(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 label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
             <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
-                <dict-tag
-                  :options="dict.type.project_stage"
-                  :value="scope.row.projectStage"
-                />
+                <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
             </el-table-column>
             <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.projectStatus] || 'info'"
-                >
+                <el-tag :type="{
+                  0: 'success',
+                  1: 'danger',
+                  2: 'warning'
+                }[scope.row.projectStatus] || 'info'">
                   {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.projectStatus] || '未知状态' }}
+                    0: '正常',
+                    1: '终止',
+                    2: '观望'
+                  }[scope.row.projectStatus] || '未知状态' }}
                 </el-tag>
               </template>
             </el-table-column>
@@ -309,18 +278,20 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div  v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"  :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"
+                  :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
                 <div v-else :title="scope.row.taskName">
-                  {{ scope.row.taskName}}
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -335,83 +306,56 @@
                 </div>
               </template>
             </el-table-column>
-            <!-- fixed="right" -->
+            <!--  -->
             <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small"
+                  @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
           <!-- 分页 -->
-          <pagination
-            v-show="myDoneTaskTotal > 0"
-            :total="myDoneTaskTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyDoneTaskList"
-          />
+          <pagination v-show="myDoneTaskTotal > 0" :total="myDoneTaskTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyDoneTaskList" />
         </el-tab-pane>
         <el-tab-pane label="我的单据" name="list3">
           <!-- 我的单据表格 -->
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                  class="public-text-blue public-cursor"
-                  @click.stop="handleInvestOppDetail(scope.row)"
-                >
+                <div :title="scope.row.projectName" class="public-text-blue public-cursor"
+                  @click.stop="handleInvestOppDetail(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 label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
             <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
-                <dict-tag
-                  :options="dict.type.project_stage"
-                  :value="scope.row.projectStage"
-                />
+                <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
             </el-table-column>
             <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.projectStatus] || 'info'"
-                >
+                <el-tag :type="{
+                  0: 'success',
+                  1: 'danger',
+                  2: 'warning'
+                }[scope.row.projectStatus] || 'info'">
                   {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.projectStatus] || '未知状态' }}
+                    0: '正常',
+                    1: '终止',
+                    2: '观望'
+                  }[scope.row.projectStatus] || '未知状态' }}
                 </el-tag>
               </template>
             </el-table-column>
@@ -458,15 +402,16 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -483,34 +428,30 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small"
+                  @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
           <!-- 分页 -->
-          <pagination
-            v-show="myTotal > 0"
-            :total="myTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyList"
-          />
+          <pagination v-show="myTotal > 0" :total="myTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyList" />
         </el-tab-pane>
       </el-tabs>
     </el-card>
-  <!-- Flowable 流程图弹窗 -->
-  <!-- 流程图 -->
+    <!-- Flowable 流程图弹窗 -->
+    <!-- 流程图 -->
 
-  <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%"  append-to-body>
-    <!-- <el-image :src="readImage.src"></el-image> -->
-    <flow :flowData="flowData"/>
-  </el-dialog>
+    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body>
+      <!-- <el-image :src="readImage.src"></el-image> -->
+      <flow :flowData="flowData" />
+    </el-dialog>
 
   </div>
 </template>
 
 <script>
-import { getMyTaskList,getMyDoneTaskList,getMyList } from "@/api/project/investigate/pool";
+import { getMyTaskList, getMyDoneTaskList, getMyList } from "@/api/project/investigate/pool";
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { listChannel } from "@/api/invest/channel";
 import flow from '@/views/flowable/task/todo/detail/flow';
@@ -522,7 +463,7 @@ export default {
   data() {
     return {
       // 当前激活的 Tab
-      activeTab:"list1",
+      activeTab: "list1",
       // 遮罩层
       loading: false,
       // 查询参数
@@ -555,8 +496,8 @@ export default {
         orderByColumn: "createTime",
         isAsc: "desc",
         createTime: null,
-        investigateName:null,
-        investigatePlace:null
+        investigateName: null,
+        investigatePlace: null
       },
       // 数据列表（分开存储不同Tab的数据）
       myTaskList: [],       // 待办任务数据
@@ -570,7 +511,7 @@ export default {
       myTotal: 0,
       channelList: [], //渠道
       //流程图信息
-      readImage:{
+      readImage: {
         open: false,
         src: "",
       },
@@ -729,18 +670,22 @@ export default {
     handleInvestOppDetail(row) {
       const projectPoolId = row.projectPoolId;
       getPool(projectPoolId).then((response) => {
-        const pInstId=response.data.procInstId;
-        this.$router.push({ path: "/project/investOpp/detail", query: { id:
-            projectPoolId , pInstId: pInstId } });
+        const pInstId = response.data.procInstId;
+        this.$router.push({
+          path: "/myTask/project/investOpp/detail", query: {
+            id:
+              projectPoolId, pInstId: pInstId
+          }
+        });
       });
     },
     // 跳转到处理页面(暂存节点页面）
-    handleEdit(row){
+    handleEdit(row) {
       const id = row.id || this.ids;
-      const poolId=row.projectPoolId;
-      const pInstId=row.procInstId;
-      const taskId=row.taskId;
-      this.$router.push({ path: "/project/investigate/edit", query: { id: poolId , pInstId: pInstId , taskId:taskId} });
+      const poolId = row.projectPoolId;
+      const pInstId = row.procInstId;
+      const taskId = row.taskId;
+      this.$router.push({ path: "/myTask/project/investigate/edit", query: { id: poolId, pInstId: pInstId, taskId: taskId } });
     },
     // 签收操作
     handleSign(row) {
@@ -749,13 +694,13 @@ export default {
       this.$message.success('签收成功');
     },
     // 跳转到处理页面
-    handleProcess(row){
+    handleProcess(row) {
       const id = row.id || this.ids;
-      const poolId=row.projectPoolId;
-      const pInstId=row.procInstId;
-      const taskId=row.taskId;
+      const poolId = row.projectPoolId;
+      const pInstId = row.procInstId;
+      const taskId = row.taskId;
       this.$store.commit("SET_PROJECTITEMMESSAGE", row);
-      this.$router.push({ path: "/project/investigate/audit", query: { id:poolId , pInstId: pInstId ,taskId:taskId} });
+      this.$router.push({ path: "/myTask/project/investigate/audit", query: { id: poolId, pInstId: pInstId, taskId: taskId } });
 
     },
     // 撤回操作
@@ -772,9 +717,9 @@ export default {
     /*详情*/
     handleDetail(row) {
       const id = row.id || this.ids;
-      const poolId=row.projectPoolId;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/project/investigate/detail", query: { id: poolId , pInstId: pInstId } });
+      const poolId = row.projectPoolId;
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/myTask/project/investigate/detail", query: { id: poolId, pInstId: pInstId } });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -794,15 +739,15 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 流程图查看 */
-    handleReadImage(row){
+    handleReadImage(row) {
       this.readImage.title = "流程图";
       this.readImage.open = true;
       //console.log(row)
       // this.readImage.src = process.env.VUE_APP_BASE_API + "/flowable/definition/readImage/" + deploymentId;
-      flowXmlAndNode({procInsId: row.procInstId,deployId:row.deployId}).then(res => {
+      flowXmlAndNode({ procInsId: row.procInstId, deployId: row.deployId }).then(res => {
         this.flowData = res.data;
       })
     },
@@ -814,6 +759,7 @@ export default {
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -830,12 +776,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/investigate/processList.vue

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

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

@@ -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 class="border-card">
+      <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border :data="poolList"
+        @selection-change="handleSelectionChange">
+        <!--      <el-table-column type="selection" width="40" align="center" />-->
+        <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+        <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+        <el-table-column label="项目名称" align="center" prop="projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.projectName" 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,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+
+
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -554,6 +475,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 class="border-card">
+      <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+        :data="poolList" @selection-change="handleSelectionChange">
+        <!--      <el-table-column type="selection" width="40" align="center" />-->
+        <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+        <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+        <el-table-column label="项目名称" align="center" prop="projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.projectName" 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,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+
+
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -539,6 +458,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 class="border-card">
+      <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper"
+        :class="{ hideHeaderCheckBox: stage !== '0' }" v-loading="loading" border :data="poolList"
+        @selection-change="handleSelectionChange">
+        <!--      <el-table-column type="selection" width="40" align="center" />-->
+        <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+        <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+        <el-table-column label="项目名称" align="center" prop="projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.projectName" class="public-text-blue public-cursor"
+              @click.stop="handleDetail(scope.row)">
+              {{ scope.row.projectName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="公司名称" align="center" prop="tProjectCompany.companyName">
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectCompany.companyName">
+              {{ scope.row.tProjectCompany.companyName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目所属城市" align="center" prop="tProjectCompany.registeredAddress">
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectCompany.registeredAddress">
+              {{ scope.row.tProjectCompany.registeredAddress }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+            <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目阶段" align="center" prop="projectStage">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+          <template slot-scope="scope">
+            <!-- 定义状态文本映射对象 -->
+            <el-tag :type="{
               0: 'success',
               1: 'danger',
               2: 'warning'
-            }[scope.row.projectStatus] || 'info'"
-          >
-            {{ {
-            0: '正常',
-            1: '终止',
-            2: '观望'
-          }[scope.row.projectStatus] || '未知状态' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="备案时间"
-        align="center"
-        prop="tProjectCompany.filingTime"
-      >
-        <template slot-scope="scope">
-          <span>{{
+            }[scope.row.projectStatus] || 'info'">
+              {{ {
+                0: '正常',
+                1: '终止',
+                2: '观望'
+              }[scope.row.projectStatus] || '未知状态' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="备案时间" align="center" prop="tProjectCompany.filingTime">
+          <template slot-scope="scope">
+            <span>{{
               parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}")
             }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="立项通过日期"
-        align="center"
-        prop="projectDate"
-        v-if="stage !== '1'"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="投决通过日期"
-        align="center"
-        prop="decisionDate"
-        v-if="stage !== '1'"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
+          </template>
+        </el-table-column>
+        <el-table-column label="立项通过日期" align="center" prop="projectDate" v-if="stage !== '1'">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="投决通过日期" align="center" prop="decisionDate" v-if="stage !== '1'">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
 
-      <el-table-column label="项目负责人" align="center" prop="investHead">
-        <template slot-scope="scope">
-          <div :title="scope.row.investHead">
-            {{ scope.row.investHead }}
-          </div>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
-      <el-table-column
-        label="渠道"
-        align="center"
-        prop="tProjectChannel.channelName"
-      >
-        <template slot-scope="scope">
-          <div
-            v-if="
+        <el-table-column label="项目负责人" align="center" prop="investHead">
+          <template slot-scope="scope">
+            <div :title="scope.row.investHead">
+              {{ scope.row.investHead }}
+            </div>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
+        <el-table-column label="渠道" align="center" prop="tProjectChannel.channelName">
+          <template slot-scope="scope">
+            <div v-if="
               scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
-            "
-            :title="scope.row.tProjectChannel.channelName"
-          >
-            {{ scope.row.tProjectChannel.channelName }}
-          </div>
-          <div v-else-if="scope.row.channel=='1'" >
-            直接触达
-          </div>
-          <div v-else="scope.row.channel=='2'" >
-            内部推荐
-          </div>
-        </template>
-      </el-table-column>
-      <!-- delFlag -->
-      <el-table-column label="状态" align="center" prop="investHead">
-        <template slot-scope="scope">
-          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="流程状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <div :title="scope.row.status">
-            <span v-if="scope.row.status === 0">暂存</span>
-            <span v-else-if="scope.row.status === 1">已提交</span>
-            <span v-else-if="scope.row.status === 2">审批中</span>
-            <span v-else-if="scope.row.status === 3">审批完成</span>
-            <span v-else-if="scope.row.status === 4">关闭</span>
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
+            " :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>
@@ -338,7 +251,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 项目池表格数据
@@ -380,7 +293,7 @@ export default {
   computed: {
     ...mapGetters(["user"]),
   },
-  created() {},
+  created() { },
   mounted() {
     this.getList();
     // 渠道
@@ -437,7 +350,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       //项目机会申请
-      this.$router.push({ path: "/project/investOpp/apply" });
+      this.$router.push({ path: "/stage/project/investOpp/apply" });
     },
     handleSelectData(type, otherData) {
       // type 1=修改 2=详情 3=设置项目阶段 4=终止 5=上传评估意见
@@ -492,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 } });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -512,7 +425,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -529,9 +442,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+
+
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -548,13 +464,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 class="border-card">
+      <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+        :data="poolList" @selection-change="handleSelectionChange">
+        <!--      <el-table-column type="selection" width="40" align="center" />-->
+        <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+        <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+        <el-table-column label="项目名称" align="center" prop="projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.projectName" 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,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+
+
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -568,6 +480,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/listPool.vue

@@ -1,302 +1,202 @@
 <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-position="top">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="项目负责人" prop="investHead">
+            <el-input v-model.trim="queryParams.investHead" placeholder="请输入项目负责人" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-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-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-row>
 
-      <el-form-item label="项目公司" prop="company">
-        <el-input
-          v-model.trim="queryParams.company"
-          placeholder="请输入项目所属公司"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="项目机会状态" prop="projectStatus">
-        <!-- el-select 绑定表单字段 -->
-        <el-select v-model="queryParams.projectStatus" placeholder="请选择" clearable>
-          <!-- 静态选项 -->
-          <el-option label="正常" value="0"></el-option>
-          <el-option label="终止" value="1"></el-option>
-          <el-option label="观望" value="2"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item class="searchWrapper">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-        >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-        >重置</el-button
-        >
-      </el-form-item>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="项目公司" prop="company">
+            <el-input v-model.trim="queryParams.company" placeholder="请输入项目所属公司" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="项目机会状态" prop="projectStatus">
+            <!-- el-select 绑定表单字段 -->
+            <el-select v-model="queryParams.projectStatus" placeholder="请选择" clearable style="width: 100%;">
+              <!-- 静态选项 -->
+              <el-option label="正常" value="0"></el-option>
+              <el-option label="终止" value="1"></el-option>
+              <el-option label="观望" value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-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
-          :disabled="multiple"
-          plain
-          type="success"
-          size="mini"
-          icon="el-icon-edit"
-          @click="handleSelectData(14)"
-        >编辑</el-button
-        >
+        <el-button :disabled="multiple" type="success" class="editButton" size="small" icon="el-icon-edit"
+          @click="handleSelectData(14)">修改</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"
-      :class="{ hideHeaderCheckBox: stage !== '0' }"
-      v-loading="loading"
-      border
-      :data="poolList"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="40" align="center" />
-      <el-table-column
-        type="index"
-        label="序号"
-        width="50"
-        align="center"
-      ></el-table-column>
-      <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-      <el-table-column label="项目名称" align="center" prop="projectName">
-        <template slot-scope="scope">
-          <div
-            :title="scope.row.projectName"
-            class="public-text-blue public-cursor"
-            @click.stop="handleDetail(scope.row)"
-          >
-            {{ scope.row.projectName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="公司名称"
-        align="center"
-        prop="tProjectCompany.companyName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectCompany.companyName">
-            {{ scope.row.tProjectCompany.companyName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="项目所属城市"
-        align="center"
-        prop="tProjectCompany.registeredAddress"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectCompany.registeredAddress">
-            {{ scope.row.tProjectCompany.registeredAddress }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="所属行业" align="center" prop="industry"
-      ><template slot-scope="scope">
-        <dict-tag
-          :options="dict.type.CUSTOMER_TRADE"
-          :value="scope.row.industry"
-        />
-      </template>
-      </el-table-column>
-      <el-table-column label="项目阶段" align="center" prop="projectStage">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.project_stage"
-            :value="scope.row.projectStage"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="项目机会状态" align="center" prop="projectStatus">
-        <template slot-scope="scope">
-          <!-- 定义状态文本映射对象 -->
-          <el-tag
-            :type="{
+    <div class="border-card">
+      <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper"
+        :class="{ hideHeaderCheckBox: stage !== '0' }" v-loading="loading" border :data="poolList"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+        <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+        <el-table-column label="项目名称" align="center" prop="projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.projectName" class="public-text-blue public-cursor"
+              @click.stop="handleDetail(scope.row)">
+              {{ scope.row.projectName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="公司名称" align="center" prop="tProjectCompany.companyName">
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectCompany.companyName">
+              {{ scope.row.tProjectCompany.companyName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目所属城市" align="center" prop="tProjectCompany.registeredAddress">
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectCompany.registeredAddress">
+              {{ scope.row.tProjectCompany.registeredAddress }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+            <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目阶段" align="center" prop="projectStage">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+          <template slot-scope="scope">
+            <!-- 定义状态文本映射对象 -->
+            <el-tag :type="{
               0: 'success',
               1: 'danger',
               2: 'warning'
-            }[scope.row.projectStatus] || 'info'"
-          >
-            {{ {
-            0: '正常',
-            1: '终止',
-            2: '观望'
-          }[scope.row.projectStatus] || '未知状态' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="备案时间"
-        align="center"
-        prop="tProjectCompany.filingTime"
-      >
-        <template slot-scope="scope">
-          <span>{{
+            }[scope.row.projectStatus] || 'info'">
+              {{ {
+                0: '正常',
+                1: '终止',
+                2: '观望'
+              }[scope.row.projectStatus] || '未知状态' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="备案时间" align="center" prop="tProjectCompany.filingTime">
+          <template slot-scope="scope">
+            <span>{{
               parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}")
             }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="立项通过日期"
-        align="center"
-        prop="projectDate"
-        v-if="stage !== '1'"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="投决通过日期"
-        align="center"
-        prop="decisionDate"
-        v-if="stage !== '1'"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
+          </template>
+        </el-table-column>
+        <el-table-column label="立项通过日期" align="center" prop="projectDate" v-if="stage !== '1'">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="投决通过日期" align="center" prop="decisionDate" v-if="stage !== '1'">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
 
-      <el-table-column label="项目负责人" align="center" prop="investHead">
-        <template slot-scope="scope">
-          <div :title="scope.row.investHead">
-            {{ scope.row.investHead }}
-          </div>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
-      <el-table-column
-        label="渠道"
-        align="center"
-        prop="tProjectChannel.channelName"
-      >
-        <template slot-scope="scope">
-          <div
-            v-if="
+        <el-table-column label="项目负责人" align="center" prop="investHead">
+          <template slot-scope="scope">
+            <div :title="scope.row.investHead">
+              {{ scope.row.investHead }}
+            </div>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
+        <el-table-column label="渠道" align="center" prop="tProjectChannel.channelName">
+          <template slot-scope="scope">
+            <div v-if="
               scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
-            "
-            :title="scope.row.tProjectChannel.channelName"
-          >
-            {{ scope.row.tProjectChannel.channelName }}
-          </div>
-          <div v-else-if="scope.row.channel=='1'" >
-            直接触达
-          </div>
-          <div v-else="scope.row.channel=='2'" >
-            内部推荐
-          </div>
-        </template>
-      </el-table-column>
-      <!-- delFlag -->
-      <el-table-column label="状态" align="center" prop="investHead">
-        <template slot-scope="scope">
-          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="项目机会流程状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <div :title="scope.row.status">
-            <span v-if="scope.row.status === 0">暂存</span>
-            <span v-else-if="scope.row.status === 1">已提交</span>
-            <span v-else-if="scope.row.status === 2">审批中</span>
-            <span v-else-if="scope.row.status === 3">审批完成</span>
-            <span v-else-if="scope.row.status === 4">关闭</span>
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+            " :title="scope.row.tProjectChannel.channelName">
+              {{ scope.row.tProjectChannel.channelName }}
+            </div>
+            <div v-else-if="scope.row.channel == '1'">
+              直接触达
+            </div>
+            <div v-else="scope.row.channel=='2'">
+              内部推荐
+            </div>
+          </template>
+        </el-table-column>
+        <!-- delFlag -->
+        <el-table-column label="状态" align="center" prop="investHead">
+          <template slot-scope="scope">
+            <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+              {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目机会流程状态" align="center" prop="status">
+          <template slot-scope="scope">
+            <div :title="scope.row.status">
+              <span v-if="scope.row.status === 0">暂存</span>
+              <span v-else-if="scope.row.status === 1">已提交</span>
+              <span v-else-if="scope.row.status === 2">审批中</span>
+              <span v-else-if="scope.row.status === 3">审批完成</span>
+              <span v-else-if="scope.row.status === 4">关闭</span>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
+
     <!-- 设置项目状态对话框 -->
     <businessUpdate @getList="getList" ref="businessUpdate"></businessUpdate>
 
@@ -347,7 +247,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 项目池表格数据
@@ -382,7 +282,7 @@ export default {
         orderByColumn: "createTime",
         isAsc: "desc",
         createTime: null,
-        projectStatus:null
+        projectStatus: null
       },
       channelList: [],
     };
@@ -390,7 +290,7 @@ export default {
   computed: {
     ...mapGetters(["user"]),
   },
-  created() {},
+  created() { },
   mounted() {
     this.getList();
     // 渠道
@@ -484,13 +384,13 @@ export default {
           } else if (type === 4) {
             // 终止
             this.handleDelete(row);
-          } else if (type===14) {
+          } else if (type === 14) {
             if (row.status === 3) {
               //保存-项目机会
               this.handleEdit(row);
             } else {
               this.$message({
-                message: "不能编辑，项目机会审批完成可编辑",
+                message: "不能修改，项目机会审批完成可修改",
                 duration: 1500,
                 type: "warning",
               });
@@ -514,7 +414,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) {
@@ -534,13 +434,13 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    /** 编辑按钮操作 */
+    /** 修改按钮操作 */
     handleEdit(row) {
       const id = row.id || this.ids;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/project/poolEdit", query: { id: id , pInstId: pInstId} });
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/stage/project/poolEdit", query: { id: id, pInstId: pInstId } });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -556,9 +456,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+
+
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -575,13 +478,9 @@ export default {
     -webkit-box-orient: vertical;
   }
 }
+
 /**找到表头那一行，然后把里面的复选框隐藏掉**/
-.hideHeaderCheckBox
-::v-deep
-.el-table__header-wrapper
-.el-table__header
-.el-checkbox {
+.hideHeaderCheckBox::v-deep .el-table__header-wrapper .el-table__header .el-checkbox {
   display: none;
 }
 </style>
-

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

@@ -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 class="border-card">
+      <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper"
+        :class="{ hideHeaderCheckBox: stage !== '0' }" v-loading="loading" border :data="poolList"
+        @selection-change="handleSelectionChange">
+        <!--      <el-table-column type="selection" width="40" align="center" />-->
+        <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+        <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+        <el-table-column label="项目名称" align="center" prop="projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.projectName" class="public-text-blue public-cursor"
+              @click.stop="handleDetail(scope.row)">
+              {{ scope.row.projectName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="公司名称" align="center" prop="tProjectCompany.companyName">
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectCompany.companyName">
+              {{ scope.row.tProjectCompany.companyName }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="项目所属城市" align="center" prop="tProjectCompany.registeredAddress">
+          <template slot-scope="scope">
+            <div :title="scope.row.tProjectCompany.registeredAddress">
+              {{ scope.row.tProjectCompany.registeredAddress }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+            <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目阶段" align="center" prop="projectStage">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
+          </template>
+        </el-table-column>
+        <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+          <template slot-scope="scope">
+            <!-- 定义状态文本映射对象 -->
+            <el-tag :type="{
               0: 'success',
               1: 'danger',
               2: 'warning'
-            }[scope.row.projectStatus] || 'info'"
-          >
-            {{ {
-            0: '正常',
-            1: '终止',
-            2: '观望'
-          }[scope.row.projectStatus] || '未知状态' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="备案时间"
-        align="center"
-        prop="tProjectCompany.filingTime"
-      >
-        <template slot-scope="scope">
-          <span>{{
+            }[scope.row.projectStatus] || 'info'">
+              {{ {
+                0: '正常',
+                1: '终止',
+                2: '观望'
+              }[scope.row.projectStatus] || '未知状态' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="备案时间" align="center" prop="tProjectCompany.filingTime">
+          <template slot-scope="scope">
+            <span>{{
               parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}")
             }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="立项通过日期"
-        align="center"
-        prop="projectDate"
-        v-if="stage !== '1'"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="投决通过日期"
-        align="center"
-        prop="decisionDate"
-        v-if="stage !== '1'"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
+          </template>
+        </el-table-column>
+        <el-table-column label="立项通过日期" align="center" prop="projectDate" v-if="stage !== '1'">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="投决通过日期" align="center" prop="decisionDate" v-if="stage !== '1'">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
 
-      <el-table-column label="项目负责人" align="center" prop="investHead">
-        <template slot-scope="scope">
-          <div :title="scope.row.investHead">
-            {{ scope.row.investHead }}
-          </div>
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
-      <el-table-column
-        label="渠道"
-        align="center"
-        prop="tProjectChannel.channelName"
-      >
-        <template slot-scope="scope">
-          <div
-            v-if="
+        <el-table-column label="项目负责人" align="center" prop="investHead">
+          <template slot-scope="scope">
+            <div :title="scope.row.investHead">
+              {{ scope.row.investHead }}
+            </div>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
+        <el-table-column label="渠道" align="center" prop="tProjectChannel.channelName">
+          <template slot-scope="scope">
+            <div v-if="
               scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
-            "
-            :title="scope.row.tProjectChannel.channelName"
-          >
-            {{ scope.row.tProjectChannel.channelName }}
-          </div>
-          <div v-else-if="scope.row.channel=='1'" >
-            直接触达
-          </div>
-          <div v-else="scope.row.channel=='2'" >
-            内部推荐
-          </div>
-        </template>
-      </el-table-column>
-      <!-- delFlag -->
-      <el-table-column label="状态" align="center" prop="investHead">
-        <template slot-scope="scope">
-          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-          </div>
-        </template>
-      </el-table-column>
-      <!-- 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>
+        <!--  -->
+      </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,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+
+
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -527,12 +443,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 class="border-card">
+      <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,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+  
 .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 class="border-card">
+      <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+        :data="poolList" @selection-change="handleSelectionChange">
+        <!-- <el-table-column type="selection" width="40" align="center" /> -->
+        <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+        <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
+        <el-table-column label="项目名称" align="center" prop="projectName">
+          <template slot-scope="scope">
+            <div :title="scope.row.projectName" 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,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+
+
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -560,6 +475,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/meetingList.vue

@@ -100,7 +100,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
+          type="success" class="editButton"
           plain
           icon="el-icon-edit"
           size="mini"
@@ -302,7 +302,7 @@
       <el-table-column
         label="操作"
         v-if="false"
-        fixed="right"
+        
         align="center"
         class-name="small-padding fixed-width"
         width="120"

ruoyi-ui/src/views/project/poolEdit.vue

@@ -498,7 +498,7 @@ export default {
     },
     type: {
       type: String,
-      default: "1", //1可编辑  2不可编辑
+      default: "1", //1可修改  2不可修改
     },
   },
   components: { fileItem, channelItem, selecDept },

ruoyi-ui/src/views/project/poolForm.vue

@@ -517,7 +517,7 @@ export default {
     },
     type: {
       type: String,
-      default: "1", //1可编辑  2不可编辑
+      default: "1", //1可修改  2不可修改
     },
     // 声明接收的 props，名称与父组件传递时一致（驼峰式在模板中用短横线）
     isShowFlow: {

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

@@ -138,7 +138,7 @@
         <el-form-item class="btnList">
           <!--          <div class="btn-group">-->
           <el-button @click="goBack">返 回</el-button>
-          <el-button type="success" @click="handleComplete(true)">同意</el-button>
+          <el-button type="success" class="editButton" @click="handleComplete(true)">同意</el-button>
           <el-button type="warning" @click="handleComplete(false)">驳回</el-button>
           <!--          </div>-->
         </el-form-item>

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

@@ -1,79 +1,86 @@
 <template>
-<!--  <div class="app-container">-->
+  <!--  <div class="app-container">-->
   <div>
     <el-card shadow="hover">
       <!-- 查询表单区域 -->
-      <el-form :model="queryParams" ref="queryForm" inline>
-        <el-form-item label="项目名称" prop="projectName">
-          <el-input
-            v-model.trim="queryParams.projectName"
-            placeholder="请输入项目名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="终止原因" prop="reason">
-          <el-input
-            v-model.trim="queryParams.reason"
-            placeholder="请输入终止原因"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+      <el-form :model="queryParams" ref="queryForm" size="small" inline label-position="top">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="项目名称" prop="projectName">
+              <el-input v-model.trim="queryParams.projectName" placeholder="请输入项目名称" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="终止原因" prop="reason">
+              <el-input v-model.trim="queryParams.reason" placeholder="请输入终止原因" clearable
+                @keyup.enter.native="handleQuery" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+
+          </el-col>
+          <el-col :span="6">
+
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="6">
+
+          </el-col>
+          <el-col :span="6">
+
+          </el-col>
+          <el-col :span="6"></el-col>
+          <el-col :span="6"></el-col>
+        </el-row>
         <!-- 可继续扩展其他查询表单项目，比如项目编号、负责人等 -->
-        <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-button type="warning" plain icon="el-icon-download" size="mini" @click="exportQuery">导出</el-button>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="搜索">
+              <el-button style="width: 100%;" type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="重置">
+              <el-button style="width: 100%;" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="导出">
+              <el-button style="width: 100%;" type="warning" plain icon="el-icon-download"
+                @click="exportQuery">导出</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <!-- Tab 切换区域 -->
-      <el-tabs v-model="activeTab" type="card" @tab-click="handleTabClick">
+      <el-tabs v-model="activeTab" type="border-card" @tab-click="handleTabClick">
         <el-tab-pane label="待办任务" name="list1">
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myTaskList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myTaskList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                  class="public-text-blue public-cursor"
-                  @click.stop="handleInvestOppDetail(scope.row)"
-                >
+                <div :title="scope.row.projectName" class="public-text-blue public-cursor"
+                  @click.stop="handleInvestOppDetail(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 label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
             <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
-                <dict-tag
-                  :options="dict.type.project_stage"
-                  :value="scope.row.projectStage"
-                />
+                <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
             </el-table-column>
-<!--            <el-table-column
+            <!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -89,18 +96,16 @@
             <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.projectStatus] || 'info'"
-                >
+                <el-tag :type="{
+                  0: 'success',
+                  1: 'danger',
+                  2: 'warning'
+                }[scope.row.projectStatus] || 'info'">
                   {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.projectStatus] || '未知状态' }}
+                    0: '正常',
+                    1: '终止',
+                    2: '观望'
+                  }[scope.row.projectStatus] || '未知状态' }}
                 </el-tag>
               </template>
             </el-table-column>
@@ -140,15 +145,16 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div :title="scope.row.taskName"  class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -166,79 +172,56 @@
             <el-table-column label="操作" align="center" width="90" class-name="small-padding fixed-width">
               <template slot-scope="scope">
 
-                <el-button v-if="scope.row.taskDefKey=='modifyApply'" type="text" @click="handleEdit(scope.row)">处理</el-button>
+                <el-button v-if="scope.row.taskDefKey == 'modifyApply'" type="text" size="small"
+                  @click="handleEdit(scope.row)">处理</el-button>
                 <template v-else>
-                <!-- 1. 签收按钮：无签收人时显示 -->
-                  <el-button v-if="!scope.row.assignee" type="primary"  @click="handleSign(scope.row)">签收</el-button>
+                  <!-- 1. 签收按钮：无签收人时显示 -->
+                  <el-button v-if="!scope.row.assignee" type="text" size="small"
+                    @click="handleSign(scope.row)">签收</el-button>
                   <!-- 2. 处理按钮：有签收人时显示 -->
-                  <el-button v-else  type="text" @click="handleProcess(scope.row)">处理</el-button>
-                <!-- 3. 撤回按钮：需补充逻辑（比如仅未签收可撤回，可结合 signPerson 判断） -->
-<!--                <el-button v-if="!scope.row.assignee" size="mini" type="text" icon="el-icon-refresh-right" @click="handleWithdraw(scope.row)">撤回</el-button>-->
-                <!-- 4. 详情按钮：一直显示 -->
+                  <el-button v-else type="text" size="small" @click="handleProcess(scope.row)">处理</el-button>
+                  <!-- 3. 撤回按钮：需补充逻辑（比如仅未签收可撤回，可结合 signPerson 判断） -->
+                  <!--                <el-button v-if="!scope.row.assignee" size="mini" type="text" size="small" icon="el-icon-refresh-right" @click="handleWithdraw(scope.row)">撤回</el-button>-->
+                  <!-- 4. 详情按钮：一直显示 -->
 
                 </template>
-                <el-button type="text"  @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small"
+                  @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
 
           <!-- 分页 -->
-          <pagination
-            v-show="myTaskTotal > 0"
-            :total="myTaskTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyTaskList"
-          />
+          <pagination v-show="myTaskTotal > 0" :total="myTaskTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyTaskList" />
         </el-tab-pane>
 
         <el-tab-pane label="已办任务" name="list2">
           <!-- 我的单据表格 -->
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myDoneTaskList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myDoneTaskList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                  class="public-text-blue public-cursor"
-                  @click.stop="handleInvestOppDetail(scope.row)"
-                >
+                <div :title="scope.row.projectName" class="public-text-blue public-cursor"
+                  @click.stop="handleInvestOppDetail(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 label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
             <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
-                <dict-tag
-                  :options="dict.type.project_stage"
-                  :value="scope.row.projectStage"
-                />
+                <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
             </el-table-column>
-<!--            <el-table-column
+            <!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -254,18 +237,16 @@
             <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.projectStatus] || 'info'"
-                >
+                <el-tag :type="{
+                  0: 'success',
+                  1: 'danger',
+                  2: 'warning'
+                }[scope.row.projectStatus] || 'info'">
                   {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.projectStatus] || '未知状态' }}
+                    0: '正常',
+                    1: '终止',
+                    2: '观望'
+                  }[scope.row.projectStatus] || '未知状态' }}
                 </el-tag>
               </template>
             </el-table-column>
@@ -305,18 +286,20 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div  v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"  :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"
+                  :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
                 <div v-else :title="scope.row.taskName">
-                  {{ scope.row.taskName}}
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -333,66 +316,41 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small"
+                  @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
           <!-- 分页 -->
-          <pagination
-            v-show="myDoneTaskTotal > 0"
-            :total="myDoneTaskTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyDoneTaskList"
-          />
+          <pagination v-show="myDoneTaskTotal > 0" :total="myDoneTaskTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyDoneTaskList" />
         </el-tab-pane>
         <el-tab-pane label="我的单据" name="list3">
           <!-- 我的单据表格 -->
           <!-- 列表一内容 -->
-          <el-table
-            ref="dataTable"
-            @row-click="clickRow"
-            class="tableWrapper"
-            v-loading="loading"
-            border
-            :data="myList"
-          >
-<!--            <el-table-column type="selection" width="40" align="center" />-->
-            <el-table-column
-              type="index"
-              label="序号"
-              width="50"
-              align="center"
-            ></el-table-column>
+          <el-table height="450" ref="dataTable" @row-click="clickRow" class="tableWrapper" v-loading="loading" border
+            :data="myList">
+            <!--            <el-table-column type="selection" width="40" align="center" />-->
+            <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <el-table-column label="项目名称" align="center" prop="projectName" width="200">
               <template slot-scope="scope">
-                <div
-                  :title="scope.row.projectName"
-                  class="public-text-blue public-cursor"
-                  @click.stop="handleInvestOppDetail(scope.row)"
-                >
+                <div :title="scope.row.projectName" class="public-text-blue public-cursor"
+                  @click.stop="handleInvestOppDetail(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 label="所属行业" align="center" prop="industry"><template slot-scope="scope">
+                <dict-tag :options="dict.type.CUSTOMER_TRADE" :value="scope.row.industry" />
+              </template>
             </el-table-column>
             <el-table-column label="项目阶段" align="center" prop="projectStage">
               <template slot-scope="scope">
-                <dict-tag
-                  :options="dict.type.project_stage"
-                  :value="scope.row.projectStage"
-                />
+                <dict-tag :options="dict.type.project_stage" :value="scope.row.projectStage" />
               </template>
             </el-table-column>
-<!--            <el-table-column
+            <!--            <el-table-column
               label="项目状态"
               align="center"
               prop="projectState"
@@ -408,18 +366,16 @@
             <el-table-column label="项目机会状态" align="center" prop="projectStatus">
               <template slot-scope="scope">
                 <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.projectStatus] || 'info'"
-                >
+                <el-tag :type="{
+                  0: 'success',
+                  1: 'danger',
+                  2: 'warning'
+                }[scope.row.projectStatus] || 'info'">
                   {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.projectStatus] || '未知状态' }}
+                    0: '正常',
+                    1: '终止',
+                    2: '观望'
+                  }[scope.row.projectStatus] || '未知状态' }}
                 </el-tag>
               </template>
             </el-table-column>
@@ -459,15 +415,16 @@
             </el-table-column>
             <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
-                <div :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
-                  {{ scope.row.taskName}}
+                <div :title="scope.row.taskName" class="public-text-blue public-cursor"
+                  @click="handleReadImage(scope.row)">
+                  {{ scope.row.taskName }}
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
-                  {{ scope.row.assigneeName}}
+                  {{ scope.row.assigneeName }}
                 </div>
               </template>
             </el-table-column>
@@ -484,35 +441,31 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button type="text" size="small" @click="handleDetail(scope.row)">详情</el-button>
+                <el-button style="color:#1890ff" type="text" size="small"
+                  @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
           <!-- 分页 -->
-          <pagination
-            v-show="myTotal > 0"
-            :total="myTotal"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getMyList"
-          />
+          <pagination v-show="myTotal > 0" :total="myTotal" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getMyList" />
         </el-tab-pane>
       </el-tabs>
     </el-card>
-  <!-- Flowable 流程图弹窗 -->
-  <!-- 流程图 -->
+    <!-- Flowable 流程图弹窗 -->
+    <!-- 流程图 -->
 
-  <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%"  append-to-body>
-    <!-- <el-image :src="readImage.src"></el-image> -->
-    <flow :flowData="flowData"/>
-  </el-dialog>
+    <el-dialog :title="readImage.title" :visible.sync="readImage.open" width="70%" append-to-body>
+      <!-- <el-image :src="readImage.src"></el-image> -->
+      <flow :flowData="flowData" />
+    </el-dialog>
 
   </div>
 </template>
 
 <script>
-import { getMyTaskList,getMyDoneTaskList,getMyList } from "@/api/project/termination/pool";
-import { selectByFlowKey,flowXmlAndNode } from "@/api/flowable/definition";
+import { getMyTaskList, getMyDoneTaskList, getMyList } from "@/api/project/termination/pool";
+import { selectByFlowKey, flowXmlAndNode } from "@/api/flowable/definition";
 import { listChannel } from "@/api/invest/channel";
 import dueDiligenceList from "../../invest/components/dueDiligenceList.vue";
 import followList from "../../invest/components/followList.vue";
@@ -537,7 +490,7 @@ export default {
   data() {
     return {
       // 当前激活的 Tab
-      activeTab:"list1",
+      activeTab: "list1",
       // 遮罩层
       loading: false,
       // 查询参数
@@ -583,7 +536,7 @@ export default {
       myTotal: 0,
       channelList: [], //渠道
       //流程图信息
-      readImage:{
+      readImage: {
         open: false,
         src: "",
       },
@@ -741,18 +694,22 @@ export default {
     handleInvestOppDetail(row) {
       const projectPoolId = row.projectPoolId;
       getPool(projectPoolId).then((response) => {
-        const pInstId=response.data.procInstId;
-        this.$router.push({ path: "/project/investOpp/detail", query: { id:
-            projectPoolId , pInstId: pInstId } });
+        const pInstId = response.data.procInstId;
+        this.$router.push({
+          path: "/myTask/project/investOpp/detail", query: {
+            id:
+              projectPoolId, pInstId: pInstId
+          }
+        });
       });
     },
     // 跳转到处理页面(暂存节点页面）
-    handleEdit(row){
+    handleEdit(row) {
       const id = row.id || this.ids;
-      const poolId=row.projectPoolId;
-      const pInstId=row.procInstId; ``
-      const taskId=row.taskId;
-      this.$router.push({ path: "/project/termination/edit", query: { id: poolId , pInstId: pInstId , taskId:taskId} });
+      const poolId = row.projectPoolId;
+      const pInstId = row.procInstId; ``
+      const taskId = row.taskId;
+      this.$router.push({ path: "/myTask/project/termination/edit", query: { id: poolId, pInstId: pInstId, taskId: taskId } });
     },
     // 签收操作
     handleSign(row) {
@@ -761,7 +718,7 @@ export default {
       this.$message.success('签收成功');
     },
     // 跳转到处理页面
-    handleProcess(row){
+    handleProcess(row) {
       /*this.$router.push({ path: '/flowable/task/todo/detail/index',
         query: {
           procInsId: row.procInsId,
@@ -772,11 +729,11 @@ export default {
           startUser: row.startUserName + '-' + row.startDeptName,
         }})*/
       const id = row.id || this.ids;
-      const poolId=row.projectPoolId;
-      const pInstId=row.procInstId;
-      const taskId=row.taskId;
+      const poolId = row.projectPoolId;
+      const pInstId = row.procInstId;
+      const taskId = row.taskId;
       this.$store.commit("SET_PROJECTITEMMESSAGE", row);
-      this.$router.push({ path: "/project/termination/audit", query: { id:poolId , pInstId: pInstId ,taskId:taskId} });
+      this.$router.push({ path: "/myTask/project/termination/audit", query: { id: poolId, pInstId: pInstId, taskId: taskId } });
 
     },
     // 撤回操作
@@ -793,9 +750,9 @@ export default {
     /*详情*/
     handleDetail(row) {
       const id = row.id || this.ids;
-      const poolId=row.projectPoolId;
-      const pInstId=row.procInstId;
-      this.$router.push({ path: "/project/termination/detail", query: { id: poolId , pInstId: pInstId } });
+      const poolId = row.projectPoolId;
+      const pInstId = row.procInstId;
+      this.$router.push({ path: "/myTask/project/termination/detail", query: { id: poolId, pInstId: pInstId } });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -815,14 +772,14 @@ export default {
           this.getList();
           this.$modal.msgSuccess("已终止");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 流程图查看 */
-    handleReadImage(row){
+    handleReadImage(row) {
       this.readImage.title = "流程图";
       this.readImage.open = true;
       // this.readImage.src = process.env.VUE_APP_BASE_API + "/flowable/definition/readImage/" + deploymentId;
-      flowXmlAndNode({procInsId: row.procInstId,deployId:row.deployId}).then(res => {
+      flowXmlAndNode({ procInsId: row.procInstId, deployId: row.deployId }).then(res => {
         this.flowData = res.data;
       })
     },
@@ -834,6 +791,7 @@ export default {
 .tableWrapper {
   font-size: 12px;
   color: #000;
+
   ::v-deep .el-table__header-wrapper th {
     font-size: 12px;
     font-weight: bolder;
@@ -850,12 +808,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/termination/processList.vue

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

ruoyi-ui/src/views/study/businessPlan/index.vue

@@ -58,7 +58,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
+          type="success" class="editButton"
           plain
           icon="el-icon-edit"
           size="mini"

ruoyi-ui/src/views/study/financialStatements/index.vue

@@ -58,7 +58,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
+          type="success" class="editButton"
           plain
           icon="el-icon-edit"
           size="mini"