Sfoglia il codice sorgente

文件资料管理样式修改

sunny 1 mese fa
parent
commit
1fc4ed8c7f

+ 121 - 260
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" 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" fixed="right" 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() {

+ 121 - 260
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" 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" fixed="right" 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() {

+ 121 - 260
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" 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" fixed="right" 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() {

+ 121 - 260
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" 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" fixed="right" 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() {

+ 121 - 260
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" 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" fixed="right" 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() {

+ 121 - 260
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" 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" fixed="right" 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() {

+ 121 - 260
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" 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" fixed="right" 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() {

+ 185 - 391
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" 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>

+ 137 - 310
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" 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);
     },

File diff suppressed because it is too large
+ 270 - 685
ruoyi-ui/src/views/invest/components/meetingList.vue


+ 118 - 253
ruoyi-ui/src/views/study/gen/index.vue

@@ -1,262 +1,151 @@
 <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="contractName">
-        <el-input
-          v-model.trim="queryParams.contractName"
-          placeholder="请输入资料名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="资料类别" prop="contractType">
-        <el-select
-          v-model="queryParams.contractType"
-          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-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="contractName">
+            <el-input v-model.trim="queryParams.contractName" placeholder="请输入资料名称" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="资料类别" prop="contractType">
+            <el-select v-model="queryParams.contractType" 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-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="['study:gen:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="handleAdd"
+          v-hasPermi="['study:gen: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="['study:gen:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" icon="el-icon-edit" size="small" :disabled="single" @click="handleSelectData(1)"
+          v-hasPermi="['study:gen: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="['study:gen:remove']"
-          >删除</el-button
-        >
+        <el-button type="danger" icon="el-icon-delete" size="small" :disabled="single" @click="handleSelectData(2)"
+          v-hasPermi="['study:gen: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="['study:gen:export']"
-          >导出</el-button
-        >
+        <el-button type="warning" icon="el-icon-download" size="small" @click="handleExport"
+          v-hasPermi="['study:gen: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="genList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
 
-    <el-table
-      ref="dataTable"
-      @row-click="clickRow"
-      class="tableWrapper"
-      v-loading="loading"
-      border
-      :data="genList"
-      @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="contractName">
+          <template slot-scope="scope">
+            <div :title="scope.row.contractName" class="public-text-blue public-cursor"
+              @click="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.file_type" :value="scope.row.contractType" />
+          </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="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.file_type"
-            :value="scope.row.contractType"
-          />
-        </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="创建人" 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
+        <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="创建人" 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
         label="附件业务ID"
         align="center"
         prop="fileBusinessId"
       /> -->
-      <el-table-column
-        label="操作"
-        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="['study:gen:edit']"
-            >修改</el-button
-          >
-          <!-- <el-button
+        <el-table-column label="操作" 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="['study:gen: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="['study:gen: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="['study:gen: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="1250px"
-      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="1250px" append-to-body>
+      <el-form class="special-el-form" ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="资料名称" prop="contractName">
-          <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">
-          <el-select
-            v-model="form.contractType"
-            placeholder="请选择资料类别"
-            style="width: 100%"
-          >
-            <el-option
-              v-for="dict in dict.type.file_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+          <el-select v-model="form.contractType" placeholder="请选择资料类别" style="width: 100%">
+            <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="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">
@@ -265,46 +154,22 @@
       </div>
     </el-dialog>
     <!-- 研究资料详情 -->
-    <el-dialog
-      title="研究资料详情"
-      :visible.sync="openDetail"
-      width="1250px"
-      append-to-body
-    >
-      <el-form
-        class="special-el-form"
-        ref="form"
-        :model="form"
-        label-width="80px"
-      >
+    <el-dialog title="研究资料详情" :visible.sync="openDetail" width="1250px" append-to-body>
+      <el-form class="special-el-form" ref="form" :model="form" label-width="80px">
         <el-form-item label="资料名称" prop="contractName">
           <el-input maxlength="100" v-model="form.contractName" disabled />
         </el-form-item>
         <el-form-item label="资料类别" prop="contractType">
           <el-select v-model="form.contractType" disabled style="width: 100%">
-            <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="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">
@@ -344,7 +209,7 @@ export default {
       // 选中数组
       selectRowList: [],
       // 显示搜索条件
-      showSearch: false,
+      showSearch: true,
       // 总条数
       total: 0,
       // 研究资料管理表格数据
@@ -527,7 +392,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {