前端-页面

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

@@ -155,7 +155,7 @@
         </template>
       </el-table-column>
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="150" />
       <el-table-column
         label="操作"
         align="center"
@@ -342,7 +342,9 @@ export default {
         telephone: null,
         channelHead: null,
         status: null,
-        channelGroup: null,
+        channelGroup: null,        
+        orderByColumn: "createTime",
+        isAsc: "desc",
       },
       // 表单参数
       form: {
@@ -446,9 +448,11 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-    /** 重置按钮操作 */
+     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.orderByColumn = "createTime";
+      this.queryParams.isAsc = "desc";
       this.handleQuery();
     },
     // 多选框选中数据

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

@@ -51,6 +51,8 @@ export default {
       channelQueryParams: {
         pageNum: 1,
         pageSize: 10,
+        orderByColumn: "createTime",
+        isAsc: "desc",
       },
       
     // 选中数组

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

@@ -132,7 +132,7 @@
 
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
       <!-- <el-table-column label="合同类别" align="center" prop="contractType">
         
       </el-table-column> -->
@@ -317,6 +317,8 @@ export default {
         projectPoolId: null,
         projectStage: null,
         fileBusinessId: null,
+        orderByColumn: "createTime",
+        isAsc: "desc",
       },
       // 表单参数
       form: {
@@ -419,6 +421,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.orderByColumn = "createTime";
+      this.queryParams.isAsc = "desc";
       this.handleQuery();
     },
     // 多选框选中数据

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

@@ -313,6 +313,8 @@ export default {
         fileType: null,
         projectStage: null,
         fileBusinessId: null,
+        orderByColumn: "createTime",
+        isAsc: "desc",
       },
       // 表单参数
       form: {
@@ -411,9 +413,11 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-    /** 重置按钮操作 */
+     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.orderByColumn = "createTime";
+      this.queryParams.isAsc = "desc";
       this.handleQuery();
     },
     // 多选框选中数据

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

@@ -153,7 +153,7 @@
         </template>
       </el-table-column>
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="150" />
       <el-table-column
         label="操作"
         align="center"
@@ -363,6 +363,8 @@ export default {
         upPerson: null,
         upWay: null,
         realityUpDate: null,
+        orderByColumn: "createTime",
+        isAsc: "desc",
       },
       // 表单参数
       form: {
@@ -476,9 +478,11 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-    /** 重置按钮操作 */
+     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.orderByColumn = "createTime";
+      this.queryParams.isAsc = "desc";
       this.handleQuery();
     },
     // 多选框选中数据

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

@@ -69,6 +69,8 @@ export default {
       meetingQueryParams: {
         pageNum: 1,
         pageSize: 10,
+        orderByColumn: "createTime",
+        isAsc: "desc",
       },
       
     // 选中数组

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

@@ -165,7 +165,7 @@
       <el-table-column label="会议发起人" align="center" prop="promoter" />
       <el-table-column label="会议参与人" align="center" prop="participants" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
       <el-table-column
         label="操作"
         align="center"
@@ -514,6 +514,8 @@ export default {
         meetingType: null,
         startTime: null,
         endTime: null,
+        orderByColumn: "createTime",
+        isAsc: "desc",
       },
       // 表单参数
       form: {
@@ -646,8 +648,6 @@ export default {
     },
     // 去打分
     handleMark(row, type, readonly) {
-      console.log("000000000");
-
       this.$router.push({
         path: "/invest/meeting/mark",
         query: { id: row.id, formType: type, readonly: readonly },
@@ -747,9 +747,11 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-    /** 重置按钮操作 */
+     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.orderByColumn = "createTime";
+      this.queryParams.isAsc = "desc";
       this.handleQuery();
     },
     // 多选框选中数据

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

@@ -70,6 +70,8 @@ export default {
       projectQueryParams: {
         pageNum: 1,
         pageSize: 10,
+        orderByColumn: "createTime",
+        isAsc: "desc",
       },
       
     // 选中数组

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

@@ -396,7 +396,23 @@
             type="text"
             icon="el-icon-document"
             @click="handleSurvey(scope.row)"
-            >发起尽调申请</el-button
+            >尽职调查</el-button
+          >
+          <el-button
+            class="custom-orange-color"
+            v-if="stage == '4'"
+            size="mini"
+            type="text"
+            icon="el-icon-upload2"
+            >上传尽调报告</el-button
+          >
+          <el-button
+            class="custom-orange-color"
+            v-if="stage == '4'"
+            size="mini"
+            type="text"
+            icon="el-icon-edit-outline"
+            >修改尽调报告</el-button
           >
           <el-button
             class="custom-orange-color"
@@ -597,10 +613,10 @@ export default {
       },
       // 遮罩层
       loading: false,
-      
-    // 选中数组
+
+      // 选中数组
       ids: [],
-      idsName:[],
+      idsName: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -642,6 +658,8 @@ export default {
         investWorth: null,
         projectStage: null,
         projectState: null,
+        orderByColumn: "createTime",
+        isAsc: "desc",
       },
       form: {
         id: null,
@@ -715,6 +733,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.orderByColumn = "createTime";
+      this.queryParams.isAsc = "desc";
       this.handleQuery();
     },
     // 多选框选中数据
@@ -830,5 +850,4 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-
 </style>

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

@@ -146,6 +146,8 @@ export default {
         userName: "",
         phonenumber: "",
         deptId: "",
+        orderByColumn: "createTime",
+        isAsc: "desc",
       },
     };
   },
@@ -198,6 +200,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.orderByColumn = "createTime";
+      this.queryParams.isAsc = "desc";
       this.handleQuery();
     },
     /** 选择用户操作 */

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

@@ -85,9 +85,9 @@
         <el-tab-pane label="活动" name="0"></el-tab-pane>
         <el-tab-pane label="详细信息" name="1"></el-tab-pane>
         <el-tab-pane label="跟进记录" name="2"></el-tab-pane>
-        <el-tab-pane label="立项汇总表" name="3"></el-tab-pane>
+        <!-- <el-tab-pane label="立项汇总表" name="3"></el-tab-pane> -->
         <el-tab-pane label="尽调报告" name="4"></el-tab-pane>
-        <el-tab-pane label="投决汇总表" name="5"></el-tab-pane>
+        <!-- <el-tab-pane label="投决汇总表" name="5"></el-tab-pane> -->
         <el-tab-pane label="会议记录" name="6"></el-tab-pane>
         <el-tab-pane label="文件资料" name="7"></el-tab-pane>
         <el-tab-pane label="合同" name="8"></el-tab-pane>
@@ -110,17 +110,16 @@
         <div v-show="activeName === '2'">
           <followList :type="'2'" ref="followList" :projectId="id"></followList>
         </div>
-        <div v-show="activeName === '3'">
-          <tableForm :formType="2" ref="tableForm" :projectId="id"></tableForm>
-        </div>
+        <!-- <div v-show="activeName === '3'">
+          <tableForm :formType="2" :id="meetingId" ref="tableForm" :projectId="id"></tableForm>
+        </div> -->
         <div v-show="activeName === '4'">
-          还没写
           <!-- 尽职调查 -->
-          <!-- <projectList :type="'2'" :stage="'4'" ref="projectList" :projectId="id"></projectList> -->
-        </div>
-        <div v-show="activeName === '5'">
-          <tableForm :formType="4" ref="tableForm" :projectId="id"></tableForm>
+          <projectList :type="'2'" :stage="'4'" ref="projectList" :projectId="id"></projectList>
         </div>
+        <!-- <div v-show="activeName === '5'">
+          <tableForm :formType="4" :id="meetingId" ref="tableForm" :projectId="id"></tableForm>
+        </div> -->
         <div v-show="activeName === '6'">
           <meetingList
             :type="'2'"
@@ -164,6 +163,7 @@ export default {
   },
   data() {
     return {
+      meetingId:"0",
       activeTimeList:[],
       type: "2",
       id: "",

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

@@ -250,6 +250,8 @@ export default {
         contractName: null,
         contractType: null,
         fileBusinessId: null,
+        orderByColumn: "createTime",
+        isAsc: "desc",
       },
       // 表单参数
       form: {
@@ -323,6 +325,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.orderByColumn = "createTime";
+      this.queryParams.isAsc = "desc";
       this.handleQuery();
     },
     // 多选框选中数据